From c9bacdfe05cd3093fe4439b092cc0443e979078a Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Mon, 28 Oct 2019 15:07:07 +0200
Subject: [PATCH] Update Istio to v1.3.3

---
 pkg/controller/scheduler.go | 3 +--
 test/container-push.sh      | 3 ---
 test/e2e-gloo-tests.sh      | 3 ---
 test/e2e-istio.sh           | 2 +-
 test/e2e-nginx-tests.sh     | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkg/controller/scheduler.go b/pkg/controller/scheduler.go
index 62b2ed18..2d1486d1 100644
--- a/pkg/controller/scheduler.go
+++ b/pkg/controller/scheduler.go
@@ -751,7 +751,6 @@ func (c *Controller) analyseCanary(r *flaggerv1.Canary) bool {
 
 	// create observer based on the mesh provider
 	observerFactory := c.observerFactory
-	observer := observerFactory.Observer(metricsProvider)
 
 	// override the global metrics server if one is specified in the canary spec
 	metricsServer := c.observerFactory.Client.GetMetricsServer()
@@ -763,8 +762,8 @@ func (c *Controller) analyseCanary(r *flaggerv1.Canary) bool {
 			c.recordEventErrorf(r, "Error building Prometheus client for %s %v", r.Spec.MetricsServer, err)
 			return false
 		}
-		observer = observerFactory.Observer(metricsProvider)
 	}
+	observer := observerFactory.Observer(metricsProvider)
 
 	// run metrics checks
 	for _, metric := range r.Spec.CanaryAnalysis.Metrics {
diff --git a/test/container-push.sh b/test/container-push.sh
index ceaf3918..bf2a7fe1 100755
--- a/test/container-push.sh
+++ b/test/container-push.sh
@@ -13,9 +13,6 @@ push () {
     else
         docker tag test/flagger:latest weaveworks/flagger:${CIRCLE_TAG};
         docker push weaveworks/flagger:${CIRCLE_TAG};
-        LT_VERSION=$(grep 'VERSION' cmd/loadtester/main.go | awk '{ print $4 }' | tr -d '"' | head -n1);
-        docker tag test/flagger-loadtester:latest weaveworks/flagger-loadtester:${LT_VERSION};
-        docker push weaveworks/flagger-loadtester:${LT_VERSION};
     fi
 }
 
diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh
index 2b614c47..edeea8a3 100755
--- a/test/e2e-gloo-tests.sh
+++ b/test/e2e-gloo-tests.sh
@@ -36,9 +36,6 @@ spec:
           upstreamGroup:
             name: podinfo
             namespace: test
-        routePlugins:
-          prefixRewrite:
-            prefixRewrite: "/"
 EOF
 
 cat <<EOF | kubectl apply -f -
diff --git a/test/e2e-istio.sh b/test/e2e-istio.sh
index 7ae9c7f8..973419eb 100755
--- a/test/e2e-istio.sh
+++ b/test/e2e-istio.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-ISTIO_VER="1.3.0"
+ISTIO_VER="1.3.3"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
diff --git a/test/e2e-nginx-tests.sh b/test/e2e-nginx-tests.sh
index 513b5a61..49addef7 100755
--- a/test/e2e-nginx-tests.sh
+++ b/test/e2e-nginx-tests.sh
@@ -122,7 +122,7 @@ failed=false
 until ${ok}; do
     kubectl -n test get canary/podinfo | grep 'Failed' && failed=true || failed=false
     if ${failed}; then
-        kubectl -n ingress-nginx logs deployment/test-flagger
+        kubectl -n ingress-nginx logs deployment/flagger
         echo "Canary failed!"
         exit 1
     fi