From cb67ead916a9a32a2cd42c80cf3767bcf1b2ed0f Mon Sep 17 00:00:00 2001
From: "zhongjun.li" <zhongjun.li@daocloud.io>
Date: Tue, 22 Aug 2023 13:51:51 +0800
Subject: [PATCH] Modify rendering template error when using a number as a db
 passwrod

Signed-off-by: zhongjun.li <zhongjun.li@daocloud.io>
---
 charts/clusterpedia/Chart.yaml             |  2 +-
 charts/clusterpedia/templates/_helpers.tpl | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/clusterpedia/Chart.yaml b/charts/clusterpedia/Chart.yaml
index f00a594..986ba53 100644
--- a/charts/clusterpedia/Chart.yaml
+++ b/charts/clusterpedia/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.9.0
+version: 1.9.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/clusterpedia/templates/_helpers.tpl b/charts/clusterpedia/templates/_helpers.tpl
index 4a76615..767ab8d 100644
--- a/charts/clusterpedia/templates/_helpers.tpl
+++ b/charts/clusterpedia/templates/_helpers.tpl
@@ -171,22 +171,22 @@ Return the proper Docker Image Registry Secret Names
 {{- define "clusterpedia.storage.password" -}}
 {{- if eq .Values.storageInstallMode "external" }}
      {{- if empty (include "clusterpedia.storage.dsn" .) -}}
-         {{- required "Please set correct storage password!" .Values.externalStorage.password | b64enc -}}
+         {{- required "Please set correct storage password!" .Values.externalStorage.password | toString | b64enc -}}
      {{- else -}}
-         {{- .Values.externalStorage.password | b64enc -}}
+         {{- .Values.externalStorage.password | toString | b64enc -}}
      {{- end -}}
 {{- else -}}
      {{- if eq (include "clusterpedia.storage.type" .) "postgres" }}
           {{- if not (empty .Values.global.postgresql.auth.username) -}}
-               {{- .Values.global.postgresql.auth.password | b64enc -}}
+               {{- .Values.global.postgresql.auth.password | toString | b64enc -}}
           {{- else -}}
-               {{- .Values.global.postgresql.auth.postgresPassword | b64enc -}}
+               {{- .Values.global.postgresql.auth.postgresPassword | toString | b64enc -}}
           {{- end -}}
      {{- else if eq (include "clusterpedia.storage.type" .) "mysql" -}}
           {{- if not (empty .Values.mysql.auth.username) -}}
-               {{- .Values.mysql.auth.password  | b64enc -}}
+               {{- .Values.mysql.auth.password | toString | b64enc -}}
           {{- else -}}
-               {{- .Values.mysql.auth.rootPassword | b64enc -}}
+               {{- .Values.mysql.auth.rootPassword | toString | b64enc -}}
           {{- end -}}
      {{- end -}}
 {{- end -}}