Merge pull request #7046 from amirschw/controller-name

[Helm] allow configuring controller container name

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

@@ -26,10 +26,10 @@ spec:
   template:
     metadata:
     {{- if .Values.controller.podAnnotations }}
-      annotations: 
+      annotations:
       {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
-      {{- end }}      
+      {{- end }}
     {{- end }}
       labels:
         {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
@@ -62,7 +62,7 @@ spec:
     {{- end }}
     {{- end }}
       containers:
-        - name: controller
+        - name: {{ .Values.controller.containerName }}
           {{- with .Values.controller.image }}
           image: "{{.repository}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}"
           {{- end }}

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

@@ -30,7 +30,7 @@ spec:
   template:
     metadata:
     {{- if .Values.controller.podAnnotations }}
-      annotations: 
+      annotations:
       {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
       {{- end }}
@@ -66,7 +66,7 @@ spec:
     {{- end }}
     {{- end }}
       containers:
-        - name: controller
+        - name: {{ .Values.controller.containerName }}
           {{- with .Values.controller.image }}
           image: "{{.repository}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}"
           {{- end }}

charts/ingress-nginx/values.yaml

@@ -21,6 +21,9 @@ controller:
   # Use an existing PSP instead of creating one
   existingPsp: ""
 
+  # Configures the controller container name
+  containerName: controller
+
   # Configures the ports the nginx-controller listens on
   containerPort:
     http: 80