diff --git a/test/e2e-contour.sh b/test/e2e-contour.sh index 740ad3b6..787a6cab 100755 --- a/test/e2e-contour.sh +++ b/test/e2e-contour.sh @@ -4,10 +4,10 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) -CONTOUR_VER="release-1.4" +CONTOUR_VER="v1.5.0" echo '>>> Installing Contour' -kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/${CONTOUR_VER}/examples/render/contour.yaml +kubectl apply -f https://projectcontour.io/quickstart/${CONTOUR_VER}/contour.yaml kubectl -n projectcontour rollout status deployment/contour kubectl -n projectcontour get all diff --git a/test/e2e-gloo.sh b/test/e2e-gloo.sh index 3b3188aa..0f95ce0a 100755 --- a/test/e2e-gloo.sh +++ b/test/e2e-gloo.sh @@ -2,7 +2,7 @@ set -o errexit -GLOO_VER="1.3.14" +GLOO_VER="1.3.28" REPO_ROOT=$(git rev-parse --show-toplevel) echo '>>> Installing Gloo' diff --git a/test/e2e-istio.sh b/test/e2e-istio.sh index 5b35b275..cfc84097 100755 --- a/test/e2e-istio.sh +++ b/test/e2e-istio.sh @@ -2,7 +2,7 @@ set -o errexit -ISTIO_VER="1.6.0" +ISTIO_VER="1.6.1" REPO_ROOT=$(git rev-parse --show-toplevel) echo ">>> Downloading Istio ${ISTIO_VER}" diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh index 6716e47c..925597cb 100755 --- a/test/e2e-kind.sh +++ b/test/e2e-kind.sh @@ -5,7 +5,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) HELM_VERSION=v3.0.3 KIND_VERSION=v0.8.1 -KUBE_VERSION=v1.14.10 +KUBE_VERSION=v1.16.9 if [[ "$1" ]]; then KUBE_VERSION=$1 diff --git a/test/e2e-linkerd.sh b/test/e2e-linkerd.sh index 2f95059c..89a413cc 100755 --- a/test/e2e-linkerd.sh +++ b/test/e2e-linkerd.sh @@ -2,7 +2,7 @@ set -o errexit -LINKERD_VER="stable-2.7.1" +LINKERD_VER="stable-2.8.0" REPO_ROOT=$(git rev-parse --show-toplevel) curl -SsL https://github.com/linkerd/linkerd2/releases/download/${LINKERD_VER}/linkerd2-cli-${LINKERD_VER}-linux > ${REPO_ROOT}/bin/linkerd diff --git a/test/e2e-nginx.sh b/test/e2e-nginx.sh index c0f4ee95..e6ba35cf 100755 --- a/test/e2e-nginx.sh +++ b/test/e2e-nginx.sh @@ -3,7 +3,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) -NGINX_HELM_VERSION=1.34.3 # ingress v0.30.0 +NGINX_HELM_VERSION=1.39.1 # ingress v0.32.0 echo '>>> Installing NGINX Ingress' kubectl create ns ingress-nginx @@ -32,4 +32,3 @@ kubectl -n ingress-nginx set image deployment/flagger flagger=test/flagger:lates kubectl -n ingress-nginx rollout status deployment/flagger kubectl -n ingress-nginx rollout status deployment/flagger-prometheus - diff --git a/test/e2e-smi-istio.sh b/test/e2e-smi-istio.sh deleted file mode 100755 index 651fa6de..00000000 --- a/test/e2e-smi-istio.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit - -ISTIO_VER="1.1.9" -REPO_ROOT=$(git rev-parse --show-toplevel) - -echo ">>> Installing Istio ${ISTIO_VER}" -helm repo add istio.io https://storage.googleapis.com/istio-release/releases/${ISTIO_VER}/charts - -echo '>>> Installing Istio CRDs' -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 - -echo '>>> Installing Istio control plane' -helm upgrade -i istio istio.io/istio --wait --namespace istio-system -f ${REPO_ROOT}/test/e2e-istio-values.yaml - -echo '>>> Installing the SMI Istio adapter' -kubectl apply -f ${REPO_ROOT}/artifacts/smi/istio-adapter.yaml - -kubectl -n istio-system rollout status deployment/smi-adapter-istio - -echo '>>> Load Flagger image in Kind' -kind load docker-image test/flagger:latest - -echo '>>> Installing Flagger' -helm upgrade -i flagger ${REPO_ROOT}/charts/flagger \ ---namespace istio-system \ ---set meshProvider=smi:istio - -kubectl -n istio-system set image deployment/flagger flagger=test/flagger:latest - -kubectl -n istio-system rollout status deployment/flagger diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh deleted file mode 100755 index 5a75e3a7..00000000 --- a/test/e2e-supergloo.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit - -ISTIO_VER="1.0.6" -SUPERGLOO_VER="v0.3.13" -REPO_ROOT=$(git rev-parse --show-toplevel) - -echo ">>> Downloading Supergloo CLI" -curl -SsL https://github.com/solo-io/supergloo/releases/download/${SUPERGLOO_VER}/supergloo-cli-linux-amd64 > ${REPO_ROOT}/bin/supergloo-cli -chmod +x ${REPO_ROOT}/bin/supergloo-cli - -echo ">>> Installing Supergloo" -${REPO_ROOT}/bin/supergloo-cli init - -echo ">>> Installing Istio ${ISTIO_VER}" -kubectl create ns istio-system -${REPO_ROOT}/bin/supergloo-cli install istio --name test --version ${ISTIO_VER} \ - --namespace supergloo-system --installation-namespace istio-system \ - --auto-inject=true --mtls=false --prometheus=true - -echo '>>> Waiting for Istio to be ready' -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 -kubectl -n istio-system rollout status deployment/istio-telemetry -kubectl -n istio-system rollout status deployment/prometheus - -kubectl -n istio-system get all - -echo '>>> Load Flagger image in Kind' -kind load docker-image test/flagger:latest - -echo '>>> Installing Flagger' -helm upgrade -i flagger ${REPO_ROOT}/charts/flagger \ ---namespace istio-system \ ---set meshProvider=supergloo:test.supergloo-system - -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