Add imagePullSecrets to helm chart (#430)

* Add imagePullSecrets to helm chart * Updated Helm readme * Increment Chart version
nginx · Nov 12, 2018 · 9da9506 · 9da9506
1 parent 10d2749
commit 9da9506
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/deployments/helm-chart/Chart.yaml b/deployments/helm-chart/Chart.yaml
@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 0.1.5
+version: 0.2.0
 appVersion: edge
 description: NGINX Ingress Controller
 sources:

diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -79,7 +79,8 @@ Parameter | Description | Default
 `controller.service.annotations` | The annotations of the Ingress controller service. | { }
 `controller.service.loadBalancerIP` | The static IP address for the load balancer. Requires `controller.service.type` set to `LoadBalancer`.  | None
 `controller.service.externalIPs` | The list of external IPs for the Ingress controller service. | []
-`controller.serviceAccountName` | The serviceAccountName of the Ingress controller pods. Used for RBAC. | nginx-ingress
+`controller.serviceAccount.name` | The name of the service account of the Ingress controller pods. Used for RBAC. | nginx-ingress
+`controller.serviceAccount.imagePullSecrets` | The names of the secrets containing docker registry credentials. | []
 `controller.ingressClass` | A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its class - i.e. have the annotation `"kubernetes.io/ingress.class"` equal to the class. Additionally, the Ingress controller processes Ingress resources that do not have that annotation which can be disabled by setting the "-use-ingress-class-only" flag. | nginx
 `controller.useIngressClassOnly` | Ignore Ingress resources without the `"kubernetes.io/ingress.class"` annotation. | false
 `controller.watchNamespace` | Namespace to watch for Ingress resources. By default the Ingress controller watches all namespaces. | ""

diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml
@@ -22,7 +22,7 @@ spec:
         prometheus.io/port: "{{ .Values.prometheus.port }}"
 {{- end }}
     spec:
-      serviceAccountName: {{ .Values.controller.serviceAccountName }}
+      serviceAccountName: {{ .Values.controller.serviceAccount.name }}
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
 {{- if .Values.controller.nodeSelector }}
       nodeSelector:

diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml
@@ -23,7 +23,7 @@ spec:
         prometheus.io/port: "{{ .Values.prometheus.port }}"
 {{- end }}
     spec:
-      serviceAccountName: {{ .Values.controller.serviceAccountName }}
+      serviceAccountName: {{ .Values.controller.serviceAccount.name }}
       hostNetwork: {{ .Values.controller.hostNetwork }}
       containers:
       - image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"

diff --git a/deployments/helm-chart/templates/controller-serviceaccount.yaml b/deployments/helm-chart/templates/controller-serviceaccount.yaml
@@ -2,10 +2,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.controller.serviceAccountName }}
+  name: {{ .Values.controller.serviceAccount.name }}
   labels:
     app: {{ .Values.controller.name | trunc 63 }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
+{{- if .Values.controller.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+{{ toYaml .Values.controller.serviceAccount.imagePullSecrets }}
+{{- end }}
 {{- end }}
diff --git a/deployments/helm-chart/templates/rbac.yaml b/deployments/helm-chart/templates/rbac.yaml
@@ -77,7 +77,7 @@ metadata:
     release: {{ .Release.Name }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Values.controller.serviceAccountName }}
+  name: {{ .Values.controller.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole

diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -34,7 +34,10 @@ controller:
     annotations: {}
     loadBalancerIP: ""
     externalIPs: []
-  serviceAccountName: nginx-ingress
+  serviceAccount:
+    name: nginx-ingress
+    imagePullSecrets: []
+      # - name: secret_name
   reportIngressStatus:
     enable: true
     externalService: nginx-ingress