Helm chart improved for ingress (#19826)

* ingressClassName

* ingress values must be optional
main^2
mickkael 2022-11-11 02:11:25 +08:00 committed by GitHub
parent 60c4df3d1d
commit 6c7cdedb24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -19,6 +19,9 @@ metadata:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName }}
{{- end }}
{{- if .Values.ingress.tls }} {{- if .Values.ingress.tls }}
tls: tls:
{{- range .Values.ingress.tls }} {{- range .Values.ingress.tls }}

View File

@ -104,8 +104,8 @@ mastodon:
ingress: ingress:
enabled: true enabled: true
annotations: annotations:
kubernetes.io/ingress.class: nginx #kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: "true" #kubernetes.io/tls-acme: "true"
# cert-manager.io/cluster-issuer: "letsencrypt" # cert-manager.io/cluster-issuer: "letsencrypt"
# #
# ensure that NGINX's upload size matches Mastodon's # ensure that NGINX's upload size matches Mastodon's
@ -113,6 +113,8 @@ ingress:
# nginx.ingress.kubernetes.io/proxy-body-size: 40m # nginx.ingress.kubernetes.io/proxy-body-size: 40m
# for the NGINX ingress controller: # for the NGINX ingress controller:
# nginx.org/client-max-body-size: 40m # nginx.org/client-max-body-size: 40m
# you can specify the ingressClassName if it differs from the default
ingressClassName:
hosts: hosts:
- host: mastodon.local - host: mastodon.local
paths: paths: