add global env for argo-cd

Signed-off-by: Joe Lee <lj_2005@163.com>

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.7.4
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.35.1
+version: 5.36.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:

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

@@ -99,7 +99,7 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }}
         name: {{ .Values.controller.name }}
         env:
-          {{- with .Values.controller.env }}
+          {{- with (concat .Values.global.env .Values.controller.env) }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
           - name: ARGOCD_CONTROLLER_REPLICAS

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

@@ -79,7 +79,7 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- with .Values.applicationSet.extraEnv }}
+            {{- with (concat .Values.global.env .Values.applicationSet.extraEnv) }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
             - name: NAMESPACE

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

@@ -66,7 +66,7 @@ spec:
             {{- range .Values.notifications.extraArgs }}
             - {{ . | squote }}
             {{- end }}
-          {{- with .Values.notifications.extraEnv }}
+          {{- with (concat .Values.global.env .Values.notifications.extraEnv) }}
           env:
             {{- toYaml . | nindent 12 }}
           {{- end }}

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

@@ -77,7 +77,7 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
         env:
-          {{- with .Values.repoServer.env }}
+          {{- with (concat .Values.global.env .Values.repoServer.env) }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
           {{- if .Values.openshift.enabled }}

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

@@ -74,7 +74,7 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
         env:
-          {{- with .Values.server.env }}
+          {{- with (concat .Values.global.env .Values.server.env) }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
           - name: ARGOCD_SERVER_INSECURE

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

@@ -70,7 +70,7 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
         env:
-          {{- with .Values.dex.env }}
+          {{- with (concat .Values.global.env .Values.dex.env) }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
           - name: ARGOCD_DEX_SERVER_DISABLE_TLS

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

@@ -61,7 +61,7 @@ spec:
         {{- with .Values.redis.extraArgs }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.redis.env }}
+        {{- with (concat .Values.global.env .Values.redis.env) }}
         env:
           {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -92,7 +92,7 @@ spec:
           value: {{ printf "redis://localhost:%v" .Values.redis.containerPorts.redis }}
         - name: REDIS_EXPORTER_WEB_LISTEN_ADDRESS
           value: {{ printf "0.0.0.0:%v" .Values.redis.containerPorts.metrics }}
-        {{- with .Values.redis.exporter.env }}
+        {{- with (concat .Values.global.env .Values.redis.exporter.env) }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
         ports:

charts/argo-cd/values.yaml

@@ -144,6 +144,9 @@ global:
     #   maxSurge: 25%
     #   maxUnavailable: 25%
 
+  # -- Environment variables to pass to all deployed Deployments
+  env: []
+
 ## Argo Configs
 configs:
   # General Argo CD configuration