[stable/nginx] adding serviceAccount to controller for better rbac support (#1217)

* adding serviceAccount to controller for better rbac support

* fixes for PR suggestions

* Bump chart version

stable/nginx-ingress/Chart.yaml

@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 0.6.0
+version: 0.7.0
 appVersion: 0.9.0-beta.7
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png

stable/nginx-ingress/README.md

@@ -54,6 +54,7 @@ Parameter | Description | Default
 `controller.defaultBackendService` | default 404 backend service; required only if `defaultBackend.enabled = false` | `""`
 `controller.scope.enabled` | limit the scope of the ingress controller | `false` (watch all namespaces)
 `controller.scope.namespace` | namespace to watch for ingress | `""` (use the release namespace)
+`controller.serviceAccountName` | Service account to run under | `default`
 `controller.extraArgs` | Additional controller container arguments | `{}`
 `controller.kind` | install as Deployment or DaemonSet | `Deployment`
 `controller.nodeSelector` | node labels for pod assignment | `{}`

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

@@ -22,6 +22,9 @@ spec:
         release: {{ .Release.Name }}
     spec:
       hostNetwork: {{ .Values.controller.hostNetwork }}
+    {{- if .Values.controller.serviceAccountName }}
+      serviceAccountName: {{ .Values.controller.serviceAccountName }}
+    {{- end }}
       containers:
         - name: {{ template "name" . }}-{{ .Values.controller.name }}
           image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"

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

@@ -23,6 +23,9 @@ spec:
         release: {{ .Release.Name }}
     spec:
       hostNetwork: {{ .Values.controller.hostNetwork }}
+    {{- if .Values.controller.serviceAccountName }}
+      serviceAccountName: {{ .Values.controller.serviceAccountName }}
+    {{- end }}
       containers:
         - name: {{ template "name" . }}-{{ .Values.controller.name }}
           image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"

stable/nginx-ingress/values.yaml

@@ -46,6 +46,11 @@ controller:
   ##
   nodeSelector: {}
 
+  ## Run the controller via this service account
+  ## Ref: https://github.com/kubernetes/ingress/tree/master/examples/rbac/nginx
+  ##
+  serviceAccountName: ""
+
   ## Annotations to be added to controller pods
   ##
   podAnnotations: {}