Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove default ingress annotation from helm chart so that ingressClassName is settable in wrapped chart #1100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
remove default inress annotation so the ingressClassName is setable
Signed-off-by: Richard Lavey <[email protected]>
  • Loading branch information
rlaveycal committed Apr 27, 2023
commit eb0f4bbf636e2c800f53cc4e90bcb4ff9dd90516
2 changes: 2 additions & 0 deletions chart/openfaas/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.ingress.annotations }}
annotations:
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
spec:
{{- if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName }}
Expand Down
3 changes: 1 addition & 2 deletions chart/openfaas/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,7 @@ ingress:
serviceName: gateway
servicePort: 8080
path: /
annotations:
kubernetes.io/ingress.class: nginx
annotations: {}
tls:
# Secrets must be manually created in the namespace.

Expand Down