From 2ce4f3a93e482b6d884a93924e572a4b9787c1c6 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 15:41:17 +0300
Subject: [PATCH] Revert supergloo upgrade (Istio 1.1 not supported in v0.3.23)

---
 test/e2e-supergloo.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh
index 84b79bb6..1dd6d9c5 100755
--- a/test/e2e-supergloo.sh
+++ b/test/e2e-supergloo.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 ISTIO_VER="1.0.6"
-SUPERGLOO_VER="v0.3.23"
+SUPERGLOO_VER="v0.3.13"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
@@ -17,6 +17,25 @@ echo ">>> Installing Istio ${ISTIO_VER}"
 kubectl create ns istio-system
 ./supergloo-cli install istio --name test --namespace supergloo-system --auto-inject=true --installation-namespace istio-system --mtls=false --prometheus=true --version ${ISTIO_VER}
 
+echo '>>> Waiting for Istio to be ready'
+until kubectl -n supergloo-system get mesh test
+do
+  sleep 2
+done
+
+retries=50
+count=0
+ok=false
+until ${ok}; do
+    kubectl -n supergloo-system get mesh test && ok=true || ok=false
+    sleep 10
+    count=$(($count + 1))
+    if [[ ${count} -eq ${retries} ]]; then
+        echo "No more retries left"
+        exit 1
+    fi
+done
+
 kubectl -n istio-system rollout status deployment/istio-pilot
 kubectl -n istio-system rollout status deployment/istio-policy
 kubectl -n istio-system rollout status deployment/istio-sidecar-injector
@@ -37,4 +56,4 @@ kubectl -n istio-system set image deployment/flagger flagger=test/flagger:latest
 kubectl -n istio-system rollout status deployment/flagger
 
 echo '>>> Adding Flagger Supergloo RBAC'
-kubectl create clusterrolebinding flagger-supergloo --clusterrole=mesh-discovery --serviceaccount=istio-system:flagger
\ No newline at end of file
+kubectl create clusterrolebinding flagger-supergloo --clusterrole=mesh-discovery --serviceaccount=istio-system:flagger