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

remove b64enc if encrypt set false

Browse source 
Signed-off-by: akastav <switch@bk.ru>
This commit is contained in:
akastav 2021-06-03 14:55:03 +03:00
parent 8409e2e1d2
commit f86c6f1b05
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 2.0.4
appVersion: 2.0.3
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 3.6.7

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

@ -20,30 +20,34 @@ data:
stringData:
{{- end }}
{{- if .Values.configs.secret.githubSecret }}
webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
webhook.github.secret: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.githubSecret | b64enc }} {{ else }} {{ .Values.configs.secret.githubSecret }} {{ end }}
{{- end }}
{{- if .Values.configs.secret.gitlabSecret }}
webhook.gitlab.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }}
webhook.gitlab.secret: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.gitlabSecret | b64enc }} {{ else }} {{ .Values.configs.secret.gitlabSecret }} {{ end }}
{{- end }}
{{- if .Values.configs.secret.bitbucketServerSecret }}
webhook.bitbucketserver.secret: {{ .Values.configs.secret.bitbucketServerSecret | b64enc }}
webhook.bitbucketserver.secret: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.bitbucketServerSecret | b64enc }} {{ else }} {{ .Values.configs.secret.bitbucketServerSecret }} {{ end }}
{{- end }}
{{- if .Values.configs.secret.bitbucketUUID }}
webhook.bitbucket.uuid: {{ .Values.configs.secret.bitbucketUUID | b64enc }}
webhook.bitbucket.uuid: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.bitbucketUUID | b64enc }} {{ else }} {{ .Values.configs.secret.bitbucketUUID }} {{ end }}
{{- end }}
{{- if .Values.configs.secret.gogsSecret }}
webhook.gogs.secret: {{ .Values.configs.secret.gogsSecret | b64enc }}
webhook.gogs.secret: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.gogsSecret | b64enc }} {{ else }} {{ .Values.configs.secret.gogsSecret }} {{ end }}
{{- end }}
{{- if .Values.configs.secret.argocdServerTlsConfig }}
tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }}
tls.key: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }} {{ else }} {{ .Values.configs.secret.argocdServerTlsConfig.key }} {{ end }}
tls.crt: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }} {{ else }} {{ .Values.configs.secret.argocdServerTlsConfig.crt }} {{ end }}
{{- end }}
{{- if .Values.configs.secret.argocdServerAdminPassword }}
admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
admin.passwordMtime: {{ default (date "2006-01-02T15:04:05Z" now) .Values.configs.secret.argocdServerAdminPasswordMtime | b64enc }}
admin.password: {{- if .Values.configs.secret.encrypt }}{{ .Values.configs.secret.argocdServerAdminPassword | b64enc }} {{ else }} {{ .Values.configs.secret.argocdServerAdminPassword }} {{ end }}
admin.passwordMtime: {{- if .Values.configs.secret.encrypt }}{{ default (date "2006-01-02T15:04:05Z" now) .Values.configs.secret.argocdServerAdminPasswordMtime | b64enc }} {{ else }} {{ default (date "2006-01-02T15:04:05Z" now) .Values.configs.secret.argocdServerAdminPasswordMtime }} {{ end }}
{{- end }}
{{- range $key, $value := .Values.configs.secret.extra }}
{{- if .Values.configs.secret.encrypt }}
{{ $key }}: {{ $value | b64enc }}
{{- else }}
{{ $key }}: {{ $value}}
{{- end }}
{{- end }}
{{- end }}
{{- end }}