From 901648393af54a9a4df6a67ae6e870012535f930 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 14:02:33 +0300
Subject: [PATCH 1/8] Update Kubernetes Kind to v0.3.0

---
 test/e2e-kind.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 65199647..2df96152 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
-KIND_VERSION=0.3.0
+KIND_VERSION=v0.3.0
 
 echo ">>> Installing kubectl"
 curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \

From 720d04aba1a838814dc921944aed83fba0f10fef Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 14:16:30 +0300
Subject: [PATCH 2/8] Update Supergloo to v0.3.23

---
 test/e2e-istio-values.yaml | 4 ++--
 test/e2e-supergloo.sh      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/e2e-istio-values.yaml b/test/e2e-istio-values.yaml
index 7386ca3a..4ab300dd 100644
--- a/test/e2e-istio-values.yaml
+++ b/test/e2e-istio-values.yaml
@@ -22,7 +22,7 @@ sidecarInjectorWebhook:
 
 # galley configuration
 galley:
-  enabled: false
+  enabled: true
 
 # mixer configuration
 mixer:
@@ -59,4 +59,4 @@ global:
       limits:
         cpu: 1000m
         memory: 256Mi
-  useMCP: false
+  useMCP: true
diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh
index 21f83614..31f2ef69 100755
--- a/test/e2e-supergloo.sh
+++ b/test/e2e-supergloo.sh
@@ -2,12 +2,13 @@
 
 set -o errexit
 
-ISTIO_VER="1.0.6"
+ISTIO_VER="1.1.6"
+SUPERGLOO_VER="v0.3.23"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
 echo ">>> Downloading Supergloo CLI"
-curl -SsL https://github.com/solo-io/supergloo/releases/download/v0.3.13/supergloo-cli-linux-amd64 > supergloo-cli
+curl -SsL https://github.com/solo-io/supergloo/releases/download/${SUPERGLOO_VER}/supergloo-cli-linux-amd64 > supergloo-cli
 chmod +x supergloo-cli
 
 echo ">>> Installing Supergloo"

From ed0d25af97af4c25fd2c7771c33ecc675c25750a Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 14:33:06 +0300
Subject: [PATCH 3/8] Revert to Kind 0.2.1

---
 test/e2e-kind.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 2df96152..74396fd8 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
-KIND_VERSION=v0.3.0
+KIND_VERSION=0.2.1
 
 echo ">>> Installing kubectl"
 curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \

From 1a0daa867857e14c14236a38bcbf3d8a482e6f80 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 14:58:01 +0300
Subject: [PATCH 4/8] Use http probes with Kind 0.3.0

---
 test/e2e-kind.sh       |  2 +-
 test/e2e-supergloo.sh  |  2 +-
 test/e2e-workload.yaml | 18 ++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 74396fd8..2df96152 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
-KIND_VERSION=0.2.1
+KIND_VERSION=v0.3.0
 
 echo ">>> Installing kubectl"
 curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh
index 31f2ef69..52e54314 100755
--- a/test/e2e-supergloo.sh
+++ b/test/e2e-supergloo.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-ISTIO_VER="1.1.6"
+ISTIO_VER="1.0.6"
 SUPERGLOO_VER="v0.3.23"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
diff --git a/test/e2e-workload.yaml b/test/e2e-workload.yaml
index 83b199d7..56d0dbc3 100644
--- a/test/e2e-workload.yaml
+++ b/test/e2e-workload.yaml
@@ -41,21 +41,15 @@ spec:
         - name: PODINFO_UI_COLOR
           value: blue
         livenessProbe:
-          exec:
-            command:
-            - podcli
-            - check
-            - http
-            - localhost:9898/healthz
+          httpGet:
+            port: 9898
+            path: /healthz
           initialDelaySeconds: 5
           timeoutSeconds: 5
         readinessProbe:
-          exec:
-            command:
-            - podcli
-            - check
-            - http
-            - localhost:9898/readyz
+          httpGet:
+            port: 9898
+            path: /readyz
           initialDelaySeconds: 5
           timeoutSeconds: 5
         resources:

From 608c7f7a3127c6d5ec50b171462855c0157c582e Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 15:15:38 +0300
Subject: [PATCH 5/8] Use Istio 1.1.3 for supergloo e2e testing

---
 test/e2e-istio.sh     | 1 +
 test/e2e-supergloo.sh | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/e2e-istio.sh b/test/e2e-istio.sh
index e9266071..6f3832f4 100755
--- a/test/e2e-istio.sh
+++ b/test/e2e-istio.sh
@@ -15,6 +15,7 @@ helm upgrade -i istio-init istio.io/istio-init --wait --namespace istio-system
 echo '>>> Waiting for Istio CRDs to be ready'
 kubectl -n istio-system wait --for=condition=complete job/istio-init-crd-10
 kubectl -n istio-system wait --for=condition=complete job/istio-init-crd-11
+kubectl -n istio-system wait --for=condition=complete job/istio-init-crd-12
 
 echo '>>> Installing Istio control plane'
 helm upgrade -i istio istio.io/istio --wait --namespace istio-system -f ${REPO_ROOT}/test/e2e-istio-values.yaml
diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh
index 52e54314..5ea14457 100755
--- a/test/e2e-supergloo.sh
+++ b/test/e2e-supergloo.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-ISTIO_VER="1.0.6"
+ISTIO_VER="1.1.3"
 SUPERGLOO_VER="v0.3.23"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
@@ -17,12 +17,6 @@ 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
-
 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

From 7baaaebdd45fb43d49e955f2b05546b277e236bd Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 15:28:45 +0300
Subject: [PATCH 6/8] Use Kind 0.2.1 for Gloo e2e

---
 .circleci/config.yml  | 2 +-
 test/e2e-kind.sh      | 4 ++++
 test/e2e-supergloo.sh | 2 +-
 test/e2e-tests.sh     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 140b716c..9295e188 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,7 +107,7 @@ jobs:
       - attach_workspace:
           at: /tmp/bin
       - run: test/container-build.sh
-      - run: test/e2e-kind.sh
+      - run: test/e2e-kind.sh 0.2.1
       - run: test/e2e-gloo.sh
       - run: test/e2e-gloo-tests.sh
 
diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 2df96152..63458446 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -5,6 +5,10 @@ set -o errexit
 REPO_ROOT=$(git rev-parse --show-toplevel)
 KIND_VERSION=v0.3.0
 
+if [[ "$1" ]]; then
+  KIND_VERSION=$1
+fi
+
 echo ">>> Installing kubectl"
 curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
 chmod +x kubectl && \
diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh
index 5ea14457..84b79bb6 100755
--- a/test/e2e-supergloo.sh
+++ b/test/e2e-supergloo.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-ISTIO_VER="1.1.3"
+ISTIO_VER="1.0.6"
 SUPERGLOO_VER="v0.3.23"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index 043d2cc9..829fcf57 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -125,7 +125,7 @@ done
 
 echo '✔ Canary promotion test passed'
 
-if [ "$1" = "canary" ]; then
+if [[ "$1" = "canary" ]]; then
   exit 0
 fi
 

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 7/8] 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

From 7a454c005f8c94807964792b202e3fa3da2aa04a Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 15:55:48 +0300
Subject: [PATCH 8/8] Use Kind 0.2.1 for supergloo e2e

---
 .circleci/config.yml  | 2 +-
 test/e2e-supergloo.sh | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9295e188..9d075c95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,7 +96,7 @@ jobs:
       - attach_workspace:
           at: /tmp/bin
       - run: test/container-build.sh
-      - run: test/e2e-kind.sh
+      - run: test/e2e-kind.sh 0.2.1
       - run: test/e2e-supergloo.sh
       - run: test/e2e-tests.sh canary
 
diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh
index 1dd6d9c5..ed7a122d 100755
--- a/test/e2e-supergloo.sh
+++ b/test/e2e-supergloo.sh
@@ -18,11 +18,6 @@ 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