From e6aefb8f4b618fa4842a67c69063a8b3be4e2c8e Mon Sep 17 00:00:00 2001
From: Kevin Dorosh <kcdorosh@gmail.com>
Date: Thu, 10 Dec 2020 16:33:41 -0500
Subject: [PATCH] Initial commit

Signed-off-by: Kevin Dorosh <kcdorosh@gmail.com>
---
 pkg/router/gloo.go       |  4 ++--
 test/gloo/install.sh     |  2 +-
 test/gloo/test-canary.sh | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkg/router/gloo.go b/pkg/router/gloo.go
index 86e97193..bc401565 100644
--- a/pkg/router/gloo.go
+++ b/pkg/router/gloo.go
@@ -33,7 +33,7 @@ import (
 	clientset "github.com/fluxcd/flagger/pkg/client/clientset/versioned"
 )
 
-// GlooRouter is managing Istio virtual services
+// GlooRouter is managing Gloo route tables
 type GlooRouter struct {
 	kubeClient          kubernetes.Interface
 	glooClient          clientset.Interface
@@ -42,7 +42,7 @@ type GlooRouter struct {
 	upstreamDiscoveryNs string
 }
 
-// Reconcile creates or updates the Istio virtual service
+// Reconcile creates or updates the Gloo Edge route table
 func (gr *GlooRouter) Reconcile(canary *flaggerv1.Canary) error {
 	apexName, _, _ := canary.GetServiceNames()
 	canaryName := fmt.Sprintf("%s-%s-canary-%v", canary.Namespace, apexName, canary.Spec.Service.Port)
diff --git a/test/gloo/install.sh b/test/gloo/install.sh
index b68a6079..89a2f73a 100755
--- a/test/gloo/install.sh
+++ b/test/gloo/install.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-GLOO_VER="1.3.28"
+GLOO_VER="1.5.13"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 mkdir -p ${REPO_ROOT}/bin
diff --git a/test/gloo/test-canary.sh b/test/gloo/test-canary.sh
index 72ea019a..0410a55c 100755
--- a/test/gloo/test-canary.sh
+++ b/test/gloo/test-canary.sh
@@ -1,11 +1,28 @@
 #!/usr/bin/env bash
 
 # This script runs e2e tests for Canary initialization, analysis and promotion
+<<<<<<< HEAD:test/gloo/test-canary.sh
+=======
+# Prerequisites: Kubernetes Kind, Helm and Gloo Edge ingress controller
+>>>>>>> Initial commit:test/e2e-gloo-tests.sh
 
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
+<<<<<<< HEAD:test/gloo/test-canary.sh
+=======
+echo '>>> Creating test namespace'
+kubectl create namespace test
+
+echo '>>> Installing load tester'
+kubectl apply -k ${REPO_ROOT}/kustomize/tester
+kubectl -n test rollout status deployment/flagger-loadtester
+
+echo '>>> Initializing canary'
+kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml
+
+>>>>>>> Initial commit:test/e2e-gloo-tests.sh
 cat <<EOF | kubectl apply -f -
 apiVersion: gateway.solo.io/v1
 kind: VirtualService