From 3838db31b2ba5a5b8fb816b1b6a66f84c35d4080 Mon Sep 17 00:00:00 2001
From: "konstantin.kiess" <konstantin.kiess@gmx.de>
Date: Thu, 28 Nov 2019 10:34:43 +0100
Subject: [PATCH] fixed wrong params in secret. Most probably related to;
 https://github.com/argoproj/argo-cd/pull/2777

---
 charts/argo-cd/Chart.yaml                        |  2 +-
 .../templates/argocd-configs/argocd-secret.yaml  | 16 +++++++++++-----
 charts/argo-cd/values.yaml                       |  7 ++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 5ce46ded..8eba12b3 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.2
+version: 1.2.4
 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 6d4c3901..0c664bd5 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -11,17 +11,23 @@ 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.argocdServerAdminPassword .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret ) }}
 # 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 }}
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index dfd95c9b..9e90106d 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -605,6 +605,11 @@ configs:
     # -----END RSA PRIVATE KEY-----
   secret:
     createSecret: true
+
+    # Webhook Configs
     githubSecret: ""
     gitlabSecret: ""
-    bitbucketSecret: ""
+    bitbucketServerSecret: ""
+    bitbucketUUÌD: ""
+    gogsSecret: ""
+