From b5fb7cdae55920f9f4f75b6742b11517051de59e Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sun, 6 Oct 2019 14:13:24 +0300
Subject: [PATCH] Add target port number to  Gloo e2e tests Update Gloo to
 v0.20.2 Enable Gloo discovery Fix: #328

---
 test/e2e-gloo-tests.sh | 17 ++++++++++++++---
 test/e2e-gloo.sh       |  5 +++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh
index a340d3e3..2b614c47 100755
--- a/test/e2e-gloo-tests.sh
+++ b/test/e2e-gloo-tests.sh
@@ -27,7 +27,7 @@ metadata:
 spec:
   virtualHost:
     domains:
-      - '*'
+      - app.example.com
     name: podinfo
     routes:
       - matcher:
@@ -36,6 +36,9 @@ spec:
           upstreamGroup:
             name: podinfo
             namespace: test
+        routePlugins:
+          prefixRewrite:
+            prefixRewrite: "/"
 EOF
 
 cat <<EOF | kubectl apply -f -
@@ -52,7 +55,8 @@ spec:
     name: podinfo
   progressDeadlineSeconds: 60
   service:
-    port: 9898
+    port: 80
+    targetPort: 9898
   canaryAnalysis:
     interval: 15s
     threshold: 15
@@ -72,7 +76,14 @@ spec:
         timeout: 10s
         metadata:
           type: bash
-          cmd: "curl -sd 'test' http://podinfo-canary:9898/token | grep token"
+          cmd: "curl -sd 'test' http://podinfo-canary/token | grep token"
+      - name: gloo-acceptance-test
+        type: pre-rollout
+        url: http://flagger-loadtester.test/
+        timeout: 10s
+        metadata:
+          type: bash
+          cmd: "curl -sd 'test' -H 'Host: app.example.com' http://gateway-proxy-v2.gloo-system/token | grep token"
       - name: load-test
         url: http://flagger-loadtester.test/
         timeout: 5s
diff --git a/test/e2e-gloo.sh b/test/e2e-gloo.sh
index 6f99dc32..e9d2fe39 100755
--- a/test/e2e-gloo.sh
+++ b/test/e2e-gloo.sh
@@ -2,14 +2,15 @@
 
 set -o errexit
 
-GLOO_VER="0.18.8"
+GLOO_VER="0.20.2"
 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 ${GLOO_VER} \
---namespace gloo-system
+--namespace gloo-system \
+--set discovery.enabled=true
 
 kubectl -n gloo-system rollout status deployment/gloo
 kubectl -n gloo-system rollout status deployment/gateway-proxy-v2