Add target port to NGINX e2e tests

test/e2e-ingress.yaml

@@ -14,4 +14,4 @@ spec:
         paths:
           - backend:
               serviceName: podinfo
-              servicePort: 9898
+              servicePort: 80

test/e2e-nginx-tests.sh

@@ -36,7 +36,8 @@ spec:
     name: podinfo
   progressDeadlineSeconds: 60
   service:
-    port: 9898
+    port: 80
+    targetPort: http
   canaryAnalysis:
     interval: 15s
     threshold: 15
@@ -138,11 +139,22 @@ until ${ok}; do
     fi
 done
 
-echo '✔ Canary promotion test passed'
+echo '>>> Waiting for canary finalization'
+retries=50
+count=0
+ok=false
+until ${ok}; do
+    kubectl -n test get canary/podinfo | grep 'Succeeded' && ok=true || ok=false
+    sleep 5
+    count=$(($count + 1))
+    if [[ ${count} -eq ${retries} ]]; then
+        kubectl -n ingress-nginx logs deployment/flagger
+        echo "No more retries left"
+        exit 1
+    fi
+done
 
-if [ "$1" = "canary" ]; then
-  exit 0
-fi
+echo '✔ Canary promotion test passed'
 
 cat <<EOF | kubectl apply -f -
 apiVersion: flagger.app/v1alpha3
@@ -161,7 +173,8 @@ spec:
     name: podinfo
   progressDeadlineSeconds: 60
   service:
-    port: 9898
+    port: 80
+    targetPort: 9898
   canaryAnalysis:
     interval: 10s
     threshold: 5