Allow use of alternate postgresql port

The PostgreSQL port can be different than the standard one, especially when using an external service. Signed-off-by: Christophe Aubry <[email protected]>
passbolt · Feb 27, 2024 · 711fbf9 · 711fbf9
1 parent f962041
commit 711fbf9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -70,18 +70,20 @@ spec:
               apt update
               apt install -y postgresql-client
               cat <<-EOF > /tmp/.pgpass
-              ${DATASOURCES_DEFAULT_HOST}:5432:*:${DATASOURCES_DEFAULT_USERNAME}:${DATASOURCES_DEFAULT_PASSWORD}
+              ${DATASOURCES_DEFAULT_HOST}:${DATASOURCES_DEFAULT_PORT}:*:${DATASOURCES_DEFAULT_USERNAME}:${DATASOURCES_DEFAULT_PASSWORD}
               EOF
               chmod 600 /tmp/.pgpass
               export PGPASSFILE='/tmp/.pgpass'
-              while ! ${client} -h ${DATASOURCES_DEFAULT_HOST} ; do
+              while ! ${client} -h ${DATASOURCES_DEFAULT_HOST} -p ${DATASOURCES_DEFAULT_PORT} ; do
                 echo "Waiting for postgresql database connection..."
                 sleep 2
               done
               {{- end }}
           env:
             - name: DATASOURCES_DEFAULT_HOST
               value: {{ include "passbolt.databaseServiceName" . }}
+            - name: DATASOURCES_DEFAULT_PORT
+              value: {{ .Values.passboltEnv.plain.DATASOURCES_DEFAULT_PORT }}
             {{- with .Values.passboltEnv.extraEnv }}
             {{- toYaml . | nindent 12 }}
             {{- end }}