Skip to content

Commit c6231e3

Browse files
committed
helm values updated for new classname ingress nginx
Signed-off-by: junior <[email protected]>
1 parent 236ac9b commit c6231e3

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

deploy/complete/helm-chart/setup/values.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@ ingress-nginx:
3333
controller:
3434
metrics:
3535
enabled: true
36+
ingressClassResource:
37+
default: true
3638

3739
# https://github.com/jetstack/cert-manager/blob/master/README.md
3840
# https://artifacthub.io/packages/helm/jetstack/cert-manager
3941
cert-manager:
4042
enabled: true
41-
installCRDs: true
43+
crds:
44+
enabled: true
45+
keep: false
4246

4347
# https://github.com/grafana/helm-charts/blob/main/charts/grafana/README.md
4448
# https://artifacthub.io/packages/helm/grafana/grafana
@@ -136,10 +140,10 @@ jenkins:
136140
apiVersion: networking.k8s.io/v1
137141
metadata:
138142
annotations:
139-
kubernetes.io/ingress.class: nginx
140143
nginx.ingress.kubernetes.io/rewrite-target: /$2
141144
labels: {}
142145
spec:
146+
ingressClassName: nginx
143147
rules:
144148
- http:
145149
paths:

deploy/complete/kubernetes/ingress/mushop-dev.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ apiVersion: extensions/v1beta1
22
kind: Ingress
33
metadata:
44
name: mushop-dev
5-
annotations:
6-
kubernetes.io/ingress.class: nginx
75
spec:
6+
ingressClassName: nginx
87
rules:
98
- http:
109
paths:

deploy/complete/kubernetes/ingress/mushop-grafana.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
apiVersion: networking.k8s.io/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: grafana
55
annotations:
6-
kubernetes.io/ingress.class: nginx
76
nginx.ingress.kubernetes.io/ssl-redirect: "true"
87
cert-manager.io/cluster-issuer: letsencrypt-prod
98
cert-manager.io/acme-challenge-type: http01
109
spec:
10+
ingressClassName: nginx
1111
tls:
1212
- secretName: mushop-grafana-tls
1313
hosts:

deploy/complete/kubernetes/ingress/mushop-prod.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
apiVersion: networking.k8s.io/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: mushop-prod
55
annotations:
6-
kubernetes.io/ingress.class: nginx
76
nginx.ingress.kubernetes.io/ssl-redirect: "true"
87
cert-manager.io/cluster-issuer: letsencrypt-prod
98
cert-manager.io/acme-challenge-type: http01
109
spec:
10+
ingressClassName: nginx
1111
tls:
12-
- secretName: mushop-prod-tls
12+
- secretName: mushop-prod-tls
1313
hosts:
1414
- mushop.ateam.cloud
1515
- insecure.mushop.ateam.cloud

deploy/complete/kubernetes/ingress/mushop-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ kind: Ingress
33
metadata:
44
name: mushop-test
55
annotations:
6-
kubernetes.io/ingress.class: nginx
76
nginx.ingress.kubernetes.io/ssl-redirect: "true"
87
cert-manager.io/cluster-issuer: letsencrypt-prod
98
cert-manager.io/acme-challenge-type: http01
109
spec:
10+
ingressClassName: nginx
1111
tls:
1212
- secretName: mushop-test-tls
1313
hosts:

deploy/complete/kubernetes/mushop.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ metadata:
1010
app.kubernetes.io/instance: mushop
1111
app.kubernetes.io/version: "1.0"
1212
app.kubernetes.io/managed-by: Helm
13-
annotations:
14-
kubernetes.io/ingress.class: nginx
1513
spec:
14+
ingressClassName: nginx
1615
rules:
1716
# change this for user-specific ingress
1817
- host: mushop.example.com

0 commit comments

Comments
 (0)