From eb0f4bbf636e2c800f53cc4e90bcb4ff9dd90516 Mon Sep 17 00:00:00 2001 From: Richard Lavey <6595659+rlaveycal@users.noreply.github.com> Date: Thu, 27 Apr 2023 12:47:01 +0100 Subject: [PATCH] remove default inress annotation so the ingressClassName is setable Signed-off-by: Richard Lavey --- chart/openfaas/templates/ingress.yaml | 2 ++ chart/openfaas/values.yaml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chart/openfaas/templates/ingress.yaml b/chart/openfaas/templates/ingress.yaml index 645c2f8f3..787b09c57 100644 --- a/chart/openfaas/templates/ingress.yaml +++ b/chart/openfaas/templates/ingress.yaml @@ -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 }} diff --git a/chart/openfaas/values.yaml b/chart/openfaas/values.yaml index 7fc0d20f6..3fbc168c0 100644 --- a/chart/openfaas/values.yaml +++ b/chart/openfaas/values.yaml @@ -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.