Merge branch 'master' into fix_example_indentation

charts/argo-cd/README.md

@@ -38,6 +38,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` |
 | global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.2"` |
 | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | 
+| global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | 
 | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
 | installCRDs | bool | `true` | Install CRDs if you are using Helm2. |
 | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |

charts/argo-cd/templates/argocd-application-controller/deployment.yaml

@@ -38,6 +38,10 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -39,6 +39,10 @@ spec:
 {{- toYaml .Values.repoServer.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}

charts/argo-cd/templates/argocd-server/deployment.yaml

@@ -39,6 +39,10 @@ spec:
 {{- toYaml .Values.server.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}

charts/argo-cd/templates/dex/deployment.yaml

@@ -27,6 +27,10 @@ spec:
         app.kubernetes.io/component: {{ .Values.dex.name }}
         app.kubernetes.io/version: {{ .Values.dex.image.tag }}
     spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}

charts/argo-cd/templates/redis/deployment.yaml

@@ -26,6 +26,10 @@ spec:
         app.kubernetes.io/component: {{ .Values.redis.name }}
         app.kubernetes.io/version: {{ .Values.redis.image.tag }}        
     spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       automountServiceAccountToken: false
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}

charts/argo-cd/values.yaml

@@ -16,6 +16,7 @@ global:
   #  runAsUser: 999
   #  runAsGroup: 999
   #  fsGroup: 999
+  imagePullSecrets: []
 
 ## Controller
 controller: