Support imagePullSecrets in chart

stashed · Nov 4, 2017 · a80b1f9 · a80b1f9
1 parent dee95f2
commit a80b1f9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/chart/stable/stash/templates/deployment.yaml b/chart/stable/stash/templates/deployment.yaml
@@ -26,7 +26,11 @@ spec:
         - --v=3
         - --rbac={{ .Values.rbac.create }}
         image: {{ .Values.operator.image }}:{{ .Values.operator.tag }}
-        imagePullPolicy: {{ .Values.operator.pullPolicy }}
+        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
+        {{- if .Values.imagePullSecrets }}
+        imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 8 }}
+        {{- end }}
         name: operator
         ports:
         - containerPort: 56790
@@ -37,7 +41,11 @@ spec:
         - -web.listen-address=:56789
         - -persistence.file=/var/pv/pushgateway.dat
         image: '{{ .Values.pushgateway.image }}:{{ .Values.pushgateway.tag }}'
-        imagePullPolicy: '{{ .Values.pushgateway.pullPolicy }}'
+        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
+        {{- if .Values.imagePullSecrets }}
+        imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 8 }}
+        {{- end }}
         name: pushgateway
         ports:
         - containerPort: 56789

diff --git a/chart/stable/stash/values.yaml b/chart/stable/stash/values.yaml
@@ -4,12 +4,20 @@
 replicaCount: 1
 operator:
   image: appscode/stash
-  pullPolicy: IfNotPresent
   tag: 0.5.1
 pushgateway:
   image: prom/pushgateway
-  pullPolicy: IfNotPresent
   tag: v0.4.0
+## Optionally specify an array of imagePullSecrets.
+## Secrets must be manually created in the namespace.
+## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+##
+# imagePullSecrets:
+#   - name: myRegistryKeySecretName
+## Specify a imagePullPolicy
+## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+##
+imagePullPolicy: IfNotPresent
 ## Installs Stash operator as critical addon
 ## https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
 criticalAddon: false