make postgres globalctx overrible

harness · Jan 10, 2025 · bb0b3c8 · bb0b3c8
1 parent 5395755
commit bb0b3c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/common/Chart.yaml b/src/common/Chart.yaml
@@ -15,7 +15,7 @@ type: library
 # 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.3.74
+version: 1.3.75
 
 # 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/src/common/templates/_databaseconnectionsv2.tpl b/src/common/templates/_databaseconnectionsv2.tpl
@@ -494,13 +494,16 @@ USAGE:
     {{- $dbType := upper $type }}
     {{- $installed := true }}
     {{- $globalDBCtx := $.Values.global.database.postgres }}
+    {{- if .globalDBCtx }}
+        {{- $globalDBCtx = .globalDBCtx }}
+    {{- end }}
     {{- $mergedDBCtx := $globalDBCtx }}
     {{- $localDBCtx := $.Values.postgres }}
     {{- if .localDBCtx }}
         {{- $localDBCtx = .localDBCtx }}
     {{- end }}
     {{- $args := default "" .args }}
-    {{- if eq $.Values.global.database.postgres.installed false }}
+    {{- if eq $globalDBCtx.installed false }}
         {{- $installed = false }}
     {{- end }}
     {{- if eq $localDBCtx.enabled true }}
@@ -511,7 +514,7 @@ USAGE:
     {{- if gt (len $localDBCtx.hosts) 0 }}
         {{- $hosts = $localDBCtx.hosts }}
     {{- else }}
-        {{- $hosts = $.Values.global.database.postgres.hosts }}
+        {{- $hosts = $globalDBCtx.hosts }}
     {{- end }}
     {{- $keywordValueConnectionString := .keywordValueConnectionString }}
     {{- $protocol := default "postgres" .protocol }}