From 82660e23dac27bd9e268971b68795ef2cf0cb259 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 28 Feb 2020 11:31:27 +0200
Subject: [PATCH] Update e2e tests to v1beta1 - set Canary API version to
 flagger.app/v1beta1 - rename canaryAnalysis to analysis

---
 test/e2e-contour-tests.sh               | 12 ++++++------
 test/e2e-gloo-tests.sh                  |  4 ++--
 test/e2e-kubernetes-tests-daemonset.sh  |  4 ++--
 test/e2e-kubernetes-tests-deployment.sh |  4 ++--
 test/e2e-kubernetes-tests-svc.sh        |  4 ++--
 test/e2e-linkerd-tests.sh               |  8 ++++----
 test/e2e-nginx-tests.sh                 |  8 ++++----
 test/e2e-tests.sh                       | 12 ++++++------
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/test/e2e-contour-tests.sh b/test/e2e-contour-tests.sh
index a27eb398..70d18372 100755
--- a/test/e2e-contour-tests.sh
+++ b/test/e2e-contour-tests.sh
@@ -34,7 +34,7 @@ spec:
 EOF
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -49,7 +49,7 @@ spec:
   service:
     port: 80
     targetPort: 9898
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 15
     maxWeight: 50
@@ -145,7 +145,7 @@ echo '✔ Canary promotion test passed'
 
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -160,7 +160,7 @@ spec:
   service:
     port: 80
     targetPort: 9898
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 15
     maxWeight: 50
@@ -218,7 +218,7 @@ done
 echo '✔ Canary rollback test passed'
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -233,7 +233,7 @@ spec:
   service:
     port: 80
     targetPort: 9898
-  canaryAnalysis:
+  analysis:
     interval: 10s
     threshold: 5
     iterations: 5
diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh
index f686a0b1..f4525c72 100755
--- a/test/e2e-gloo-tests.sh
+++ b/test/e2e-gloo-tests.sh
@@ -37,7 +37,7 @@ spec:
 EOF
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -52,7 +52,7 @@ spec:
   service:
     port: 80
     targetPort: 9898
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 15
     maxWeight: 50
diff --git a/test/e2e-kubernetes-tests-daemonset.sh b/test/e2e-kubernetes-tests-daemonset.sh
index 2b35c3bc..443f4dfb 100755
--- a/test/e2e-kubernetes-tests-daemonset.sh
+++ b/test/e2e-kubernetes-tests-daemonset.sh
@@ -18,7 +18,7 @@ echo '>>> Initialising canary'
 kubectl apply -f ${REPO_ROOT}/test/e2e-daemonset.yaml
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -35,7 +35,7 @@ spec:
     targetPort: 9898
     name: podinfo-svc
     portDiscovery: true
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 10
     iterations: 5
diff --git a/test/e2e-kubernetes-tests-deployment.sh b/test/e2e-kubernetes-tests-deployment.sh
index 65bde77b..2cd3bed7 100755
--- a/test/e2e-kubernetes-tests-deployment.sh
+++ b/test/e2e-kubernetes-tests-deployment.sh
@@ -18,7 +18,7 @@ echo '>>> Initialising canary'
 kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -35,7 +35,7 @@ spec:
     targetPort: 9898
     name: podinfo-svc
     portDiscovery: true
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 10
     iterations: 5
diff --git a/test/e2e-kubernetes-tests-svc.sh b/test/e2e-kubernetes-tests-svc.sh
index 8a5f8a87..9cc2eb39 100755
--- a/test/e2e-kubernetes-tests-svc.sh
+++ b/test/e2e-kubernetes-tests-svc.sh
@@ -34,7 +34,7 @@ spec:
 EOS
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -48,7 +48,7 @@ spec:
   progressDeadlineSeconds: 60
   service:
     port: 9898
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 10
     iterations: 5
diff --git a/test/e2e-linkerd-tests.sh b/test/e2e-linkerd-tests.sh
index 1f86dbd3..519f9f58 100755
--- a/test/e2e-linkerd-tests.sh
+++ b/test/e2e-linkerd-tests.sh
@@ -43,7 +43,7 @@ spec:
 EOF
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -58,7 +58,7 @@ spec:
     port: 80
     targetPort: http
     portDiscovery: true
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 15
     maxWeight: 50
@@ -154,7 +154,7 @@ done
 echo '✔ Canary promotion test passed'
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -168,7 +168,7 @@ spec:
   service:
     port: 80
     targetPort: 9898
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 3
     maxWeight: 50
diff --git a/test/e2e-nginx-tests.sh b/test/e2e-nginx-tests.sh
index 50129786..3cf04fe9 100755
--- a/test/e2e-nginx-tests.sh
+++ b/test/e2e-nginx-tests.sh
@@ -19,7 +19,7 @@ kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml
 kubectl apply -f ${REPO_ROOT}/test/e2e-ingress.yaml
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -37,7 +37,7 @@ spec:
   service:
     port: 80
     targetPort: http
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 15
     maxWeight: 30
@@ -156,7 +156,7 @@ done
 echo '✔ Canary promotion test passed'
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -174,7 +174,7 @@ spec:
   service:
     port: 80
     targetPort: 9898
-  canaryAnalysis:
+  analysis:
     interval: 10s
     threshold: 5
     iterations: 5
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index 599a8689..a19ef5ed 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -19,7 +19,7 @@ echo '>>> Initialising canary'
 kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -39,7 +39,7 @@ spec:
           x-envoy-upstream-rq-timeout-ms: "15000"
           x-envoy-max-retries: "10"
           x-envoy-retry-on: "gateway-error,connect-failure,refused-stream"
-  canaryAnalysis:
+  analysis:
     interval: 15s
     threshold: 15
     maxWeight: 30
@@ -145,7 +145,7 @@ if [[ "$1" = "canary" ]]; then
 fi
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -161,7 +161,7 @@ spec:
     port: 80
     targetPort: 9898
     portName: http-podinfo
-  canaryAnalysis:
+  analysis:
     interval: 10s
     threshold: 5
     iterations: 5
@@ -234,7 +234,7 @@ done
 echo '✔ B/G promotion test passed'
 
 cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1alpha3
+apiVersion: flagger.app/v1beta1
 kind: Canary
 metadata:
   name: podinfo
@@ -250,7 +250,7 @@ spec:
     port: 80
     portName: http-podinfo
     targetPort: http
-  canaryAnalysis:
+  analysis:
     interval: 10s
     threshold: 5
     iterations: 5