From 74c69dc07ef1ce7d430cdca511f5be47ef861fe3 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 22 Jun 2019 16:48:38 +0300 Subject: [PATCH 1/4] Update Gloo e2e to v0.14.0 --- test/e2e-gloo-tests.sh | 7 ++++--- test/e2e-gloo.sh | 3 ++- test/e2e-supergloo.sh | 11 +++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh index 8414427e..b1b12f10 100755 --- a/test/e2e-gloo-tests.sh +++ b/test/e2e-gloo-tests.sh @@ -5,6 +5,7 @@ set -o errexit +GLOO_VER="0.14.0" REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" @@ -12,8 +13,8 @@ echo '>>> Creating test namespace' kubectl create namespace test echo ">>> Downloading Gloo CLI" -curl -SsL https://github.com/solo-io/gloo/releases/download/v0.13.29/glooctl-linux-amd64 > glooctl -chmod +x glooctl +curl -SsL https://github.com/solo-io/gloo/releases/download/v${GLOO_VER}/glooctl-linux-amd64 > ${REPO_ROOT}/bin/glooctl +chmod +x ${REPO_ROOT}/bin/glooctl echo '>>> Installing load tester' kubectl -n test apply -f ${REPO_ROOT}/artifacts/loadtester/ @@ -21,7 +22,7 @@ kubectl -n test rollout status deployment/flagger-loadtester echo '>>> Initialising canary' kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml -./glooctl add route --path-prefix / --upstream-group-name podinfo --upstream-group-namespace test +${REPO_ROOT}/bin/glooctl add route --path-prefix / --upstream-group-name podinfo --upstream-group-namespace test cat <>> Installing Gloo' helm repo add gloo https://storage.googleapis.com/solo-public-helm -helm upgrade -i gloo gloo/gloo --version 0.13.29 \ +helm upgrade -i gloo gloo/gloo --version ${GLOO_VER} \ --wait \ --namespace gloo-system \ --set gatewayProxies.gateway-proxy.service.type=NodePort diff --git a/test/e2e-supergloo.sh b/test/e2e-supergloo.sh index ed7a122d..0666729f 100755 --- a/test/e2e-supergloo.sh +++ b/test/e2e-supergloo.sh @@ -8,14 +8,17 @@ REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" echo ">>> Downloading Supergloo CLI" -curl -SsL https://github.com/solo-io/supergloo/releases/download/${SUPERGLOO_VER}/supergloo-cli-linux-amd64 > supergloo-cli -chmod +x 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" -./supergloo-cli init +${REPO_ROOT}/bin/supergloo-cli init + 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} +${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 From ba60b127ea740585544e8d415440bd29cd53c2cb Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 22 Jun 2019 16:50:50 +0300 Subject: [PATCH 2/4] Use Kind 0.3.0 for Gloo e2e --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d075c95..137dcd5c 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 0.2.1 + - run: test/e2e-kind.sh - run: test/e2e-gloo.sh - run: test/e2e-gloo-tests.sh From e3c102e7f802b2186c9ef28913480425fa1bfef0 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 22 Jun 2019 17:49:13 +0300 Subject: [PATCH 3/4] Use test ns for Gloo virtual service in e2e --- test/e2e-gloo-tests.sh | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh index b1b12f10..6f948367 100755 --- a/test/e2e-gloo-tests.sh +++ b/test/e2e-gloo-tests.sh @@ -5,24 +5,38 @@ set -o errexit -GLOO_VER="0.14.0" REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" echo '>>> Creating test namespace' kubectl create namespace test -echo ">>> Downloading Gloo CLI" -curl -SsL https://github.com/solo-io/gloo/releases/download/v${GLOO_VER}/glooctl-linux-amd64 > ${REPO_ROOT}/bin/glooctl -chmod +x ${REPO_ROOT}/bin/glooctl - echo '>>> Installing load tester' kubectl -n test apply -f ${REPO_ROOT}/artifacts/loadtester/ kubectl -n test rollout status deployment/flagger-loadtester echo '>>> Initialising canary' kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml -${REPO_ROOT}/bin/glooctl add route --path-prefix / --upstream-group-name podinfo --upstream-group-namespace test + +cat < Date: Sun, 23 Jun 2019 11:21:05 +0300 Subject: [PATCH 4/4] Use Kind 0.2.1 for Gloo e2e --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 137dcd5c..9d075c95 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