add globalConfigurationCustomName parameter (#8142)

Author: mohamadaldawamnah

charts/nginx-ingress/templates/_helpers.tpl

@@ -213,6 +213,40 @@ false
 {{- end -}}
 {{- end -}}
 
+{{/*
+Validate the globalConfiguration.customName value format.
+Ensures exactly one '/' separator for proper namespace/name parsing.
+*/}}
+{{- define "nginx-ingress.globalConfiguration.validateCustomName" -}}
+{{- if .Values.controller.globalConfiguration.customName }}
+{{- $parts := splitList "/" .Values.controller.globalConfiguration.customName }}
+{{- if ne (len $parts) 2 }}
+{{- fail "globalConfiguration.customName must contain exactly one '/' separator in namespace/name format (e.g., \"my-namespace/my-global-config\")" }}
+{{- end }}
+{{- if or (eq (index $parts 0) "") (eq (index $parts 1) "") }}
+{{- fail "globalConfiguration.customName namespace and name parts cannot be empty (e.g., \"my-namespace/my-global-config\")" }}
+{{- end }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Create the global configuration custom name from the globalConfiguration.customName value.
+*/}}
+{{- define "nginx-ingress.globalConfiguration.customName" -}}
+{{- include "nginx-ingress.globalConfiguration.validateCustomName" . -}}
+{{- $parts := splitList "/" .Values.controller.globalConfiguration.customName -}}
+{{- index $parts 1 -}}
+{{- end -}}
+
+{{/*
+Create the global configuration custom namespace from the globalConfiguration.customName value.
+*/}}
+{{- define "nginx-ingress.globalConfiguration.customNamespace" -}}
+{{- include "nginx-ingress.globalConfiguration.validateCustomName" . -}}
+{{- $parts := splitList "/" .Values.controller.globalConfiguration.customName -}}
+{{- index $parts 0 -}}
+{{- end -}}
+
 {{/*
 Build the args for the service binary.
 */}}
@@ -314,8 +348,10 @@ Build the args for the service binary.
 - -enable-external-dns={{ .Values.controller.enableExternalDNS }}
 - -default-http-listener-port={{ .Values.controller.defaultHTTPListenerPort}}
 - -default-https-listener-port={{ .Values.controller.defaultHTTPSListenerPort}}
-{{- if .Values.controller.globalConfiguration.create }}
+{{- if and .Values.controller.globalConfiguration.create (not .Values.controller.globalConfiguration.customName) }}
 - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }}
+{{- else if .Values.controller.globalConfiguration.customName }}
+- -global-configuration={{ .Values.controller.globalConfiguration.customName }}
 {{- end }}
 {{- end }}
 - -ready-status={{ .Values.controller.readyStatus.enable }}

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

@@ -2,8 +2,13 @@
 apiVersion: k8s.nginx.org/v1
 kind: GlobalConfiguration
 metadata:
+{{- if not .Values.controller.globalConfiguration.customName }}
  name: {{ include "nginx-ingress.controller.fullname" . }}
  namespace: {{ .Release.Namespace }}
+{{- else }}
+ name: {{ include "nginx-ingress.globalConfiguration.customName" . }}
+ namespace: {{ include "nginx-ingress.globalConfiguration.customNamespace" . }}
+{{- end }}
  labels:
  {{- include "nginx-ingress.labels" . | nindent 4 }}
 spec:

charts/nginx-ingress/values.schema.json

@@ -1115,6 +1115,14 @@
  false
  ]
  },
+ "customName": {
+ "type": "string",
+ "default": "",
+ "title": "The customName Schema",
+ "examples": [
+ "the-namespace/the-name-of-the-global-configuration-custom-resource"
+ ]
+ },
  "spec": {
  "type": "object",
  "default": {},

charts/nginx-ingress/values.yaml

@@ -407,6 +407,11 @@ controller:
  ## Creates the GlobalConfiguration custom resource. Requires controller.enableCustomResources.
  create: false
 
+ ## customName: "the-namespace/the-name-of-the-global-configuration-custom-resource"
+ ## The name of the GlobalConfiguration custom resource to use instead of the one provided by default.
+ ## Make sure the namespace is watched when watchNamespace or watchNamespaceLabel parameters are in use.
+ customName: ""
+
  ## The spec of the GlobalConfiguration for defining the global configuration parameters of the Ingress Controller.
  spec: {} ## Ensure both curly brackets are removed when adding listeners in YAML format.
  # listeners: