8000 Remove deprecated kubernetes.io/ingress.class from examples (#3029) · nginx/kubernetes-ingress@17aad37 · GitHub
[go: up one dir, main page]
Skip to content

Commit 17aad37

Browse files
lucacomelucacome
authored
Remove deprecated kubernetes.io/ingress.class from examples (#3029)
1 parent a667543 commit 17aad37

File tree

13 files changed

+16
-27
lines changed

13 files changed

+16
-27
lines changed

‎docs/content/configuration/handling-host-and-listener-collisions.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ Consider the following two resources:
3131
kind: Ingress
3232
metadata:
3333
name: cafe-ingress
34-
annotations:
35-
kubernetes.io/ingress.class: "nginx"
3634
spec:
35+
ingressClassName: nginx
3736
rules:
3837
- host: cafe.example.com
3938
. . .

‎docs/content/configuration/ingress-resources/advanced-configuration-with-annotations.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ The table below summarizes the available annotations.
9191
9292
**Note**: The annotations that start with `nginx.com` are only supported with NGINX Plus.
9393
94-
### Ingress Controller (Not Related to NGINX Configuration)
95-
96-
{{% table %}}
97-
|Annotation | ConfigMap Key | Description | Default | Example |
98-
| ---| ---| ---| ---| --- |
99-
|``kubernetes.io/ingress.class`` | N/A | Specifies which Ingress Controller must handle the Ingress resource. Set to ``nginx`` to make NGINX Ingress Controller handle it. | N/A | [Multiple Ingress Controllers](/nginx-ingress-controller/installation/running-multiple-ingress-controllers). |
100-
{{% /table %}}
101-
10294
### General Customization
10395
10496
{{% table %}}

‎examples/ingress-resources/app-protect-waf/cafe-ingress.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ kind: Ingress
33
metadata:
44
name: cafe-ingress
55
annotations:
6-
kubernetes.io/ingress.class: "nginx"
76
appprotect.f5.com/app-protect-policy: "default/dataguard-alarm"
87
appprotect.f5.com/app-protect-enable: "True"
98
appprotect.f5.com/app-protect-security-log-enable: "True"
109
appprotect.f5.com/app-protect-security-log: "default/logconf"
1110
appprotect.f5.com/app-protect-security-log-destination: "syslog:server=syslog-svc.default:514"
1211
spec:
12+
ingressClassName: nginx
1313
tls:
1414
- hosts:
1515
- cafe.example.com

‎examples/ingress-resources/basic-auth/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ In the following example we enable Basic Auth validation for the [mergeable Ingr
7878
metadata:
7979
name: cafe-ingress-master
8080
annotations:
81-
kubernetes.io/ingress.class: "nginx"
8281
nginx.org/mergeable-ingress-type: "master"
8382
spec:
83+
ingressClassName: nginx
8484
tls:
8585
- hosts:
8686
- cafe.example.com

‎examples/ingress-resources/custom-annotations/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ Customize the template for Ingress resources to include the logic to handle and
8686
metadata:
8787
name: cafe-ingress
8888
annotations:
89-
kubernetes.io/ingress.class: "nginx"
9089
custom.nginx.org/rate-limiting: "on"
9190
custom.nginx.org/rate-limiting-rate: "5r/s"
9291
custom.nginx.org/rate-limiting-burst: "1"
9392
spec:
93+
ingressClassName: nginx
9494
rules:
9595
- host: "cafe.example.com"
9696
http:

‎examples/ingress-resources/externalname-services/README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ apiVersion: networking.k8s.io/v1
4444
kind: Ingress
4545
metadata:
4646
name: example-ingress
47-
annotations:
48-
kubernetes.io/ingress.class: "nginx"
4947
spec:
48+
ingressClassName: nginx
5049
rules:
5150
- host: example.com
5251
http:

‎examples/ingress-resources/grpc-services/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ metadata:
2424
name: grpc-ingress
2525
annotations:
2626
nginx.org/grpc-services: "grpc-svc"
27-
kubernetes.io/ingress.class: "nginx"
2827
spec:
28+
ingressClassName: nginx
2929
tls:
3030
- hosts:
3131
- grpc.example.com

‎examples/ingress-resources/health-checks/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ kind: Ingress
2020
metadata:
2121
name: cafe-ingress
2222
annotations:
23-
kubernetes.io/ingress.class: "nginx"
2423
nginx.com/health-checks: "true"
2524
spec:
25+
ingressClassName: nginx
2626
rules:
2727
- host: "cafe.example.com"
2828
http:

‎examples/ingress-resources/jwt/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ In the following example we enable JWT validation for the [mergeable Ingresses](
5656
metadata:
5757
name: cafe-ingress-master
5858
annotations:
59-
kubernetes.io/ingress.class: "nginx"
6059
nginx.org/mergeable-ingress-type: "master"
6160
spec:
61+
ingressClassName: nginx
6262
tls:
6363
- hosts:
6464
- cafe.example.com
@@ -74,13 +74,13 @@ In the following example we enable JWT validation for the [mergeable Ingresses](
7474
metadata:
7575
name: cafe-ingress-tea-minion
7676
annotations:
77-
kubernetes.io/ingress.class: "nginx"
7877
nginx.org/mergeable-ingress-type: "minion"
7978
nginx.com/jwt-key: "tea-jwk"
8079
nginx.com/jwt-realm: "Tea"
8180
nginx.com/jwt-token: "$cookie_auth_token"
8281
nginx.com/jwt-login-url: "https://login-tea.cafe.example.com"
8382
spec:
83+
ingressClassName: nginx
8484
rules:
8585
- host: cafe.example.com
8686
http:
@@ -101,13 +101,13 @@ In the following example we enable JWT validation for the [mergeable Ingresses](
101101
metadata:
102102
name: cafe-ingress-coffee-minion
103103
annotations:
104-
kubernetes.io/ingress.class: "nginx"
105104
nginx.org/mergeable-ingress-type: "minion"
106105
nginx.com/jwt-key: "coffee-jwk"
107106
nginx.com/jwt-realm: "Coffee"
108107
nginx.com/jwt-token: "$cookie_auth_token"
109108
nginx.com/jwt-login-url: "https://login-coffee.cafe.example.com"
110109
spec:
110+
ingressClassName: nginx
111111
rules:
112112
- host: cafe.example.com
113113
http:

‎examples/ingress-resources/mergeable-ingress-types/cafe-master.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ kind: Ingress
33
metadata:
44
name: cafe-ingress-master
5< 2D17 /td>5
annotations:
6-
kubernetes.io/ingress.class: "nginx"
76
nginx.org/mergeable-ingress-type: "master"
87
spec:
8+
ingressClassName: nginx
99
tls:
1010
- hosts:
1111
- cafe.example.com

0 commit comments

Comments
 (0)
0