moved globalConfigurationCustomName parameter to globalConfiguration.customName

Author: frantsao

charts/nginx-ingress/templates/_helpers.tpl

@@ -292,8 +292,8 @@ Build the args for the service binary.
 {{- if .Values.controller.globalConfiguration.create }}
 - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }}
 {{- else }}
-{{- if .Values.controller.globalConfigurationCustomName }}
-- -global-configuration={{ .Values.controller.globalConfigurationCustomName }}
+{{- if .Values.controller.globalConfiguration.customName }}
+- -global-configuration={{ .Values.controller.globalConfiguration.customName }}
 {{- end }}
 {{- end }}
 {{- end }}

charts/nginx-ingress/values.schema.json

@@ -972,6 +972,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": {},
@@ -1042,14 +1050,6 @@
             }
           ]
         },
-        "globalConfigurationCustomName": {
-          "type": "string",
-          "default": "",
-          "title": "The globalConfigurationCustomName",
-          "examples": [
-            "the-namespace/the-name-of-the-global-configuration-custom-resource"
-          ]
-        },
         "enableSnippets": {
           "type": "boolean",
           "default": false,

charts/nginx-ingress/values.yaml

@@ -362,6 +362,9 @@ 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 when create is set to false.
+
     ## 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:
@@ -372,9 +375,6 @@ 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.
-
   ## Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources.
   enableSnippets: false