From 4eb41f291efbbe6b248281fd93657832113f113d Mon Sep 17 00:00:00 2001 From: Tom Jackson Date: Sat, 15 Jul 2017 08:22:54 -0700 Subject: [PATCH] [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 | 2 +- stable/nginx-ingress/README.md | 1 + stable/nginx-ingress/templates/controller-daemonset.yaml | 3 +++ stable/nginx-ingress/templates/controller-deployment.yaml | 3 +++ stable/nginx-ingress/values.yaml | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 49b9278c8f..b0e8aa12c7 100755 --- a/stable/nginx-ingress/Chart.yaml +++ b/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 diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index 6800973006..b76c49e9b2 100644 --- a/stable/nginx-ingress/README.md +++ b/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 | `{}` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index 0363253ea4..3a07cfa32b 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/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 }}" diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 43af40606d..233a639cdd 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/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 }}" diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 2f600364db..8670d25c72 100644 --- a/stable/nginx-ingress/values.yaml +++ b/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: {}