From 54b2bda2b08784f159ca4ef83a4c05d17ce1d4fd Mon Sep 17 00:00:00 2001
From: Andreas Eberle <andreas.eberle@arconsis.com>
Date: Mon, 22 Mar 2021 23:02:06 +0100
Subject: [PATCH] Use stringData instead of data in Secrets and remove manual
 base64 encoding (#13730)

---
 helm/superset/templates/secret-env.yaml        | 18 +++++++++---------
 .../templates/secret-superset-config.yaml      | 11 +++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/helm/superset/templates/secret-env.yaml b/helm/superset/templates/secret-env.yaml
index c1ce152a0..278ecc401 100644
--- a/helm/superset/templates/secret-env.yaml
+++ b/helm/superset/templates/secret-env.yaml
@@ -24,16 +24,16 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
-data:
-    REDIS_HOST: {{ tpl .Values.supersetNode.connections.redis_host . | b64enc | quote }}
-    REDIS_PORT: {{ .Values.supersetNode.connections.redis_port | b64enc | quote }}
-    DB_HOST: {{ tpl .Values.supersetNode.connections.db_host . | b64enc | quote }}
-    DB_PORT: {{ .Values.supersetNode.connections.db_port | b64enc | quote }}
-    DB_USER: {{ .Values.supersetNode.connections.db_user | b64enc | quote }}
-    DB_PASS: {{ .Values.supersetNode.connections.db_pass | b64enc | quote }}
-    DB_NAME: {{ .Values.supersetNode.connections.db_name | b64enc | quote }}
+stringData:
+    REDIS_HOST: {{ tpl .Values.supersetNode.connections.redis_host . | quote }}
+    REDIS_PORT: {{ .Values.supersetNode.connections.redis_port | quote }}
+    DB_HOST: {{ tpl .Values.supersetNode.connections.db_host . | quote }}
+    DB_PORT: {{ .Values.supersetNode.connections.db_port | quote }}
+    DB_USER: {{ .Values.supersetNode.connections.db_user | quote }}
+    DB_PASS: {{ .Values.supersetNode.connections.db_pass | quote }}
+    DB_NAME: {{ .Values.supersetNode.connections.db_name | quote }}
     {{- if .Values.extraSecretEnv }}
     {{- range $key, $value := .Values.extraSecretEnv }}
-    {{ $key }}: {{ $value | b64enc | quote }}
+    {{ $key }}: {{ $value | quote }}
     {{- end }}
     {{- end }}
diff --git a/helm/superset/templates/secret-superset-config.yaml b/helm/superset/templates/secret-superset-config.yaml
index 281ad9cf0..a5f5cff6b 100644
--- a/helm/superset/templates/secret-superset-config.yaml
+++ b/helm/superset/templates/secret-superset-config.yaml
@@ -24,7 +24,10 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
-data:
-  superset_config.py: {{ include "superset-config" . | b64enc }}
-  superset_init.sh: {{ tpl .Values.init.initscript . | b64enc }}
-  superset_bootstrap.sh: {{ include "superset-bootstrap" . | b64enc }}
+stringData:
+  superset_config.py: |
+{{- include "superset-config" . | nindent 4 }}
+  superset_init.sh: |
+{{- tpl .Values.init.initscript . | nindent 4 }}
+  superset_bootstrap.sh: |
+{{- include "superset-bootstrap" . | nindent 4 }}