From f86c6f1b05c54bc54e42aba25f75db1623d79631 Mon Sep 17 00:00:00 2001
From: akastav <switch@bk.ru>
Date: Thu, 3 Jun 2021 14:55:03 +0300
Subject: [PATCH] remove b64enc if encrypt set false

Signed-off-by: akastav <switch@bk.ru>
---
 charts/argo-cd/Chart.yaml                     |  2 +-
 .../argocd-configs/argocd-secret.yaml         | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index d3afe7f3..68a2ed62 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -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
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index eda3f7c6..e6fbfa84 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -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 }}