From 418b07bcb672329871c82dec5bf590f7c7d35b4f Mon Sep 17 00:00:00 2001
From: "konstantin.kiess" <konstantin.kiess@gmx.de>
Date: Wed, 13 Nov 2019 09:06:05 +0100
Subject: [PATCH] added automatically set passwordMtime and adding
 adminpassword to outer check

---
 charts/argo-cd/templates/argocd-configs/argocd-secret.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index daf903fa..c4876ef9 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.bitbucketSecret) }}
+{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret .Values.configs.secret.argocdServerAdminPassword ) }}
 # Setting a blank data again will wipe admin password/key/cert
 data:
   {{- if .Values.configs.secret.githubSecret }}
@@ -30,6 +30,7 @@ data:
 
   {{- if .Values.configs.secret.argocdServerAdminPassword }}
   admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
+  admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
   {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}