Move from Ambassador Edge Stack to Emissary Ingress (#5117)

testing/resources/ambassador_values.yaml

@@ -1,13 +1,11 @@
-emissary-ingress:
-  service:
-    type: NodePort
+service:
+  type: NodePort
 
-    # Note that target http ports need to match your ambassador configurations service_port
-    # https://www.getambassador.io/reference/modules/#the-ambassador-module
-    ports:
-      - name: http
-        port: 80
-        targetPort: 8080
-        # protocol: TCP
-        nodePort: 30080
-
+  # Note that target http ports need to match your ambassador configurations service_port
+  # https://www.getambassador.io/reference/modules/#the-ambassador-module
+  ports:
+    - name: http
+      port: 80
+      targetPort: 8080
+      # protocol: TCP
+      nodePort: 30080

testing/scripts/Makefile

@@ -63,11 +63,12 @@ helm_setup:
 
 .PHONY: install_ambassador
 install_ambassador:
-	kubectl apply -f https://app.getambassador.io/yaml/edge-stack/3.1.0/aes-crds.yaml
-	kubectl wait --timeout=90s --for=condition=available deployment emissary-apiext -n emissary-system
-	helm install -n ambassador --create-namespace edge-stack datawire/edge-stack \
-		-f ../resources/ambassador_values.yaml --wait
-	kubectl rollout status  -n ambassador deployment/edge-stack -w
+	kubectl apply -f https://app.getambassador.io/yaml/emissary/3.8.0/emissary-crds.yaml
+	kubectl wait --timeout=2m --for=condition=available deployment emissary-apiext -n emissary-system
+	helm upgrade --install -n ambassador --create-namespace emissary datawire/emissary-ingress \
+		-f ../resources/ambassador_values.yaml
+	kubectl wait --timeout=2m --for=condition=available deploy \
+		-lapp.kubernetes.io/instance=emissary -n ambassador  
 	kubectl apply -f ../resources/ambassador_nontls_setup.yaml -n ambassador
 
 .PHONY: install_jaeger
@@ -81,7 +82,8 @@ install_jaeger:
 
 
 install_cert_manager:
-	helm install \
+	helm upgrade \
+			--install \
 	    cert-manager jetstack/cert-manager \
 	    --namespace cert-manager \
 	    --create-namespace \
@@ -134,7 +136,7 @@ install_metrics:
 kind_setup: create_namespaces helm_setup install_cert_manager install_ambassador install_istio install_keda install_jaeger install_seldon set_namespace install_metrics
 
 port-forward-ambassador:
-	kubectl port-forward $$(kubectl get pods -n ambassador -l app.kubernetes.io/instance=edge-stack  -o jsonpath='{.items[0].metadata.name}') -n ambassador 8005:8080
+	kubectl port-forward $$(kubectl get pods -n ambassador -lapp.kubernetes.io/instance=emissary -o jsonpath='{.items[0].metadata.name}') -n ambassador 8005:8080
 
 .PHONY: s2i_build_base_images
 s2i_build_base_images: