From 608c7f7a3127c6d5ec50b171462855c0157c582e Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 22 Jun 2019 15:15:38 +0300 Subject: [PATCH] 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