diff --git a/test/e2e-gloo.sh b/test/e2e-gloo.sh index 273df7de..3258cc48 100755 --- a/test/e2e-gloo.sh +++ b/test/e2e-gloo.sh @@ -5,16 +5,8 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -echo ">>> Installing Helm" -curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - -echo '>>> Installing Tiller' -kubectl --namespace kube-system create sa tiller -kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller -helm init --service-account tiller --upgrade --wait -helm repo add gloo https://storage.googleapis.com/solo-public-helm - echo '>>> Installing Gloo' +helm repo add gloo https://storage.googleapis.com/solo-public-helm helm upgrade -i gloo gloo/gloo --version 0.13.29 \ --wait \ --namespace gloo-system \ diff --git a/test/e2e-istio.sh b/test/e2e-istio.sh index 7d997400..de9995ce 100755 --- a/test/e2e-istio.sh +++ b/test/e2e-istio.sh @@ -6,14 +6,6 @@ ISTIO_VER="1.1.9" REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -echo ">>> Installing Helm" -curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - -echo '>>> Installing Tiller' -kubectl --namespace kube-system create sa tiller -kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller -helm init --service-account tiller --upgrade --wait - echo ">>> Installing Istio ${ISTIO_VER}" helm repo add istio.io https://storage.googleapis.com/istio-release/releases/${ISTIO_VER}/charts diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh index e617c551..74396fd8 100755 --- a/test/e2e-kind.sh +++ b/test/e2e-kind.sh @@ -21,3 +21,10 @@ kind create cluster --wait 5m export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" kubectl get pods --all-namespaces +echo ">>> Installing Helm" +curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + +echo '>>> Installing Tiller' +kubectl --namespace kube-system create sa tiller +kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller +helm init --service-account tiller --upgrade --wait diff --git a/test/e2e-nginx.sh b/test/e2e-nginx.sh index f7df3912..e35c5a4d 100755 --- a/test/e2e-nginx.sh +++ b/test/e2e-nginx.sh @@ -5,14 +5,6 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -echo ">>> Installing Helm" -curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - -echo '>>> Installing Tiller' -kubectl --namespace kube-system create sa tiller -kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller -helm init --service-account tiller --upgrade --wait - echo '>>> Installing NGINX Ingress' helm upgrade -i nginx-ingress stable/nginx-ingress \ --wait \ diff --git a/test/e2e-smi-istio.sh b/test/e2e-smi-istio.sh index 00c9eeb2..604a6ef7 100755 --- a/test/e2e-smi-istio.sh +++ b/test/e2e-smi-istio.sh @@ -6,14 +6,6 @@ ISTIO_VER="1.1.9" REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -echo ">>> Installing Helm" -curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - -echo '>>> Installing Tiller' -kubectl --namespace kube-system create sa tiller -kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller -helm init --service-account tiller --upgrade --wait - echo ">>> Installing Istio ${ISTIO_VER}" helm repo add istio.io https://storage.googleapis.com/istio-release/releases/${ISTIO_VER}/charts