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

fixed wrong params in secret. Most probably related to; https://github.com/argoproj/argo-cd/pull/2777

Browse source
This commit is contained in:
konstantin.kiess 2019-11-28 10:34:43 +01:00
parent 5330efa6d8
commit 3838db31b2
3 changed files with 18 additions and 7 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.2 version: 1.2.4
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:

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

@ -11,17 +11,23 @@ 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.argocdServerAdminPassword .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret ) }}
# 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 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -605,6 +605,11 @@ 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: ""