From 18e22b97c014d53f721dd54466eaeb5ab5eb6a2d Mon Sep 17 00:00:00 2001
From: ccrpc-fjunge <144925426+ccrpc-fjunge@users.noreply.github.com>
Date: Sat, 1 Feb 2025 13:26:34 -0600
Subject: [PATCH] Updating NOMINATIM_DATABASE_DSN format (#97)

* Updated DSN Format. Renaming postgres ENV variable for clarity

* Reverting Chart.lock as that is not in question here.

* Reverting change to Chart.yaml as that is also not in question
---
 charts/nominatim/templates/_helpers.tpl    | 7 +++++++
 charts/nominatim/templates/deployment.yaml | 2 +-
 charts/nominatim/templates/initJob.yaml    | 8 ++++----
 charts/nominatim/templates/updatesJob.yaml | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/charts/nominatim/templates/_helpers.tpl b/charts/nominatim/templates/_helpers.tpl
index 59b84ca..e581ef2 100644
--- a/charts/nominatim/templates/_helpers.tpl
+++ b/charts/nominatim/templates/_helpers.tpl
@@ -90,6 +90,13 @@ Create the database URL.
 postgresql://{{ include "nominatim.databaseUser" . }}:{{ include "nominatim.databasePassword" . }}@{{ include "nominatim.databaseHost" . }}:{{ include "nominatim.databasePort" . }}/{{ include "nominatim.databaseName" . }}
 {{- end }}
 
+{{/*
+Create the database DSN.
+*/}}
+{{- define "nominatim.databaseDSN" -}}
+pgsql:dbname={{ include "nominatim.databaseName" . }};host={{ include "nominatim.databaseHost" . }};port={{ include "nominatim.databasePort" . }};user={{ include "nominatim.databaseUser" . }};password={{ include "nominatim.databasePassword" . }}
+{{- end }}
+
 {{- define "nominatim.containerPort" -}}
 {{- ternary 80 8080 .Values.nominatimUi.enabled -}}
 {{- end }}
diff --git a/charts/nominatim/templates/deployment.yaml b/charts/nominatim/templates/deployment.yaml
index 2b1df1c..332240f 100644
--- a/charts/nominatim/templates/deployment.yaml
+++ b/charts/nominatim/templates/deployment.yaml
@@ -162,7 +162,7 @@ spec:
                   name: {{ .Values.externalDatabase.existingSecretDsn }}
                   key: {{ .Values.externalDatabase.existingSecretDsnKey }}
               {{- else }}
-              value: {{ include "nominatim.databaseUrl" . }}
+              value: {{ include "nominatim.databaseDSN" . }}
               {{- end }}
             {{- if .Values.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
diff --git a/charts/nominatim/templates/initJob.yaml b/charts/nominatim/templates/initJob.yaml
index 3a4b291..4907bbf 100644
--- a/charts/nominatim/templates/initJob.yaml
+++ b/charts/nominatim/templates/initJob.yaml
@@ -29,7 +29,7 @@ spec:
         - name: wait-for-db
           image: postgres
           env:
-            - name: NOMINATIM_DATABASE_DSN
+            - name: NOMINATIM_DATABASE_URL
               {{- if .Values.externalDatabase.existingSecretDsn }}
               valueFrom:
                 secretKeyRef:
@@ -42,8 +42,8 @@ spec:
             - /bin/bash
             - -c
             - |
-              echo $NOMINATIM_DATABASE_DSN;
-              until pg_isready -d $NOMINATIM_DATABASE_DSN; do
+              echo $NOMINATIM_DATABASE_URL;
+              until pg_isready -d $NOMINATIM_DATABASE_URL; do
                 echo "Waiting for database..."
                 sleep 2
               done
@@ -128,7 +128,7 @@ spec:
                   name: {{ .Values.externalDatabase.existingSecretDsn }}
                   key: {{ .Values.externalDatabase.existingSecretDsnKey }}
               {{- else }}
-              value: {{ include "nominatim.databaseUrl" . }}
+              value: {{ include "nominatim.databaseDSN" . }}
               {{- end }}
             {{- if .Values.flatnode.enabled }}
             - name: NOMINATIM_FLATNODE_FILE
diff --git a/charts/nominatim/templates/updatesJob.yaml b/charts/nominatim/templates/updatesJob.yaml
index 0ee8512..35c1229 100644
--- a/charts/nominatim/templates/updatesJob.yaml
+++ b/charts/nominatim/templates/updatesJob.yaml
@@ -113,7 +113,7 @@ spec:
                       key: {{ .Values.externalDatabase.existingSecretDsnKey }}
                   {{- end }}
                   {{- if not .Values.externalDatabase.existingSecretDsn }}
-                  value: {{ include "nominatim.databaseUrl" . }}
+                  value: {{ include "nominatim.databaseDSN" . }}
                   {{- end }}
                 - name: NOMINATIM_REPLICATION_URL
                   value: {{ .Values.updates.replicationUrl }}