Helm: add globalConfigurationCustomName parameter

Extend globalConfiguration customName functionality when gc create true (nginx#6679)
frantsao · Dec 12, 2024 · 8490da9 · 8490da9
1 parent ae76aea
commit 8490da9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/charts/nginx-ingress/templates/_helpers.tpl b/charts/nginx-ingress/templates/_helpers.tpl
@@ -213,6 +213,20 @@ false
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create the global configuration custom name from the globalConfiguration.customName value.
+*/}}
+{{- define "nginx-ingress.globalConfiguration.customName" -}}
+{{ splitList "/" .Values.controller.globalConfiguration.customName | last }}
+{{- end -}}
+
+{{/*
+Create the global configuration custom namespace from the globalConfiguration.customName value.
+*/}}
+{{- define "nginx-ingress.globalConfiguration.customNamespace" -}}
+{{ splitList "/" .Values.controller.globalConfiguration.customName | first }}
+{{- end -}}
+
 {{/*
 Build the args for the service binary.
 */}}
@@ -314,7 +328,7 @@ 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 }}

diff --git a/charts/nginx-ingress/templates/controller-globalconfiguration.yaml b/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: