From 26190d0c6adf05f7f1bdbdae5e1901aebcd7cbbe Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sun, 6 Oct 2019 10:42:30 +0300 Subject: [PATCH] Use podinfo v3.1.0 for e2e tests --- kustomize/podinfo/deployment.yaml | 1 + test/e2e-gloo-tests.sh | 4 ++-- test/e2e-linkerd-tests.sh | 6 +++--- test/e2e-nginx-tests.sh | 8 ++++---- test/e2e-tests.sh | 12 +++++------ test/e2e-workload.yaml | 34 ++++++++++++++++--------------- 6 files changed, 34 insertions(+), 31 deletions(-) diff --git a/kustomize/podinfo/deployment.yaml b/kustomize/podinfo/deployment.yaml index ef6b0cd9..efa7135f 100644 --- a/kustomize/podinfo/deployment.yaml +++ b/kustomize/podinfo/deployment.yaml @@ -19,6 +19,7 @@ spec: metadata: annotations: prometheus.io/scrape: "true" + prometheus.io/port: "9797" labels: app: podinfo spec: diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh index 45c5718e..5c3471cd 100755 --- a/test/e2e-gloo-tests.sh +++ b/test/e2e-gloo-tests.sh @@ -100,14 +100,14 @@ done echo '✔ Canary initialization test passed' echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.1 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.1 echo '>>> Waiting for canary promotion' retries=50 count=0 ok=false until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '1.4.1' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.1' && ok=true || ok=false sleep 10 kubectl -n gloo-system logs deployment/flagger --tail 1 count=$(($count + 1)) diff --git a/test/e2e-linkerd-tests.sh b/test/e2e-linkerd-tests.sh index f5e623cb..dac1d739 100755 --- a/test/e2e-linkerd-tests.sh +++ b/test/e2e-linkerd-tests.sh @@ -72,14 +72,14 @@ done echo '✔ Canary initialization test passed' echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.1 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.1 echo '>>> Waiting for canary promotion' retries=50 count=0 ok=false until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '1.4.1' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.1' && ok=true || ok=false sleep 10 kubectl -n linkerd logs deployment/flagger --tail 1 count=$(($count + 1)) @@ -128,7 +128,7 @@ spec: EOF echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.2 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.2 echo '>>> Waiting for canary rollback' retries=50 diff --git a/test/e2e-nginx-tests.sh b/test/e2e-nginx-tests.sh index 54ab89b7..5ff67ed3 100755 --- a/test/e2e-nginx-tests.sh +++ b/test/e2e-nginx-tests.sh @@ -111,7 +111,7 @@ done echo '✔ Canary initialization test passed' echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.1 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.1 echo '>>> Waiting for canary promotion' retries=50 @@ -125,7 +125,7 @@ until ${ok}; do echo "Canary failed!" exit 1 fi - kubectl -n test describe deployment/podinfo-primary | grep '1.4.1' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.1' && ok=true || ok=false sleep 10 kubectl -n ingress-nginx logs deployment/flagger --tail 1 count=$(($count + 1)) @@ -219,14 +219,14 @@ spec: EOF echo '>>> Triggering A/B testing' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.2 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.2 echo '>>> Waiting for A/B testing promotion' retries=50 count=0 ok=false until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '1.4.2' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.2' && ok=true || ok=false sleep 10 kubectl -n ingress-nginx logs deployment/flagger --tail 1 count=$(($count + 1)) diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index 66371c80..0e62b0c6 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -104,14 +104,14 @@ done echo '✔ Canary initialization test passed' echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.1 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.1 echo '>>> Waiting for canary promotion' retries=50 count=0 ok=false until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '1.4.1' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.1' && ok=true || ok=false sleep 10 kubectl -n istio-system logs deployment/flagger --tail 1 count=$(($count + 1)) @@ -181,14 +181,14 @@ spec: EOF echo '>>> Triggering B/G deployment' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.2 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.2 echo '>>> Waiting for B/G promotion' retries=50 count=0 ok=false until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '1.4.2' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.2' && ok=true || ok=false sleep 10 kubectl -n istio-system logs deployment/flagger --tail 1 count=$(($count + 1)) @@ -271,14 +271,14 @@ spec: EOF echo '>>> Triggering A/B testing' -kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:1.4.3 +kubectl -n test set image deployment/podinfo podinfod=quay.io/stefanprodan/podinfo:3.1.3 echo '>>> Waiting for A/B testing promotion' retries=50 count=0 ok=false until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '1.4.3' && ok=true || ok=false + kubectl -n test describe deployment/podinfo-primary | grep '3.1.3' && ok=true || ok=false sleep 10 kubectl -n istio-system logs deployment/flagger --tail 1 count=$(($count + 1)) diff --git a/test/e2e-workload.yaml b/test/e2e-workload.yaml index ca7c043d..175803d9 100644 --- a/test/e2e-workload.yaml +++ b/test/e2e-workload.yaml @@ -26,25 +26,27 @@ spec: spec: containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:1.4.0 + image: stefanprodan/podinfo:3.1.0 imagePullPolicy: IfNotPresent ports: - - containerPort: 9898 - name: http - protocol: TCP - - containerPort: 9797 - name: http-prom - protocol: TCP + - name: http + containerPort: 9898 + protocol: TCP + - name: http-metrics + containerPort: 9797 + protocol: TCP + - name: grpc + containerPort: 9999 + protocol: TCP command: - - ./podinfo - - --port=9898 - - --port-metrics=9797 - - --level=info - - --random-delay=false - - --random-error=false - env: - - name: PODINFO_UI_COLOR - value: blue + - ./podinfo + - --port=9898 + - --port-metrics=9797 + - --grpc-port=9999 + - --grpc-service-name=podinfo + - --level=info + - --random-delay=false + - --random-error=false livenessProbe: httpGet: port: 9898