Chart: Improve #10539. (#10565)

* Helpers: Align `ingress-nginx.namespace` to `ingress-nginx.name`.

* Templates: Remove quotes.

In alignment to others. Also does not make sense as `namespace` must conform to DNS.

* Admission Webhooks/Validating Webhook: Make use of `ingress-nginx.namespace`.

* KEDA: Remove comment.

* Templates: Add forgotten namespace definitions.

charts/ingress-nginx/templates/_helpers.tpl

@@ -31,16 +31,12 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{/*
-Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+Expand the namespace of the release.
+Allows overriding it for multi-namespace deployments in combined charts.
 */}}
 {{- define "ingress-nginx.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
-    {{- .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
 {{- end -}}
-{{- end -}}
-
 
 {{/*
 Container SecurityContext.
@@ -113,7 +109,6 @@ By convention this will simply use the <namespace>/<controller-name> to match th
 service generated.
 
 Users can provide an override for an explicit service they want bound via `.Values.controller.publishService.pathOverride`
-
 */}}
 {{- define "ingress-nginx.controller.publishServicePath" -}}
 {{- $defServiceName := printf "%s/%s" "$(POD_NAMESPACE)" (include "ingress-nginx.controller.fullname" .) -}}

charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml

@@ -19,5 +19,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "ingress-nginx.admissionWebhooks.fullname" . }}
-    namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
+    namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}

charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml

@@ -20,5 +20,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "ingress-nginx.admissionWebhooks.fullname" . }}
-    namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
+    namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}

charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml

@@ -6,8 +6,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
   {{- if .Values.controller.admissionWebhooks.certManager.enabled }}
-    certmanager.k8s.io/inject-ca-from: {{ printf "%s/%s" .Release.Namespace (include "ingress-nginx.admissionWebhooks.fullname" .) | quote }}
+    certmanager.k8s.io/inject-ca-from: {{ printf "%s/%s" (include "ingress-nginx.namespace" .) (include "ingress-nginx.admissionWebhooks.fullname" .) | quote }}
-    cert-manager.io/inject-ca-from: {{ printf "%s/%s" .Release.Namespace (include "ingress-nginx.admissionWebhooks.fullname" .) | quote }}
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s" (include "ingress-nginx.namespace" .) (include "ingress-nginx.admissionWebhooks.fullname" .) | quote }}
   {{- end }}
   {{- if .Values.controller.admissionWebhooks.annotations }}
     {{- toYaml .Values.controller.admissionWebhooks.annotations | nindent 4 }}
@@ -38,8 +38,8 @@ webhooks:
       - v1
     clientConfig:
       service:
-        namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
         name: {{ include "ingress-nginx.controller.fullname" . }}-admission
+        namespace: {{ include "ingress-nginx.namespace" . }}
         path: /networking/v1/ingresses
     {{- if .Values.controller.admissionWebhooks.timeoutSeconds }}
     timeoutSeconds: {{ .Values.controller.admissionWebhooks.timeoutSeconds }}

charts/ingress-nginx/templates/clusterrolebinding.yaml

@@ -15,5 +15,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "ingress-nginx.serviceAccountName" . }}
-    namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
+    namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}

charts/ingress-nginx/templates/controller-keda.yaml

@@ -1,6 +1,4 @@
 {{- if and .Values.controller.keda.enabled (eq .Values.controller.kind "Deployment") -}}
-# https://keda.sh/docs/
-
 apiVersion: {{ .Values.controller.keda.apiVersion }}
 kind: ScaledObject
 metadata:
@@ -11,6 +9,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   name: {{ include "ingress-nginx.controller.fullname" . }}
+  namespace: {{ include "ingress-nginx.namespace" . }}
   {{- if .Values.controller.keda.scaledObject.annotations }}
   annotations: {{ toYaml .Values.controller.keda.scaledObject.annotations | nindent 4 }}
   {{- end }}

charts/ingress-nginx/templates/controller-prometheusrules.yaml

@@ -4,7 +4,9 @@ kind: PrometheusRule
 metadata:
   name: {{ include "ingress-nginx.controller.fullname" . }}
 {{- if .Values.controller.metrics.prometheusRule.namespace }}
-  namespace: {{ .Values.controller.metrics.prometheusRule.namespace | quote }}
+  namespace: {{ .Values.controller.metrics.prometheusRule.namespace }}
+{{- else }}
+  namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}
   labels:
     {{- include "ingress-nginx.labels" . | nindent 4 }}

charts/ingress-nginx/templates/controller-rolebinding.yaml

@@ -17,5 +17,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "ingress-nginx.serviceAccountName" . }}
-    namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
+    namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}

charts/ingress-nginx/templates/controller-servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ include "ingress-nginx.controller.fullname" . }}
 {{- if .Values.controller.metrics.serviceMonitor.namespace }}
-  namespace: {{ .Values.controller.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
 {{- else }}
   namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}

charts/ingress-nginx/templates/default-backend-rolebinding.yaml

@@ -17,5 +17,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
-    namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
+    namespace: {{ include "ingress-nginx.namespace" . }}
 {{- end }}