Merge pull request #221 from weaveworks/gloo-v0.14.0

Update Gloo e2e testing to v0.14.0

test/e2e-gloo-tests.sh

@@ -11,17 +11,32 @@ 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/v0.13.29/glooctl-linux-amd64 > glooctl
-chmod +x 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
-./glooctl add route --path-prefix / --upstream-group-name podinfo --upstream-group-namespace test
+
+cat <<EOF | kubectl apply -f -
+apiVersion: gateway.solo.io/v1
+kind: VirtualService
+metadata:
+  name: podinfo
+  namespace: gloo-system
+spec:
+  virtualHost:
+    domains:
+      - '*'
+    name: podinfo
+    routes:
+      - matcher:
+          prefix: /
+        routeAction:
+          upstreamGroup:
+            name: podinfo
+            namespace: test
+EOF
 
 cat <<EOF | kubectl apply -f -
 apiVersion: flagger.app/v1alpha3
@@ -89,6 +104,7 @@ until ${ok}; do
         kubectl -n test describe deployment/podinfo
         kubectl -n test describe deployment/podinfo-primary
         kubectl -n gloo-system logs deployment/flagger
+        kubectl -n gloo-system get virtualservice podinfo -oyaml
         echo "No more retries left"
         exit 1
     fi

test/e2e-gloo.sh

@@ -2,12 +2,13 @@
 
 set -o errexit
 
+GLOO_VER="0.14.0"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
 echo '>>> 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

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