From 4b22128b4cf10bbab9ccab56051a05e98363817a Mon Sep 17 00:00:00 2001
From: DaytonG <xerxesai@gmail.com>
Date: Thu, 9 Jan 2020 09:55:14 -0700
Subject: [PATCH] feat: allow custom secrets to be added to argocd-secret
 (#199)

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

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 227c6a55..4c8ebda2 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.6"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.5.3
+version: 1.6.0
 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 d4a29a3f..614f2eb9 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -46,6 +46,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | configs.secret.githubSecret | GitHub incoming webhook secret | `""` |
 | configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` |
 | configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
+| configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
 
 ## ArgoCD Controller
 
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index ba9e6627..f9036347 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
 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) }}
+{{- 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
 data:
   {{- if .Values.configs.secret.githubSecret }}
@@ -37,5 +37,8 @@ data:
   admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
   admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
   {{- end }}
+  {{- range $key, $value := .Values.configs.secret.extra }}
+  {{ $key }}: {{ $value | b64enc }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 47411af6..299cc623 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -689,6 +689,12 @@ configs:
     bitbucketUUÌD: ""
     gogsSecret: ""
 
+    # Custom secrets. Useful for injecting SSO secrets into environment variables.
+    # Ref: https://argoproj.github.io/argo-cd/operator-manual/sso/
+    # Note that all values must be non-empty.
+    extra: {}
+      # LDAP_PASSWORD: "mypassword"
+
   # Argo TLS Data.
     argocdServerTlsConfig:
       {}