DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated chart to allow setting argocd server: adminpassword, tls.key, tls.cert

Browse source
This commit is contained in:
konstantin.kiess 2019-11-13 17:53:25 +01:00
parent 882b5e384d
commit c1abc3691f
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
View file

@ -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 .Values.configs.secret.argocdServerTlsConfig) }}
# Setting a blank data again will wipe admin password/key/cert
data:
{{- if .Values.configs.secret.githubSecret }}
@ -23,5 +23,14 @@ data:
{{- if .Values.configs.secret.bitbucketSecret }}
bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
{{- end }}
{{- if .Values.configs.secret.argocdServerTlsConfig }}
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 }}
admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

6
charts/argo-cd/values.yaml
View file

@ -532,3 +532,9 @@ configs:
githubSecret: ""
gitlabSecret: ""
bitbucketSecret: ""
# argocdServerTlsConfig:
# key:
# cert:
#Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
#`htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
# argocdServerAdminPassword: