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