[charts/argo-cd] add support of custom environment variables (#181)

Signed-off-by: Léo Depriester <leo.depriester@camptocamp.com>
* Fix controller env path
* Updating chart bump to patch as this is a backwards compatible change

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

@@ -60,6 +60,10 @@ spec:
         image: {{ default .Values.global.image.repository .Values.controller.image.repository }}:{{ default .Values.global.image.tag .Values.controller.image.tag }}
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }}
         name: {{ .Values.controller.name }}
+        {{- if .Values.controller.env }}
+        env:
+{{- toYaml .Values.controller.env | nindent 8 }}
+        {{- end }}
         ports:
         - name: controller
           containerPort: {{ .Values.controller.containerPort }}
@@ -103,4 +107,4 @@ spec:
 {{- if .Values.controller.volumes }}
       volumes:
 {{- toYaml .Values.controller.volumes | nindent 8 }}
-{{- end }}
+{{- end }}

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

@@ -54,6 +54,10 @@ spec:
         - --{{ $key }}
           {{- end }}
         {{- end }}
+        {{- if .Values.repoServer.env }}
+        env:
+{{- toYaml .Values.repoServer.env | nindent 8 }}
+        {{- end }}
         volumeMounts:
         {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 10}}
@@ -119,4 +123,4 @@ spec:
       - configMap:
           name: argocd-tls-certs-cm
         name: tls-certs
-      {{- end }}
+      {{- end }}

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

@@ -62,6 +62,10 @@ spec:
         - --{{ $key }}
           {{- end }}
         {{- end }}
+        {{- if .Values.server.env }}
+        env:
+{{- toYaml .Values.server.env | nindent 8 }}
+        {{- end }}
         volumeMounts:
         {{- if .Values.server.volumeMounts }}
 {{- toYaml .Values.server.volumeMounts | nindent 10}}
@@ -131,4 +135,4 @@ spec:
       - configMap:
           name: argocd-tls-certs-cm
         name: tls-certs
-      {{- end }}
+      {{- end }}

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

@@ -43,6 +43,10 @@ spec:
         command:
         - /shared/argocd-util
         - rundex
+        {{- if .Values.dex.env }}
+        env:
+{{- toYaml .Values.dex.env | nindent 8 }}
+        {{- end }}
         ports:
         - name: http
           containerPort: {{ .Values.dex.containerPortHttp }}

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

@@ -34,9 +34,14 @@ spec:
         - "no"
         image: {{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
         imagePullPolicy: {{ .Values.redis.image.imagePullPolicy}}
+        {{- if .Values.redis.env }}
+        env:
+{{- toYaml .Values.redis.env | nindent 8 }}
+        {{- end }}
         ports:
         - containerPort: {{ .Values.redis.containerPort }}
 {{- if .Values.redis.volumeMounts }}
+
         volumeMounts:
 {{- toYaml .Values.redis.volumeMounts | nindent 10 }}
 {{- end }}