fix ingress syntax. (#7867)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -100,7 +100,7 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main
 ## Create an ingress (please add any additional annotation required)
 
 echo "
-  apiVersion: networking.k8s.io/v1beta1
+  apiVersion: networking.k8s.io/v1
   kind: Ingress
   metadata:
     name: foo-bar
@@ -109,10 +109,13 @@ echo "
     - host: foo.bar
       http:
         paths:
-        - backend:
+        - path: /
-            serviceName: http-svc
+          pathType: Prefix
-            servicePort: 80
+          backend:
-          path: /
+            service:
+              name: http-svc
+              port: 
+                number: 80
 " | kubectl apply -f -
 
 ## make a request

docs/examples/affinity/cookie/ingress-samesite.yaml

@@ -15,10 +15,13 @@ spec:
   - host: stickyingress-samesite-none.example.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port:
+              number: 80
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -35,7 +38,10 @@ spec:
   - host: stickyingress-samesite-strict.example.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port:
+              number: 80

docs/examples/affinity/cookie/ingress.yaml

@@ -13,7 +13,10 @@ spec:
   - host: stickyingress.example.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port: 
+              number: 80

docs/examples/auth/basic/README.md

@@ -47,9 +47,12 @@ spec:
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: http-svc
+          service: 
-          servicePort: 80
+            name: http-svc
+            port: 
+              number: 80
 " | kubectl create -f -
 ```
 

docs/examples/auth/client-certs/ingress.yaml

@@ -19,10 +19,13 @@ spec:
   - host: mydomain.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port:
+              number: 80
   tls:
   - hosts:
     - mydomain.com

docs/examples/auth/external-auth/README.md

@@ -30,10 +30,13 @@ spec:
   - host: external-auth-01.sample.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service: 
+            name: http-svc
+            port: 
+              number: 80
 status:
   loadBalancer:
     ingress:

docs/examples/auth/external-auth/ingress.yaml

@@ -9,7 +9,10 @@ spec:
   - host: external-auth-01.sample.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port:
+              number: 80

docs/examples/auth/oauth-external-auth/dashboard-ingress.yaml

@@ -11,11 +11,13 @@ spec:
   - host: __INGRESS_HOST__
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: kubernetes-dashboard
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
-
+            name: kubernetes-dashboard
+            port:
+              number: 80
 ---
 
 apiVersion: networking.k8s.io/v1
@@ -28,10 +30,13 @@ spec:
   - host: __INGRESS_HOST__
     http:
       paths:
-      - backend:
+      - path: /oauth2
-          serviceName: oauth2-proxy
+        pathType: Prefix
-          servicePort: 4180
+        backend:
-        path: /oauth2
+          service:
+            name: oauth2-proxy
+            port:
+              number: 4180
   tls:
   - hosts:
     - __INGRESS_HOST__

docs/examples/chashsubset/deployment.yaml

@@ -64,7 +64,15 @@ metadata:
   name: nginxhello-ingress
   namespace: default
 spec:
+  rules:
+  - host: foo.bar.com
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
           backend:
-    serviceName: nginxhello
+            service:
-    servicePort: 80
+              name: nginxhello
+              port:
+                number: 80
 

docs/examples/customization/configuration-snippets/ingress.yaml

@@ -10,7 +10,10 @@ spec:
   - host: custom.configuration.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port:
+              number: 80

docs/examples/customization/external-auth-headers/deploy/echo-service.yaml

@@ -56,10 +56,13 @@ spec:
   - host: public-demo-echo-service.kube.local
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: demo-echo-service
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: demo-echo-service
+            port:
+              number: 80
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -74,7 +77,10 @@ spec:
   - host: secure-demo-echo-service.kube.local
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: demo-echo-service
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: demo-echo-service
+            port:
+              number: 80

docs/examples/docker-registry/ingress-with-tls.yaml

@@ -17,7 +17,10 @@ spec:
   - host: registry.<your domain>
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: docker-registry
+        pathType: Prefix
-          servicePort: 5000
+        backend:
-        path: /
+          service:
+            name: docker-registry
+            port:
+              number: 5000

docs/examples/docker-registry/ingress-without-tls.yaml

@@ -12,7 +12,10 @@ spec:
   - host: registry.<your domain>
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: docker-registry
+        pathType: Prefix
-          servicePort: 5000
+        backend:
-        path: /
+          service:
+            name: docker-registry
+            port:
+              number: 5000

docs/examples/multi-tls/multi-tls.yaml

@@ -115,14 +115,20 @@ spec:
   - host: foo.bar.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port:
+              number: 80
   - host: bar.baz.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: nginx
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service
+            name: nginx
+            port:
+              number: 80

docs/examples/rewrite/README.md

@@ -46,10 +46,13 @@ spec:
   - host: rewrite.bar.com
     http:
       paths:
-      - backend:
+      - path: /something(/|$)(.*)
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /something(/|$)(.*)
+          service:
+            name: http-svc
+            port: 
+              number: 80
 ' | kubectl create -f -
 ```
 
@@ -78,10 +81,13 @@ spec:
   - host: approot.bar.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: http-svc
+        pathType: Prefix
-          servicePort: 80
+        backend:
-        path: /
+          service:
+            name: http-svc
+            port: 
+              number: 80
 " | kubectl create -f -
 ```
 

docs/examples/static-ip/nginx-ingress.yaml

@@ -9,7 +9,11 @@ spec:
   rules:
   - http:
       paths:
-      - backend:
+      - path: /
+        pathType: Prefix
+        backend:
           # This assumes http-svc exists and routes to healthy endpoints.
-          serviceName: http-svc
+          service:
-          servicePort: 80
+            name: http-svc
+            port:
+              number: 80

docs/examples/tls-termination/README.md

@@ -27,10 +27,13 @@ spec:
       http:
         paths:
         - path: /
+          pathType: Prefix
           backend:
             # This assumes http-svc exists and routes to healthy endpoints
-            serviceName: http-svc
+            service:
-            servicePort: 80
+              name: http-svc
+              port: 
+                number: 80
 ```
 
 The following command instructs the controller to terminate traffic using the provided

docs/examples/tls-termination/ingress.yaml

@@ -14,7 +14,10 @@ spec:
       http:
         paths:
         - path: /
+          pathType: Prefix
           backend:
             # This assumes http-svc exists and routes to healthy endpoints
-            serviceName: http-svc
+            service:
-            servicePort: 80
+              name: http-svc
+              port:
+                number: 80

docs/user-guide/fcgi-services.md

@@ -74,9 +74,13 @@ spec:
   - host: app.example.com
     http:
       paths:
-      - backend:
+      - path: /
-          serviceName: example-service
+        pathType: Prefix
-          servicePort: fastcgi
+        backend:
+          service:
+            name: example-service
+            port:
+              name: fastcgi
 ```
 
 ## FastCGI Ingress Annotations

docs/user-guide/ingress-path-matching.md

@@ -27,9 +27,12 @@ spec:
     http:
       paths:
       - path: /foo/.*
+        pathType: Prefix
         backend:
-          serviceName: test
+          service:
-          servicePort: 80
+            name: test
+            port:
+              number: 80
 ```
 
 The preceding ingress definition would translate to the following location block within the NGINX configuration for the `test.com` server:
@@ -61,13 +64,19 @@ spec:
     http:
       paths:
       - path: /foo/bar
+        pathType: Prefix
         backend:
-          serviceName: service1
+          service:
-          servicePort: 80
+            name: service1
+            port:
+              number: 80
       - path: /foo/bar/
+        pathType: Prefix
         backend:
-          serviceName: service2
+          service:
-          servicePort: 80
+            name: service2
+            port:
+              number: 80
 ```
 
 ```yaml
@@ -83,9 +92,12 @@ spec:
     http:
       paths:
       - path: /foo/bar/(.+)
+        pathType: Prefix
         backend:
-          serviceName: service3
+          service:
-          servicePort: 80
+            name: service3
+            port: 
+              number: 80
 ```
 
 The ingress controller would define the following location blocks, in order of descending length, within the NGINX template for the `test.com` server:
@@ -137,13 +149,19 @@ spec:
     http:
       paths:
       - path: /foo/bar/bar
+        pathType: Prefix
         backend:
-          serviceName: test
+          service:
-          servicePort: 80
+            name: test
+            port: 
+              number: 80
       - path: /foo/bar/[A-Z0-9]{3}
+        pathType: Prefix
         backend:
-          serviceName: test
+          service:
-          servicePort: 80
+            name: test
+            port: 
+              number: 80
 ```
 
 The ingress controller would define the following location blocks (in this order) within the NGINX template for the `test.com` server:

docs/user-guide/third-party-addons/opentracing.md

@@ -189,10 +189,13 @@ In the Zipkin interface we can see the details:
         - host: example.com
           http:
             paths:
-            - backend:
+            - path: /echo
-                serviceName: echoheaders-x
+              pathType: Prefix
-                servicePort: 80
+              backend:
-              path: /echo
+                service:
+                  name: echoheaders-x
+                  port:
+                    number: 80
       ' | kubectl apply -f -
     ```