From 6c35f7611b077e154b73bfaabd14ad634b4c3675 Mon Sep 17 00:00:00 2001
From: Forrest Thomas <fthomas@splunk.com>
Date: Fri, 4 Sep 2020 09:35:11 -0700
Subject: [PATCH] address PR review comments and remove unnecessary
 configuration from Canary CR in e2e tests

---
 test/e2e-contour-tests.sh | 25 -------------------------
 test/e2e-gloo-tests.sh    | 25 -------------------------
 test/e2e-istio-tests.sh   | 25 -------------------------
 test/e2e-linkerd-tests.sh | 25 -------------------------
 test/e2e-nginx-tests.sh   | 25 -------------------------
 5 files changed, 125 deletions(-)

diff --git a/test/e2e-contour-tests.sh b/test/e2e-contour-tests.sh
index 4b06f534..59877228 100755
--- a/test/e2e-contour-tests.sh
+++ b/test/e2e-contour-tests.sh
@@ -100,11 +100,6 @@ spec:
   service:
     port: 9898
     portDiscovery: true
-    apex:
-      annotations:
-        test: "annotations-test"
-      labels:
-        test: "labels-test"
     headers:
       request:
         add:
@@ -116,26 +111,6 @@ spec:
     threshold: 15
     maxWeight: 30
     stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: istio-system
-      thresholdRange:
-        max: 500
-      interval: 1m
-    webhooks:
-      - name: load-test
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          type: cmd
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo.test:9898/"
-          logCmdOutput: "true"
 EOF
 
 echo '>>> Waiting for primary to be ready'
diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh
index c2456ee6..a52b7221 100755
--- a/test/e2e-gloo-tests.sh
+++ b/test/e2e-gloo-tests.sh
@@ -103,11 +103,6 @@ spec:
   service:
     port: 9898
     portDiscovery: true
-    apex:
-      annotations:
-        test: "annotations-test"
-      labels:
-        test: "labels-test"
     headers:
       request:
         add:
@@ -119,26 +114,6 @@ spec:
     threshold: 15
     maxWeight: 30
     stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: istio-system
-      thresholdRange:
-        max: 500
-      interval: 1m
-    webhooks:
-      - name: load-test
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          type: cmd
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo.test:9898/"
-          logCmdOutput: "true"
 EOF
 
 echo '>>> Waiting for primary to be ready'
diff --git a/test/e2e-istio-tests.sh b/test/e2e-istio-tests.sh
index adde9c1e..45e85382 100755
--- a/test/e2e-istio-tests.sh
+++ b/test/e2e-istio-tests.sh
@@ -113,11 +113,6 @@ spec:
   service:
     port: 9898
     portDiscovery: true
-    apex:
-      annotations:
-        test: "annotations-test"
-      labels:
-        test: "labels-test"
     headers:
       request:
         add:
@@ -129,26 +124,6 @@ spec:
     threshold: 15
     maxWeight: 30
     stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: istio-system
-      thresholdRange:
-        max: 500
-      interval: 1m
-    webhooks:
-      - name: load-test
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          type: cmd
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo.test:9898/"
-          logCmdOutput: "true"
 EOF
 
 echo '>>> Waiting for primary to be ready'
diff --git a/test/e2e-linkerd-tests.sh b/test/e2e-linkerd-tests.sh
index d21a04fa..d8d1d556 100755
--- a/test/e2e-linkerd-tests.sh
+++ b/test/e2e-linkerd-tests.sh
@@ -115,11 +115,6 @@ spec:
   service:
     port: 9898
     portDiscovery: true
-    apex:
-      annotations:
-        test: "annotations-test"
-      labels:
-        test: "labels-test"
     headers:
       request:
         add:
@@ -131,26 +126,6 @@ spec:
     threshold: 15
     maxWeight: 30
     stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: istio-system
-      thresholdRange:
-        max: 500
-      interval: 1m
-    webhooks:
-      - name: load-test
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          type: cmd
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo.test:9898/"
-          logCmdOutput: "true"
 EOF
 
 echo '>>> Waiting for primary to be ready'
diff --git a/test/e2e-nginx-tests.sh b/test/e2e-nginx-tests.sh
index 066d17dc..da979601 100755
--- a/test/e2e-nginx-tests.sh
+++ b/test/e2e-nginx-tests.sh
@@ -139,11 +139,6 @@ spec:
   service:
     port: 9898
     portDiscovery: true
-    apex:
-      annotations:
-        test: "annotations-test"
-      labels:
-        test: "labels-test"
     headers:
       request:
         add:
@@ -155,26 +150,6 @@ spec:
     threshold: 15
     maxWeight: 30
     stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: istio-system
-      thresholdRange:
-        max: 500
-      interval: 1m
-    webhooks:
-      - name: load-test
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          type: cmd
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo.test:9898/"
-          logCmdOutput: "true"
 EOF
 
 echo '>>> Waiting for primary to be ready'