From 5d8fab4032ab4e8be854ee532bb975a7cc6e746c Mon Sep 17 00:00:00 2001
From: Antoine Dubois <Antoine.DUBOIS@collibra.com>
Date: Thu, 7 Nov 2019 14:44:01 +0100
Subject: [PATCH] added option to set admin.password, tls.key and tls.cert in
 argocd-secret via values

---
 .../argo-cd/templates/argocd-configs/argocd-secret.yaml   | 8 ++++++++
 charts/argo-cd/values.yaml                                | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index 6d4c3901..daf903fa 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -23,5 +23,13 @@ data:
   {{- if .Values.configs.secret.bitbucketSecret }}
   bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
   {{- end }}
+  {{- if and .Values.configs.secret.argocdServerTlsConfig.key (.Values.configs.secret.argocdServerTlsConfig.cert) }}
+  tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
+  tls.cert: {{ .Values.configs.secret.argocdServerTlsConfig.cert | b64enc }}
+  {{- end }}
+
+  {{- if .Values.configs.secret.argocdServerAdminPassword }}
+  admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
+  {{- end }}
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 5fbf7fe3..7d8ed605 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -532,3 +532,7 @@ configs:
     githubSecret: ""
     gitlabSecret: ""
     bitbucketSecret: ""
+#   argocdServerTlsConfig:
+#     key: 
+#     cert: 
+#   argocdServerAdminPassword: