added automatically set passwordMtime and adding adminpassword to outer check

This commit is contained in:
konstantin.kiess 2019-11-13 09:06:05 +01:00 committed by konstantin.kiess
parent 9c1646e9b3
commit 418b07bcb6

View file

@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
type: Opaque 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 # Setting a blank data again will wipe admin password/key/cert
data: data:
{{- if .Values.configs.secret.githubSecret }} {{- if .Values.configs.secret.githubSecret }}
@ -30,6 +30,7 @@ data:
{{- if .Values.configs.secret.argocdServerAdminPassword }} {{- if .Values.configs.secret.argocdServerAdminPassword }}
admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }} admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}