Merge pull request #51 from learner0810/fix-use-external-pg

Fix rendering template error when using external pg
clusterpedia-io · Jul 5, 2023 · 53c40cb · 53c40cb
2 parents 7ae3e47 + 48247fa
commit 53c40cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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.7.0
+version: 1.7.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
@@ -124,14 +124,15 @@ Return the proper Docker Image Registry Secret Names
 
 {{- define "clusterpedia.storage.dsn" -}}
 {{- if eq .Values.storageInstallMode "external" }}
-     {{- if not (eq .Values.externalStorage.type "mysql") }}
-          {{ required "storage dsn not support mysql" "" }}
+{{- if not (empty .Values.externalStorage.dsn) -}}
+     {{- if eq .Values.externalStorage.type "mysql" }}
+         {{- .Values.externalStorage.dsn }}
      {{- else -}}
-          {{- .Values.externalStorage.dsn }}
+         {{ required "storage dsn only supports mysql" "" }}
      {{- end -}}
 {{- end -}}
 {{- end -}}
-
+{{- end -}}
 
 
 {{- define "clusterpedia.storage.user" -}}