ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

Fix webhook secret properties (#176) 

- Bumped chart version to 1.3.0 due to breaking change (bitbucket uuid / bitbucket server secret)
main
Konstantin 2019-12-05 03:52:22 +01:00 committed by Sean Johnson
parent 7503f29192
commit 149049293f
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.3.0" appVersion: "1.3.0"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 1.2.4 version: 1.3.0
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
keywords: keywords:

17
charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
View File

@ -11,23 +11,28 @@ 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 .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig) }} {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig) }}
# 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 }}
github.webhook.secret: {{ .Values.configs.secret.githubSecret | b64enc }} webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
{{- end }} {{- end }}
{{- if .Values.configs.secret.gitlabSecret }} {{- if .Values.configs.secret.gitlabSecret }}
gitlab.webhook.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }} webhook.gitlab.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }}
{{- end }} {{- end }}
{{- if .Values.configs.secret.bitbucketSecret }} {{- if .Values.configs.secret.bitbucketServerSecret }}
bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }} webhook.bitbucketserver.secret: {{ .Values.configs.secret.bitbucketServerSecret | b64enc }}
{{- end }}
{{- if .Values.configs.secret.bitbucketUUID }}
webhook.bitbucket.uuid: {{ .Values.configs.secret.bitbucketUUID | b64enc }}
{{- end }}
{{- if .Values.configs.secret.gogsSecret }}
webhook.gogs.secret: {{ .Values.configs.secret.gogsSecret | b64enc }}
{{- end }} {{- end }}
{{- if .Values.configs.secret.argocdServerTlsConfig }} {{- if .Values.configs.secret.argocdServerTlsConfig }}
tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }} tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }} tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }}
{{- end }} {{- end }}
{{- 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 }} admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}

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

@ -605,9 +605,13 @@ configs:
# -----END RSA PRIVATE KEY----- # -----END RSA PRIVATE KEY-----
secret: secret:
createSecret: true createSecret: true
# Webhook Configs
githubSecret: "" githubSecret: ""
gitlabSecret: "" gitlabSecret: ""
bitbucketSecret: "" bitbucketServerSecret: ""
bitbucketUUÌD: ""
gogsSecret: ""
# Argo TLS Data. # Argo TLS Data.
argocdServerTlsConfig: {} argocdServerTlsConfig: {}