From e3c102e7f802b2186c9ef28913480425fa1bfef0 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2019 17:49:13 +0300
Subject: [PATCH] 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 <<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
@@ -90,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