From 8409e2e1d2786f9d812b03914e3e91333b56a1cf Mon Sep 17 00:00:00 2001
From: akastav <switch@bk.ru>
Date: Thu, 3 Jun 2021 12:42:24 +0300
Subject: [PATCH] add encrypt values for secret section

Signed-off-by: akastav <switch@bk.ru>
---
 charts/argo-cd/Chart.yaml                                  | 4 ++--
 charts/argo-cd/templates/argocd-configs/argocd-secret.yaml | 4 ++++
 charts/argo-cd/values.yaml                                 | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 465ad6e0..d3afe7f3 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 2.0.3
+appVersion: 2.0.4
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.6.6
+version: 3.6.7
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/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 d84d2649..eda3f7c6 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -14,7 +14,11 @@ metadata:
 type: Opaque
 {{- 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 .Values.configs.secret.extra) }}
 # Setting a blank data again will wipe admin password/key/cert
+{{- if .Values.configs.secret.encrypt }}
 data:
+{{- else }}
+stringData:
+{{- end }}
   {{- if .Values.configs.secret.githubSecret }}
   webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
   {{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index fdd50b36..887bd32f 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -11,7 +11,7 @@ installCRDs: true
 global:
   image:
     repository: quay.io/argoproj/argocd
-    tag: v2.0.3
+    tag: v2.0.4
     imagePullPolicy: IfNotPresent
   securityContext: {}
   #  runAsUser: 999
@@ -1048,6 +1048,8 @@ configs:
     # -----END RSA PRIVATE KEY-----
   secret:
     createSecret: true
+    # Use secret with stringData instead data, without base64 encryptions
+    encrypt: true
     ## Annotations to be added to argocd-secret
     ##
     annotations: {}