nginxinc#6679 add globalConfigurationCustomName parameter to controll…

…er configuration
frantsao · Oct 17, 2024 · 44271eb · 44271eb
1 parent 5108b30
commit 44271eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/charts/nginx-ingress/templates/_helpers.tpl b/charts/nginx-ingress/templates/_helpers.tpl
@@ -291,6 +291,10 @@ Build the args for the service binary.
 - -default-https-listener-port={{ .Values.controller.defaultHTTPSListenerPort}}
 {{- if .Values.controller.globalConfiguration.create }}
 - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }}
+{{- else }}
+{{- if .Values.controller.globalConfigurationCustomName }}
+- -global-configuration={{ .Values.controller.globalConfigurationCustomName }}
+{{- end }}
 {{- end }}
 {{- end }}
 - -ready-status={{ .Values.controller.readyStatus.enable }}

diff --git a/charts/nginx-ingress/values.schema.json b/charts/nginx-ingress/values.schema.json
@@ -1042,6 +1042,14 @@
             }
           ]
         },
+	"globalConfigurationCustomName": {
+	  "type": "string",
+	  "default": "",
+	  "title": "The globalConfigurationCustomName",
+	  "examples": [
+	    "the-namespace/the-name-of-the-global-configuration-custom-resource"
+	  ]
+	},
         "enableSnippets": {
           "type": "boolean",
           "default": false,

diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml
@@ -372,6 +372,10 @@ controller:
     #   port: 5353
     #   protocol: TCP
 
+  ## globalConfigurationCustomName: "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 when controller.globalConfiguration.create is set to false.
+  ## See: https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.2/examples/custom-resources/custom-listeners#prerequisites
+
   ## Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources.
   enableSnippets: false