fix deprecated ingress

Signed-off-by: Hui Kang <[email protected]>
argoproj · Jan 3, 2022 · 731b5ad · 731b5ad
1 parent 8c5611a
commit 731b5ad
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 39 deletions.
diff --git a/test/e2e/alb/rollout-alb-experiment-no-setweight.yaml b/test/e2e/alb/rollout-alb-experiment-no-setweight.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: alb-rollout
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alb-rollout-ingress
@@ -51,9 +51,12 @@ spec:
     - http:
         paths:
           - path: /*
+            pathType: ImplementationSpecific
             backend:
-              serviceName: alb-rollout-root
-              servicePort: use-annotation
+              service:
+                name: alb-rollout-root
+                port:
+                  name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/alb/rollout-alb-experiment.yaml b/test/e2e/alb/rollout-alb-experiment.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: alb-rollout
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alb-rollout-ingress
@@ -51,9 +51,12 @@ spec:
     - http:
         paths:
           - path: /*
+            pathType: ImplementationSpecific
             backend:
-              serviceName: alb-rollout-root
-              servicePort: use-annotation
+              service:
+                name: alb-rollout-root
+                port:
+                  name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/alb-bluegreen-rollout.yaml b/test/e2e/functional/alb-bluegreen-rollout.yaml
@@ -26,7 +26,7 @@ spec:
   selector:
     app: alb-bluegreen
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alb-bluegreen-ingress
@@ -38,8 +38,10 @@ spec:
       paths:
       - path: /*
         backend:
-          serviceName: alb-bluegreen-stable
-          servicePort: 80
+          service:
+            name: alb-bluegreen-stable
+            port:
+              number: 80
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/alb-canary-rollout.yaml b/test/e2e/functional/alb-canary-rollout.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: alb-canary
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alb-canary-ingress
@@ -52,8 +52,10 @@ spec:
       paths:
       - path: /*
         backend:
-          serviceName: alb-canary-root
-          servicePort: use-annotation
+          service:
+            name: alb-canary-root
+            port:
+              name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/canary-dynamic-stable-scale.yaml b/test/e2e/functional/canary-dynamic-stable-scale.yaml
@@ -38,7 +38,7 @@ spec:
   selector:
     app: dynamic-stable-scale
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: dynamic-stable-scale-ingress
@@ -50,8 +50,10 @@ spec:
       paths:
       - path: /*
         backend:
-          serviceName: dynamic-stable-scale-root
-          servicePort: use-annotation
+          service:
+            name: dynamic-stable-scale-root
+            port:
+              name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/canary-scaledowndelay.yaml b/test/e2e/functional/canary-scaledowndelay.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: canary-scaledowndelay
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: canary-scaledowndelay-ingress
@@ -52,8 +52,10 @@ spec:
       paths:
       - path: /*
         backend:
-          serviceName: canary-scaledowndelay-root
-          servicePort: use-annotation
+          service:
+            name: canary-scaledowndelay-root
+            port:
+              name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/canary-scaledownonabort.yaml b/test/e2e/functional/canary-scaledownonabort.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: canary-scaledowndelay
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: canary-scaledowndelay-ingress
@@ -52,8 +52,10 @@ spec:
       paths:
       - path: /*
         backend:
-          serviceName: canary-scaledowndelay-root
-          servicePort: use-annotation
+          service:
+            name: canary-scaledowndelay-root
+            port:
+              name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/canary-unscaledownonabort.yaml b/test/e2e/functional/canary-unscaledownonabort.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: canary-scaledowndelay
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: canary-scaledowndelay-ingress
@@ -52,8 +52,9 @@ spec:
       paths:
       - path: /*
         backend:
-          serviceName: canary-scaledowndelay-root
-          servicePort: use-annotation
+          name:: canary-scaledowndelay-root
+          port:
+            name: use-annotation
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/functional/nginx-template.yaml b/test/e2e/functional/nginx-template.yaml
@@ -26,7 +26,7 @@ spec:
   selector:
     app: REPLACEME
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: REPLACEME-ingress
@@ -38,8 +38,10 @@ spec:
         paths:
           - path: /*
             backend:
-              serviceName: REPLACEME-stable
-              servicePort: 80
+              service:
+                name: REPLACEME-stable
+                port:
+                  number: 80
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/smi/rollout-smi-experiment.yaml b/test/e2e/smi/rollout-smi-experiment.yaml
@@ -28,7 +28,7 @@ spec:
     # This selector will be updated with the pod-template-hash of the stable ReplicaSet. e.g.:
     # rollouts-pod-template-hash: 789746c88d
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: rollout-smi-experiment-stable
@@ -40,10 +40,13 @@ spec:
       http:
         paths:
           - path: /
+            pathType: ImplementationSpecific
             backend:
               # Reference to a Service name, also specified in the Rollout spec.strategy.canary.stableService field
-              serviceName: rollout-smi-experiment-stable
-              servicePort: 80
+              service:
+                name: rollout-smi-experiment-stable
+                port:
+                  number: 80
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/e2e/smi_ingress/rollout-smi-ingress-canary.yaml b/test/e2e/smi_ingress/rollout-smi-ingress-canary.yaml
@@ -28,7 +28,7 @@ spec:
     # This selector will be updated with the pod-template-hash of the stable ReplicaSet. e.g.:
     # rollouts-pod-template-hash: 789746c88d
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: rollout-smi-ingress-canary-stable
@@ -42,8 +42,10 @@ spec:
           - path: /
             backend:
               # Reference to a Service name, also specified in the Rollout spec.strategy.canary.stableService field
-              serviceName: rollout-smi-ingress-canary-stable
-              servicePort: 80
+              service:
+                name: rollout-smi-ingress-canary-stable
+                port: 
+                  number: 80
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout

diff --git a/test/kustomize/rollout/expected.yaml b/test/kustomize/rollout/expected.yaml
@@ -351,7 +351,7 @@ spec:
         host: guestbook-canary-svc
       weight: 0
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -365,5 +365,7 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: website
-          servicePort: 80
+          service:
+            name: website
+            port:
+              number: 80
diff --git a/test/kustomize/rollout/rollout.yaml b/test/kustomize/rollout/rollout.yaml
@@ -182,7 +182,7 @@ spec:
     targetPort: 8080
 
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: networking-ingress
@@ -192,8 +192,10 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: website
-          servicePort: 80
+          service:
+            name: website
+            port:
+              number: 80
 
 ---
 apiVersion: extensions/v1beta1