From 149049293f710015af9ba448ec1aef5448bec2fd Mon Sep 17 00:00:00 2001
From: Konstantin <34882943+nouseforaname@users.noreply.github.com>
Date: Thu, 5 Dec 2019 03:52:22 +0100
Subject: [PATCH] Fix webhook secret properties (#176)

- Bumped chart version to 1.3.0 due to breaking change (bitbucket uuid / bitbucket server secret)
---
 charts/argo-cd/Chart.yaml                       |  2 +-
 .../templates/argocd-configs/argocd-secret.yaml | 17 +++++++++++------
 charts/argo-cd/values.yaml                      |  6 +++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 8eba12b3..b757833c 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.0"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.2.4
+version: 1.3.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index dcacb081..ba9e6627 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -11,23 +11,28 @@ 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 .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
 data:
   {{- if .Values.configs.secret.githubSecret }}
-  github.webhook.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
+  webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
   {{- end }}
   {{- if .Values.configs.secret.gitlabSecret }}
-  gitlab.webhook.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }}
+  webhook.gitlab.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }}
   {{- end }}
-  {{- if .Values.configs.secret.bitbucketSecret }}
-  bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
+  {{- if .Values.configs.secret.bitbucketServerSecret }}
+  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 }}
   {{- if .Values.configs.secret.argocdServerTlsConfig }}
   tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
   tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }}
   {{- end }}
-
   {{- if .Values.configs.secret.argocdServerAdminPassword }}
   admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
   admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 20f619ba..5af2ad69 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -605,9 +605,13 @@ configs:
     # -----END RSA PRIVATE KEY-----
   secret:
     createSecret: true
+
+    # Webhook Configs
     githubSecret: ""
     gitlabSecret: ""
-    bitbucketSecret: ""
+    bitbucketServerSecret: ""
+    bitbucketUUÌD: ""
+    gogsSecret: ""
 
 # Argo TLS Data.
   argocdServerTlsConfig: {}