From 45c1534eeb03ee2a6cf89d2a2f10de2a00d206f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?carlos=20gonz=C3=A1lez?= <cgrs@users.noreply.github.com>
Date: Thu, 19 Jan 2023 23:14:49 +0100
Subject: [PATCH] feat(argo-cd): Add labels for argocd-secret (#1779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(argo-cd): add secret labels field (#1778)

Signed-off-by: carlos gonzález <cgrs@users.noreply.github.com>
Co-authored-by: Petr Drastil <petr.drastil@gmail.com>
---
 charts/argo-cd/Chart.yaml                                  | 4 ++--
 charts/argo-cd/README.md                                   | 1 +
 charts/argo-cd/templates/argocd-configs/argocd-secret.yaml | 3 +++
 charts/argo-cd/values.yaml                                 | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index bc3ac6d1..0b495196 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.5.7
 kubeVersion: ">=1.22.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.17.4
+version: 5.18.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -23,4 +23,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Update Argo CD extensions to v0.2.1"
+    - "[Added]: Extra secret labels with .Values.configs.secret.labels"
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index d1ad8c14..278f1680 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -442,6 +442,7 @@ NAME: my-release
 | configs.secret.githubSecret | string | `""` | Shared secret for authenticating GitHub webhook events |
 | configs.secret.gitlabSecret | string | `""` | Shared secret for authenticating GitLab webhook events |
 | configs.secret.gogsSecret | string | `""` | Shared secret for authenticating Gogs webhook events |
+| configs.secret.labels | object | `{}` | Labels to be added to argocd-secret |
 | configs.styles | string | `""` (See [values.yaml]) | Define custom [CSS styles] for your argo instance. This setting will automatically mount the provided CSS and reference it in the argo configuration. |
 | configs.tlsCerts | object | See [values.yaml] | TLS certificate |
 | configs.tlsCertsAnnotations | object | `{}` | TLS certificate configmap annotations |
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index f289480d..84a51197 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -5,6 +5,9 @@ metadata:
   name: argocd-secret
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "secret") | nindent 4 }}
+    {{- with .Values.configs.secret.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.configs.secret.annotations }}
   annotations:
     {{- range $key, $value := . }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index cd0bee81..98b62c1e 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -392,6 +392,8 @@ configs:
   secret:
     # -- Create the argocd-secret
     createSecret: true
+    # -- Labels to be added to argocd-secret
+    labels: {}
     # -- Annotations to be added to argocd-secret
     annotations: {}