Skip to content

Commit 839963f

Browse files
committed
Upgrade ingress to Kubernetes 1.20
1 parent f3d1d17 commit 839963f

File tree

3 files changed

+48
-24
lines changed

3 files changed

+48
-24
lines changed
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: fluentdemo
@@ -8,6 +8,9 @@ spec:
88
http:
99
paths:
1010
- path: /
11+
pathType: Prefix
1112
backend:
12-
serviceName: fluentdemo
13-
servicePort: 80
13+
service:
14+
name: fluentdemo
15+
port:
16+
number: 80

deployment/kustomize/environments/prd/ingress.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: fluentdemo
@@ -19,12 +19,15 @@ spec:
1919
http:
2020
paths:
2121
- path: /
22+
pathType: Prefix
2223
backend:
23-
serviceName: fluentdemo
24-
servicePort: http
24+
service:
25+
name: fluentdemo
26+
port:
27+
number: 80
2528
---
2629
# Leverage nginx-ingress cache for /media/
27-
apiVersion: extensions/v1beta1
30+
apiVersion: networking.k8s.io/v1
2831
kind: Ingress
2932
metadata:
3033
name: fluentdemo-media
@@ -42,12 +45,15 @@ spec:
4245
http:
4346
paths:
4447
- path: /media/
48+
pathType: Prefix
4549
backend:
46-
serviceName: fluentdemo
47-
servicePort: http
50+
service:
51+
name: fluentdemo
52+
port:
53+
number: 80
4854
---
4955
# Leverage nginx-ingress cache for /static/
50-
apiVersion: extensions/v1beta1
56+
apiVersion: networking.k8s.io/v1
5157
kind: Ingress
5258
metadata:
5359
name: fluentdemo-static
@@ -65,6 +71,9 @@ spec:
6571
http:
6672
paths:
6773
- path: /static/
74+
pathType: Prefix
6875
backend:
69-
serviceName: fluentdemo
70-
servicePort: http
76+
service:
77+
name: fluentdemo
78+
port:
79+
number: 80

deployment/kustomize/environments/tst/ingress.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: fluentdemo
@@ -23,12 +23,15 @@ spec:
2323
http:
2424
paths:
2525
- path: /
26+
pathType: Prefix
2627
backend:
27-
serviceName: fluentdemo
28-
servicePort: http
28+
service:
29+
name: fluentdemo
30+
port:
31+
number: 80
2932
---
3033
# Extra ingress for paths that should not have auth annotations
31-
apiVersion: extensions/v1beta1
34+
apiVersion: networking.k8s.io/v1
3235
kind: Ingress
3336
metadata:
3437
name: fluentdemo-authexclude
@@ -38,12 +41,15 @@ spec:
3841
http:
3942
paths:
4043
- path: /api/health/
44+
pathType: Prefix
4145
backend:
42-
serviceName: fluentdemo
43-
servicePort: http
46+
service:
47+
name: fluentdemo
48+
port:
49+
number: 80
4450
---
4551
# Leverage nginx-ingress cache for /media/
46-
apiVersion: extensions/v1beta1
52+
apiVersion: networking.k8s.io/v1
4753
kind: Ingress
4854
metadata:
4955
name: fluentdemo-media
@@ -61,12 +67,15 @@ spec:
6167
http:
6268
paths:
6369
- path: /media/
70+
pathType: Prefix
6471
backend:
65-
serviceName: fluentdemo
66-
servicePort: http
72+
service:
73+
name: fluentdemo
74+
port:
75+
number: 80
6776
---
6877
# Leverage nginx-ingress cache for /static/
69-
apiVersion: extensions/v1beta1
78+
apiVersion: networking.k8s.io/v1
7079
kind: Ingress
7180
metadata:
7281
name: fluentdemo-static
@@ -84,6 +93,9 @@ spec:
8493
http:
8594
paths:
8695
- path: /static/
96+
pathType: Prefix
8797
backend:
88-
serviceName: fluentdemo
89-
servicePort: http
98+
service:
99+
name: fluentdemo
100+
port:
101+
number: 80

0 commit comments

Comments
 (0)