Merge pull request #2414 from gregwhorley/patch-1

Fix ingress spec in given examples
kubernetes-sigs · Dec 17, 2021 · 277251b · 277251b
2 parents 8b07536 + f2fc9c9
commit 277251b
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 34 deletions.
diff --git a/docs/tutorials/alb-ingress.md b/docs/tutorials/alb-ingress.md
@@ -83,14 +83,18 @@ metadata:
     kubernetes.io/ingress.class: alb
   name: echoserver
 spec:
+  ingressClassName: alb
   rules:
   - host: echoserver.mycluster.example.org
     http: &echoserver_root
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
   - host: echoserver.example.org
     http: *echoserver_root
 ```
@@ -119,13 +123,17 @@ metadata:
     kubernetes.io/ingress.class: alb
   name: echoserver
 spec:
+  ingressClassName: alb
   rules:
   - http:
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
 ```
 
 In the above example we create a default path that works for any hostname, and
@@ -154,14 +162,18 @@ metadata:
     kubernetes.io/ingress.class: alb
   name: echoserver
 spec:
+  ingressClassName: alb
   rules:
   - host: echoserver.example.org
     http:
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
 ```
 
 The above Ingress object will result in the creation of an ALB with a dualstack

diff --git a/docs/tutorials/kube-ingress-aws.md b/docs/tutorials/kube-ingress-aws.md
@@ -145,14 +145,18 @@ metadata:
     kubernetes.io/ingress.class: skipper
   name: echoserver
 spec:
+  ingressClassName: skipper
   rules:
   - host: echoserver.mycluster.example.org
     http: &echoserver_root
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
   - host: echoserver.example.org
     http: *echoserver_root
 ```
@@ -180,13 +184,17 @@ metadata:
     kubernetes.io/ingress.class: skipper
   name: echoserver
 spec:
+  ingressClassName: skipper
   rules:
   - http:
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
 ```
 
 In the above example we create a default path that works for any hostname, and
@@ -213,14 +221,18 @@ metadata:
     kubernetes.io/ingress.class: skipper
   name: echoserver
 spec:
+  ingressClassName: skipper
   rules:
   - host: echoserver.example.org
     http:
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
 ```
 
 The above Ingress object will result in the creation of an ALB with a dualstack
@@ -247,14 +259,18 @@ metadata:
     kubernetes.io/ingress.class: skipper
   name: echoserver
 spec:
+  ingressClassName: skipper
   rules:
   - host: echoserver.example.org
     http:
       paths:
-      - backend:
-          serviceName: echoserver
-          servicePort: 80
-        path: /
+      - path: /
+        backend:
+          service:
+            name: echoserver
+            port:
+              number: 80
+        pathType: Prefix
 ```
 
 The above Ingress object will result in the creation of an NLB. A

diff --git a/docs/tutorials/nginx-ingress.md b/docs/tutorials/nginx-ingress.md
@@ -297,13 +297,18 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
 spec:
+  ingressClassName: nginx
   rules:
   - host: via-ingress.external-dns-test.gcp.zalan.do
     http:
       paths:
-      - backend:
-          serviceName: nginx
-          servicePort: 80
+      - path: /
+        backend:
+          service:
+            name: nginx
+            port:
+              number: 80
+        pathType: Prefix
 
 ---
 
@@ -593,13 +598,18 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
 spec:
+  ingressClassName: nginx
   rules:
   - host: via-ingress.external-dns-test.gcp.zalan.do
     http:
       paths:
-      - backend:
-          serviceName: nginx
-          servicePort: 80
+      - path: /
+        backend:
+          service:
+            name: nginx
+            port:
+              number: 80
+        pathType: Prefix
 ---
 apiVersion: v1
 kind: Service