From fb7b59e4814343e103c1f436012634caf26bca64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C4=85ka=C5=82a?=
 <67150725+SebastianBakala-TomTom@users.noreply.github.com>
Date: Fri, 7 Oct 2022 12:52:18 +0200
Subject: [PATCH] fix(argo-cd): Added missing envFrom for
 notifications-controller (#1512)

Signed-off-by: bakala <Sebastian.Bakala@tomtom.com>
---
 charts/argo-cd/Chart.yaml                                 | 5 +++--
 charts/argo-cd/README.md                                  | 1 +
 .../templates/argocd-notifications/deployment.yaml        | 7 ++++++-
 charts/argo-cd/values.yaml                                | 8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 4b805cf0..870b9149 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.14
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.5.11
+version: 5.5.12
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -22,4 +22,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Updated example PrometheusRule expression for missing apps"
+    - "[Added]: Added `envFrom` field to the notifications-controller."
+    - "[Changed]: Templating the `env` field in the same way as in the argocd-server."
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 7cad3839..e6ee678f 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -953,6 +953,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | notifications.enabled | bool | `true` | Enable Notifications controller |
 | notifications.extraArgs | list | `[]` | Extra arguments to provide to the controller |
 | notifications.extraEnv | list | `[]` | Additional container environment variables |
+| notifications.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller |
 | notifications.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) |
 | notifications.extraVolumes | list | `[]` | List of extra volumes to add |
 | notifications.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the notifications controller |
diff --git a/charts/argo-cd/templates/argocd-notifications/deployment.yaml b/charts/argo-cd/templates/argocd-notifications/deployment.yaml
index cfbb54f7..a1eab679 100644
--- a/charts/argo-cd/templates/argocd-notifications/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-notifications/deployment.yaml
@@ -60,7 +60,12 @@ spec:
           securityContext: {{- toYaml .Values.notifications.containerSecurityContext | nindent 12 }}
           {{- end }}
           {{- with .Values.notifications.extraEnv }}
-          env: {{ toYaml . | nindent 12 }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.notifications.extraEnvFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: tls-certs
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index eabfe5c5..e46efcd2 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -2269,6 +2269,14 @@ notifications:
   # -- Additional container environment variables
   extraEnv: []
 
+  # -- envFrom to pass to the controller
+  # @default -- `[]` (See [values.yaml])
+  extraEnvFrom: []
+    # - configMapRef:
+    #     name: config-map-name
+    # - secretRef:
+    #     name: secret-name
+
   # -- List of extra mounts to add (normally used with extraVolumes)
   extraVolumeMounts: []
     # - mountPath: /tmp/foobar