Skip to content

Commit

Permalink
Merge pull request #57 from learner0810/fix-rendering-template
Browse files Browse the repository at this point in the history
Fix rendering template error when using a number as a db passwrod
  • Loading branch information
Iceber authored Aug 22, 2023
2 parents e220315 + cb67ead commit acf0c0d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion charts/clusterpedia/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions charts/clusterpedia/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand Down

0 comments on commit acf0c0d

Please sign in to comment.