From a9c91c5f9a10053b2bf12e5c72c66d5c87f9e8a8 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 25 Jun 2025 15:24:07 +0100
Subject: [PATCH] make schema and sslmode configurable

---
 hosting/k8s/helm/templates/_helpers.tpl         | 6 +++---
 hosting/k8s/helm/values-production-example.yaml | 2 ++
 hosting/k8s/helm/values.yaml                    | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/hosting/k8s/helm/templates/_helpers.tpl b/hosting/k8s/helm/templates/_helpers.tpl
index 74ce765cb..96dfc767d 100644
--- a/hosting/k8s/helm/templates/_helpers.tpl
+++ b/hosting/k8s/helm/templates/_helpers.tpl
@@ -96,13 +96,13 @@ Get the full image name for supervisor
 {{- end }}
 
 {{/*
-PostgreSQL connection string for internal PostgreSQL
+PostgreSQL connection string
 */}}
 {{- define "trigger-v4.postgres.connectionString" -}}
 {{- if .Values.postgres.external -}}
-postgresql://{{ .Values.postgres.externalConnection.username }}:{{ .Values.postgres.externalConnection.password }}@{{ .Values.postgres.externalConnection.host }}:{{ .Values.postgres.externalConnection.port }}/{{ .Values.postgres.externalConnection.database }}?schema=public&sslmode=disable
+postgresql://{{ .Values.postgres.externalConnection.username }}:{{ .Values.postgres.externalConnection.password }}@{{ .Values.postgres.externalConnection.host }}:{{ .Values.postgres.externalConnection.port }}/{{ .Values.postgres.externalConnection.database }}?schema={{ .Values.postgres.externalConnection.schema | default "public" }}&sslmode={{ .Values.postgres.externalConnection.sslMode | default "prefer" }}
 {{- else -}}
-postgresql://{{ .Values.postgres.auth.username }}:{{ .Values.postgres.auth.password }}@{{ include "trigger-v4.fullname" . }}-postgres:{{ .Values.postgres.primary.service.ports.postgres }}/{{ .Values.postgres.auth.database }}?schema=public&sslmode=disable
+postgresql://{{ .Values.postgres.auth.username }}:{{ .Values.postgres.auth.password }}@{{ include "trigger-v4.fullname" . }}-postgres:{{ .Values.postgres.primary.service.ports.postgres }}/{{ .Values.postgres.auth.database }}?schema={{ .Values.postgres.connection.schema | default "public" }}&sslmode={{ .Values.postgres.connection.sslMode | default "prefer" }}
 {{- end -}}
 {{- end }}
 
diff --git a/hosting/k8s/helm/values-production-example.yaml b/hosting/k8s/helm/values-production-example.yaml
index f7251c89a..fb7cee13d 100644
--- a/hosting/k8s/helm/values-production-example.yaml
+++ b/hosting/k8s/helm/values-production-example.yaml
@@ -131,6 +131,8 @@ supervisor:
 #     database: "trigger"
 #     username: "trigger_user"
 #     password: "your-db-password"
+#     schema: "public"
+#     sslMode: "require"  # Use 'require' or 'verify-full' for production
 
 # Example: Use external Redis instead
 # redis:
diff --git a/hosting/k8s/helm/values.yaml b/hosting/k8s/helm/values.yaml
index 8a62c4b7d..61fd2c5f4 100644
--- a/hosting/k8s/helm/values.yaml
+++ b/hosting/k8s/helm/values.yaml
@@ -269,6 +269,9 @@ postgres:
     username: "postgres"
     password: "postgres"
     database: "main"
+  connection:
+    schema: "public"
+    sslMode: "disable" # Use "require" or "verify-full" for production
 
   podAnnotations: {}
 
@@ -296,6 +299,9 @@ postgres:
     database: ""
     username: ""
     password: ""
+    # Connection options
+    schema: "public"
+    sslMode: "require" # Options: disable, allow, prefer, require, verify-ca, verify-full
   # Extra environment variables for PostgreSQL
   extraEnv:
     []