Reverted removal of globalConfig from Helm

nginx · Apr 2, 2021 · 773686f · 773686f
1 parent 20501b9
commit 773686f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml
@@ -147,8 +147,8 @@ spec:
           - -enable-tls-passthrough={{ .Values.controller.enableTLSPassthrough }}
           - -enable-snippets={{ .Values.controller.enableSnippets }}
           - -enable-preview-policies={{ .Values.controller.enablePreviewPolicies }}
-{{- if .Values.controller.globalConfiguration }}
-          - -global-configuration=$(POD_NAMESPACE)/{{ .Values.controller.globalConfiguration }}
+{{- if .Values.controller.globalConfiguration.create }}
+          - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.name" . }}
 {{- end }}
 {{- end }}
           - -ready-status={{ .Values.controller.readyStatus.enable }}

diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml
@@ -145,8 +145,8 @@ spec:
           - -enable-tls-passthrough={{ .Values.controller.enableTLSPassthrough }}
           - -enable-snippets={{ .Values.controller.enableSnippets }}
           - -enable-preview-policies={{ .Values.controller.enablePreviewPolicies }}
-{{- if .Values.controller.globalConfiguration }}
-          - -global-configuration=$(POD_NAMESPACE)/{{ .Values.controller.globalConfiguration }}
+{{- if .Values.controller.globalConfiguration.create }}
+          - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.name" . }}
 {{- end }}
 {{- end }}
           - -ready-status={{ .Values.controller.readyStatus.enable }}

diff --git a/deployments/helm-chart/templates/controller-globalconfiguration.yaml b/deployments/helm-chart/templates/controller-globalconfiguration.yaml
@@ -0,0 +1,11 @@
+{{ if .Values.controller.globalConfiguration.create }}
+apiVersion: k8s.nginx.org/v1alpha1
+kind: GlobalConfiguration
+metadata:
+  name: {{ include "nginx-ingress.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "nginx-ingress.labels" . | nindent 4 }}
+spec:
+{{ toYaml .Values.controller.globalConfiguration.spec | indent 2 }}
+{{- end }}
diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -154,8 +154,19 @@ controller:
   ## Enable TLS Passthrough on port 443. Requires controller.enableCustomResources.
   enableTLSPassthrough: false
 
-  ## Specifies the name of the GlobalConfiguration custom resource. Requires controller.enableCustomResources.
-  globalConfiguration: ""
+  globalConfiguration:
+    ## Creates the GlobalConfiguration custom resource. Requires controller.enableCustomResources.
+    create: false
+
+    ## The spec of the GlobalConfiguration for defining the global configuration parameters of the Ingress Controller.
+    spec: {}
+      # listeners:
+      # - name: dns-udp
+      #   port: 5353
+      #   protocol: UDP
+      # - name: dns-tcp
+      #   port: 5353
+      #   protocol: TCP
 
   ## Enable custom NGINX configuration snippets in VirtualServer, VirtualServerRoute and TransportServer resources.
   enableSnippets: false