From da978254b1d48bb7e0efb5ef3c617e02a33c999b Mon Sep 17 00:00:00 2001 From: Marcus Rodan Date: Tue, 8 Dec 2020 16:12:12 +0100 Subject: [PATCH 1/4] Fix issue --- pkg/router/istio.go | 9 ++ .../e2e-istio-tests-delegate-with-analysis.sh | 150 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 test/e2e-istio-tests-delegate-with-analysis.sh diff --git a/pkg/router/istio.go b/pkg/router/istio.go index 93cc1139..407d2c4e 100644 --- a/pkg/router/istio.go +++ b/pkg/router/istio.go @@ -215,6 +215,12 @@ func (ir *IstioRouter) reconcileVirtualService(canary *flaggerv1.Canary) error { return fmt.Errorf("VirtualService %s.%s get query error %v", apexName, canary.Namespace, err) } + if canary.Spec.Service.Delegation { + // delegate VirtualService requires the hosts and gateway empty. + virtualService.Spec.Gateways = []string{} + virtualService.Spec.Hosts = []string{} + } + // update service but keep the original destination weights and mirror if virtualService != nil { if diff := cmp.Diff( @@ -242,6 +248,9 @@ func (ir *IstioRouter) reconcileVirtualService(canary *flaggerv1.Canary) error { vtClone.ObjectMeta.Annotations[configAnnotation] = string(b) } + fmt.Printf("Applying : %+v\n", vtClone) + fmt.Printf("-------------------------------------------\n") + _, err = ir.istioClient.NetworkingV1alpha3().VirtualServices(canary.Namespace).Update(context.TODO(), vtClone, metav1.UpdateOptions{}) if err != nil { return fmt.Errorf("VirtualService %s.%s update error: %w", apexName, canary.Namespace, err) diff --git a/test/e2e-istio-tests-delegate-with-analysis.sh b/test/e2e-istio-tests-delegate-with-analysis.sh new file mode 100644 index 00000000..c06fe51b --- /dev/null +++ b/test/e2e-istio-tests-delegate-with-analysis.sh @@ -0,0 +1,150 @@ +#!/usr/bin/env bash + +# This script runs e2e tests for when the canary delegation is enabled +# Prerequisites: Kubernetes Kind and Istio + +set -o errexit + +echo '>>> Set pilot env to enable virtual service delegate' +kubectl -n istio-system set env deploy istiod PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE=true +kubectl -n istio-system rollout status deploy istiod + +echo '>>> Initialising Gateway' +cat <>> Initialising root virtual service' +cat <>> Initialising canary for delegate' +cat <>> Waiting for primary to be ready' +retries=50 +count=0 +ok=false +until ${ok}; do + kubectl -n test get canary/podinfo | grep 'Initialized' && ok=true || ok=false + sleep 5 + count=$(($count + 1)) + if [[ ${count} -eq ${retries} ]]; then + kubectl -n istio-system logs deployment/flagger + echo "No more retries left" + exit 1 + fi +done + +echo '✔ Canary initialization test passed' + +echo '>>> Triggering canary deployment' +kubectl -n test set image deployment/podinfo podinfod=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 '3.1.1' && ok=true || ok=false + sleep 10 + kubectl -n istio-system logs deployment/flagger --tail 1 + count=$(($count + 1)) + if [[ ${count} -eq ${retries} ]]; then + kubectl -n test describe deployment/podinfo + kubectl -n test describe deployment/podinfo-primary + kubectl -n istio-system logs deployment/flagger + echo "No more retries left" + exit 1 + fi +done + +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 istio-system logs deployment/flagger + echo "No more retries left" + exit 1 + fi +done + +echo '>>> Set pilot env to disable virtual service delegate' +kubectl -n istio-system set env deploy istiod PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE=false +kubectl -n istio-system rollout status deploy istiod + +echo '✔ Canary promotion test passed' + +if [[ "$1" = "canary" ]]; then + exit 0 +fi From d05b684dbe57c55e2b0b71ece5760c8b12a839a4 Mon Sep 17 00:00:00 2001 From: Marcus Rodan Date: Tue, 8 Dec 2020 16:14:15 +0100 Subject: [PATCH 2/4] Remove log line --- pkg/router/istio.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/router/istio.go b/pkg/router/istio.go index 407d2c4e..9e8a93cc 100644 --- a/pkg/router/istio.go +++ b/pkg/router/istio.go @@ -248,9 +248,6 @@ func (ir *IstioRouter) reconcileVirtualService(canary *flaggerv1.Canary) error { vtClone.ObjectMeta.Annotations[configAnnotation] = string(b) } - fmt.Printf("Applying : %+v\n", vtClone) - fmt.Printf("-------------------------------------------\n") - _, err = ir.istioClient.NetworkingV1alpha3().VirtualServices(canary.Namespace).Update(context.TODO(), vtClone, metav1.UpdateOptions{}) if err != nil { return fmt.Errorf("VirtualService %s.%s update error: %w", apexName, canary.Namespace, err) From 3c3702026092361df9b626fc3580e990003f339c Mon Sep 17 00:00:00 2001 From: Marcus Rodan Date: Tue, 8 Dec 2020 16:54:00 +0100 Subject: [PATCH 3/4] Changed test file permissions --- test/e2e-istio-tests-delegate-with-analysis.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 test/e2e-istio-tests-delegate-with-analysis.sh diff --git a/test/e2e-istio-tests-delegate-with-analysis.sh b/test/e2e-istio-tests-delegate-with-analysis.sh old mode 100644 new mode 100755 From 7fc6f8a04dba61948bb64c7940109b7aa126d00e Mon Sep 17 00:00:00 2001 From: Marcus Rodan Date: Tue, 8 Dec 2020 18:08:44 +0100 Subject: [PATCH 4/4] Changed to using the old e2e test scenario --- .../e2e-istio-tests-delegate-with-analysis.sh | 150 ------------------ test/e2e-istio-tests-delegate.sh | 1 - 2 files changed, 151 deletions(-) delete mode 100755 test/e2e-istio-tests-delegate-with-analysis.sh diff --git a/test/e2e-istio-tests-delegate-with-analysis.sh b/test/e2e-istio-tests-delegate-with-analysis.sh deleted file mode 100755 index c06fe51b..00000000 --- a/test/e2e-istio-tests-delegate-with-analysis.sh +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/env bash - -# This script runs e2e tests for when the canary delegation is enabled -# Prerequisites: Kubernetes Kind and Istio - -set -o errexit - -echo '>>> Set pilot env to enable virtual service delegate' -kubectl -n istio-system set env deploy istiod PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE=true -kubectl -n istio-system rollout status deploy istiod - -echo '>>> Initialising Gateway' -cat <>> Initialising root virtual service' -cat <>> Initialising canary for delegate' -cat <>> Waiting for primary to be ready' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test get canary/podinfo | grep 'Initialized' && ok=true || ok=false - sleep 5 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n istio-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '✔ Canary initialization test passed' - -echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=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 '3.1.1' && ok=true || ok=false - sleep 10 - kubectl -n istio-system logs deployment/flagger --tail 1 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n test describe deployment/podinfo - kubectl -n test describe deployment/podinfo-primary - kubectl -n istio-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -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 istio-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '>>> Set pilot env to disable virtual service delegate' -kubectl -n istio-system set env deploy istiod PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE=false -kubectl -n istio-system rollout status deploy istiod - -echo '✔ Canary promotion test passed' - -if [[ "$1" = "canary" ]]; then - exit 0 -fi diff --git a/test/e2e-istio-tests-delegate.sh b/test/e2e-istio-tests-delegate.sh index 9f934c15..511abd0e 100755 --- a/test/e2e-istio-tests-delegate.sh +++ b/test/e2e-istio-tests-delegate.sh @@ -70,7 +70,6 @@ spec: targetPort: 9898 portDiscovery: true delegation: true - skipAnalysis: true analysis: interval: 15s threshold: 15