From c358b5e71f8a9259d937c9bb1a6a34c9f1f478d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?carlos=20gonz=C3=A1lez?= <cgrs@users.noreply.github.com>
Date: Thu, 27 Jul 2023 23:44:15 +0200
Subject: [PATCH] feat(argo-cd): add labels to notifications secret (#2191)
 (#2192)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: carlos gonzález <cgrs@users.noreply.github.com>
---
 charts/argo-cd/Chart.yaml                                   | 6 +++---
 charts/argo-cd/README.md                                    | 1 +
 .../argocd-configs/argocd-notifications-secret.yaml         | 3 +++
 charts/argo-cd/values.yaml                                  | 3 +++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 79b9fb03..bb918178 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.7.9
 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.41.2
+version: 5.42.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: Update to app version v2.7.9
+    - kind: added
+      description: Extra secret labels with .Values.notifications.secret.labels
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 863ae8bb..79d134b6 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -1195,6 +1195,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | notifications.secret.annotations | object | `{}` | key:value pairs of annotations to be added to the secret |
 | 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.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 cde4d555..75027ed5 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
+    {{- with .Values.notifications.secret.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.notifications.secret.annotations }}
   annotations:
     {{- range $key, $value := . }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 38f9b2d7..aa071644 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -2795,6 +2795,9 @@ notifications:
     # -- key:value pairs of annotations to be added to the secret
     annotations: {}
 
+    # -- key:value pairs of labels to be added to the secret
+    labels: {}
+
     # -- Generic key:value pairs to be inserted into the secret
     ## Can be used for templates, notification services etc. Some examples given below.
     ## For more information: https://argocd-notifications.readthedocs.io/en/stable/services/overview/