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