From 2eea9d0b0571da98ba846d94c3f03731b5861e11 Mon Sep 17 00:00:00 2001
From: ranrubin <ranrubin@gmail.com>
Date: Thu, 7 Mar 2024 19:29:33 +0200
Subject: [PATCH] feat(argo-cd): Support for existing Secret in ArgoCD
 Notifications, and ability to set its name.

Signed-off-by: ranrubin <ranrubin@gmail.com>
---
 charts/argo-cd/Chart.yaml                                   | 6 +++---
 charts/argo-cd/README.md                                    | 2 ++
 .../argocd-configs/argocd-notifications-secret.yaml         | 4 ++--
 .../argo-cd/templates/argocd-notifications/clusterrole.yaml | 4 ++--
 charts/argo-cd/templates/argocd-notifications/role.yaml     | 2 +-
 charts/argo-cd/values.yaml                                  | 6 ++++++
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 680b5d04..f77df4c1 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.10.2
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.6.0
+version: 6.7.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -26,5 +26,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
-      description: Support ApplicationSet in any namespace.
+    - kind: Added
+      description: Support for existing Secret for ArgoCD Notifications, and ability to set its name.
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index eab256f7..c07899a5 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -1465,6 +1465,8 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | notifications.secret.create | bool | `true` | Whether helm chart creates notifications controller secret |
 | notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the secret |
 | notifications.secret.labels | object | `{}` | key:value pairs of labels to be added to the secret |
+| notifications.secret.name | string | `"argocd-notifications-secret"` | notifications controller Secret name |
+| notifications.secret.useExistingSecret | bool | `false` | Whether to use existing secret. If true, assumes that the existing secret name is notifications.secret.name |
 | notifications.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
 | notifications.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
 | notifications.serviceAccount.create | bool | `true` | Create notifications controller service account |
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml
index 75027ed5..3d5543dd 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml
@@ -1,8 +1,8 @@
-{{- if and .Values.notifications.enabled .Values.notifications.secret.create }}
+{{- if and (not .Values.notifications.secret.useExistingSecret) .Values.notifications.enabled .Values.notifications.secret.create }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: argocd-notifications-secret
+  name: {{ .Values.notifications.secret.name }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
diff --git a/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml b/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml
index 793bb5d3..292ac303 100644
--- a/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml
+++ b/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml
@@ -38,11 +38,11 @@ rules:
     verbs:
     - get
   {{- end }}
-  {{- if .Values.notifications.secret.create }}
+  {{- if or .Values.notifications.secret.create .Values.notifications.secret.useExistingSecret }}
   - apiGroups:
     - ""
     resourceNames:
-    - argocd-notifications-secret
+    - {{ .Values.notifications.secret.name }}
     resources:
     - secrets
     verbs:
diff --git a/charts/argo-cd/templates/argocd-notifications/role.yaml b/charts/argo-cd/templates/argocd-notifications/role.yaml
index 128c24f5..22eaa473 100644
--- a/charts/argo-cd/templates/argocd-notifications/role.yaml
+++ b/charts/argo-cd/templates/argocd-notifications/role.yaml
@@ -37,7 +37,7 @@ rules:
 - apiGroups:
   - ""
   resourceNames:
-  - argocd-notifications-secret
+  - {{ .Values.notifications.secret.name }}
   resources:
   - secrets
   verbs:
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 42b44183..df65d163 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -3019,6 +3019,12 @@ notifications:
     # -- Whether helm chart creates notifications controller secret
     create: true
 
+    # -- notifications controller Secret name
+    name: "argocd-notifications-secret"
+
+    # -- Whether to use existing secret. If true, assumes that the existing secret name is notifications.secret.name
+    useExistingSecret: false
+
     # -- key:value pairs of annotations to be added to the secret
     annotations: {}