Merge branch 'master' into tls-reference

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

@@ -60,7 +60,7 @@ spec:
         {{- end }}
         volumeMounts:
         {{- if .Values.repoServer.volumeMounts }}
-{{- toYaml .Values.repoServer.volumeMounts | nindent 10}}
+{{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
         {{- end }}
         {{- if .Values.configs.knownHosts }}
         - mountPath: /app/config/ssh
@@ -112,7 +112,7 @@ spec:
       serviceAccountName: {{ template "argo-cd.repoServerServiceAccountName" . }}
       volumes:
       {{- if .Values.repoServer.volumes }}
-{{- toYaml .Values.repoServer.volumes | nindent 8}}
+{{- toYaml .Values.repoServer.volumes | nindent 6}}
       {{- end }}
       {{- if .Values.configs.knownHosts }}
       - configMap:
@@ -124,3 +124,7 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      {{- if .Values.repoServer.initContainers }}
+      initContainers:
+{{- toYaml .Values.repoServer.initContainers | nindent 6 }}
+      {{- end }}

charts/argo-cd/values.yaml

@@ -554,6 +554,28 @@ repoServer:
  #     - list
  #     - watch
 
+  ## Use init containers to configure custom tooling
+  ## https://argoproj.github.io/argo-cd/operator-manual/custom_tools/
+  ## When using the volumes & volumeMounts section bellow, please comment out those above.
+ #  volumes:
+ #  - name: custom-tools
+ #    emptyDir: {}
+ #
+ #  initContainers:
+ #  - name: download-tools
+ #    image: alpine:3.8
+ #    command: [sh, -c]
+ #    args:
+ #      - wget -qO- https://get.helm.sh/helm-v2.16.1-linux-amd64.tar.gz | tar -xvzf - &&
+ #        mv linux-amd64/helm /custom-tools/
+ #    volumeMounts:
+ #      - mountPath: /custom-tools
+ #        name: custom-tools
+ #  volumeMounts:
+ #  - mountPath: /usr/local/bin/helm
+ #    name: custom-tools
+ #    subPath: helm
+
 ## Argo Configs
 configs:
   knownHosts: