File tree Expand file tree Collapse file tree 6 files changed +14
-12
lines changed Expand file tree Collapse file tree 6 files changed +14
-12
lines changed Original file line number Diff line number Diff 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
3941cert-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 :
Original file line number Diff line number Diff line change @@ -2,9 +2,8 @@ apiVersion: extensions/v1beta1
22kind : Ingress
33metadata :
44 name : mushop-dev
5- annotations :
6- kubernetes.io/ingress.class : nginx
75spec :
6+ ingressClassName : nginx
87 rules :
98 - http :
109 paths :
Original file line number Diff line number Diff line change 1- apiVersion : networking.k8s.io/v1beta1
1+ apiVersion : networking.k8s.io/v1
22kind : Ingress
33metadata :
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
109spec :
10+ ingressClassName : nginx
1111 tls :
1212 - secretName : mushop-grafana-tls
1313 hosts :
Original file line number Diff line number Diff line change 1- apiVersion : networking.k8s.io/v1beta1
1+ apiVersion : networking.k8s.io/v1
22kind : Ingress
33metadata :
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
109spec :
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
Original file line number Diff line number Diff line change @@ -3,11 +3,11 @@ kind: Ingress
33metadata :
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
109spec :
10+ ingressClassName : nginx
1111 tls :
1212 - secretName : mushop-test-tls
1313 hosts :
Original file line number Diff line number Diff 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
1513spec :
14+ ingressClassName : nginx
1615 rules :
1716 # change this for user-specific ingress
1817 - host : mushop.example.com
You can’t perform that action at this time.
0 commit comments