From 0eb0730abb54f9cc45e94256855fb7e845fb7df3 Mon Sep 17 00:00:00 2001
From: LucasBoisserie <LucasBoisserie@users.noreply.github.com>
Date: Thu, 16 Apr 2020 14:44:52 +0200
Subject: [PATCH] [argocd] add annotations for secret (#308)

---
 charts/argo-cd/Chart.yaml                                  | 2 +-
 charts/argo-cd/README.md                                   | 1 +
 charts/argo-cd/templates/argocd-configs/argocd-secret.yaml | 6 ++++++
 charts/argo-cd/values.yaml                                 | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 649c6ae1..0977943c 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.5.1"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.2.3
+version: 2.2.4
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 44163122..52063bc9 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -64,6 +64,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
 | installCRDs | bool | `true` | Install CRDs if you are using Helm2. |
 | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
+| configs.secret.annotations | Annotations for argocd-secret | `{}` |
 | configs.secret.argocdServerAdminPassword | Admin password | `null` |
 | configs.secret.argocdServerAdminPasswordMtime | Admin password modification time | `date "2006-01-02T15:04:05Z" now` if configs.secret.argocdServerAdminPassword is set |
 | configs.secret.bitbucketSecret | BitBucket incoming webhook secret | `""` |
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index ad8da483..efb80358 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -10,6 +10,12 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
+  {{- if .Values.configs.secret.annotations }}
+  annotations:
+  {{- range $key, $value := .Values.configs.secret.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
 type: Opaque
 {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig .Values.configs.secret.extra) }}
 # Setting a blank data again will wipe admin password/key/cert
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 5719be9c..fe6f7e9d 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -779,6 +779,9 @@ configs:
     # -----END RSA PRIVATE KEY-----
   secret:
     createSecret: true
+    ## Annotations to be added to argocd-secret
+    ##
+    annotations: {}
 
     # Webhook Configs
     githubSecret: ""