bump e2e test to ingress v1

test/e2e/testing-manifests/ingress/gce/static-ip-2/ing.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: static-ip
@@ -11,6 +11,9 @@ spec:
     http:
       paths:
       - path: /foo
+        pathType: "Prefix"
         backend:
-          serviceName: echoheaders-https
-          servicePort: 80
+          service:
+            name: echoheaders-https
+            port:
+              number: 80

test/e2e/testing-manifests/ingress/http/ing.yaml

@@ -1,28 +1,40 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: echomap
 spec:
   # kubemci requires a default backend.
-  backend:
-    serviceName: echoheadersx
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: echoheadersx
+      port:
+        number: 80
   rules:
   - host: foo.bar.com
     http:
       paths:
       - path: /foo
+        pathType: "Prefix"
         backend:
-          serviceName: echoheadersx
-          servicePort: 80
+          service:
+            name: echoheadersx
+            port:
+              number: 80
   - host: bar.baz.com
     http:
       paths:
       - path: /bar
+        pathType: "Prefix"
         backend:
-          serviceName: echoheadersy
-          servicePort: 80
+          service:
+            name: echoheadersy
+            port:
+              number: 80
       - path: /foo
+        pathType: "Prefix"
         backend:
-          serviceName: echoheadersx
-          servicePort: 80
+          service:
+            name: echoheadersx
+            port:
+              number: 80
+

test/e2e/testing-manifests/ingress/http2/ing.yaml

@@ -1,9 +1,12 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: echomap
 spec:
   # kubemci requires a default backend.
-  backend:
-    serviceName: echoheaders
-    servicePort: 443
+  defaultBackend:
+    service:
+      name: echoheaders
+      port:
+        number: 443
+

test/e2e/testing-manifests/ingress/multiple-certs/ing.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: multiple-certs
@@ -8,27 +8,39 @@ spec:
     http:
       paths:
       - path: /test
+        pathType: "Prefix"
         backend:
-          serviceName: echoheaders-https
-          servicePort: 80
+          service:
+            name: echoheaders-https
+            port:
+              number: 80
   - host: test2.ingress.com
     http:
       paths:
       - path: /test
+        pathType: "Prefix"
         backend:
-          serviceName: echoheaders-https
-          servicePort: 80
+          service:
+            name: echoheaders-https
+            port:
+              number: 80
   - host: test3.ingress.com
     http:
       paths:
       - path: /test
+        pathType: "Prefix"
         backend:
-          serviceName: echoheaders-https
-          servicePort: 80
+          service:
+            name: echoheaders-https
+            port:
+              number: 80
   - host: test4.ingress.com
     http:
       paths:
       - path: /test
+        pathType: "Prefix"
         backend:
-          serviceName: echoheaders-https
-          servicePort: 80
+          service:
+            name: echoheaders-https
+            port:
+              number: 80

test/e2e/testing-manifests/ingress/neg-clusterip/ing.yaml

@@ -1,8 +1,10 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: hostname
 spec:
-  backend:
-    serviceName: hostname
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: hostname
+      port:
+        number: 80

test/e2e/testing-manifests/ingress/neg-exposed/ing.yaml

@@ -1,8 +1,10 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: hostname
 spec:
-  backend:
-    serviceName: hostname
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: hostname
+      port:
+        number: 80

test/e2e/testing-manifests/ingress/neg/ing.yaml

@@ -1,8 +1,10 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: hostname
 spec:
-  backend:
-    serviceName: hostname
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: hostname
+      port:
+        number: 80

test/e2e/testing-manifests/ingress/nginx/rc.yaml

@@ -17,7 +17,19 @@ spec:
     spec:
       terminationGracePeriodSeconds: 0
       containers:
-      - image: k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.1
+      - image: k8s.gcr.io/ingress-nginx/controller:v0.46.0
+        args:
+        - /nginx-ingress-controller
+        - --election-id=ingress-controller-leader
+        - --ingress-class=nginx
+        securityContext:
+          capabilities:
+              drop:
+              - ALL
+              add:
+              - NET_BIND_SERVICE
+          runAsUser: 101
+          allowPrivilegeEscalation: true
         livenessProbe:
           httpGet:
             path: /healthz
@@ -41,11 +53,3 @@ spec:
           hostPort: 80
         - containerPort: 443
           hostPort: 443
-        # we expose 18080 to access nginx stats in url /nginx-status
-        # this is optional
-        - containerPort: 18080
-          hostPort: 18080
-        args:
-        - /nginx-ingress-controller
-        - --default-backend-service=kube-system/default-http-backend
-        - --publish-service=$(POD_NAMESPACE)/nginx-ingress-lb

test/e2e/testing-manifests/ingress/pre-shared-cert/ing.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: pre-shared-cert
@@ -7,14 +7,20 @@ metadata:
   #  ingress.gcp.kubernetes.io/pre-shared-cert: "test-pre-shared-cert"
 spec:
   # kubemci requires a default backend.
-  backend:
-    serviceName: echoheaders-https
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: echoheaders-https
+      port:
+        number: 80
   rules:
   - host: test.ingress.com
     http:
       paths:
       - path: /test
+        pathType: "Prefix"
         backend:
-          serviceName: echoheaders-https
-          servicePort: 80
+          service:
+            name: echoheaders-https
+            port:
+              number: 80
+

test/e2e/testing-manifests/ingress/static-ip/ing.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: static-ip
@@ -10,6 +10,8 @@ spec:
   # This assumes tls-secret exists.
   # To generate it run the make in this directory.
   - secretName: tls-secret
-  backend:
-    serviceName: echoheaders-https
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: echoheaders-https
+      port:
+        number: 80