From 52278d72fdb2f48bc8776bf33a483a264a6a4f68 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Tue, 5 Dec 2023 16:11:14 +0800
Subject: [PATCH] fix(joplin): pg env vars

---
 kube/deploy/apps/joplin/app/hr.yaml | 41 ++++++++++++++++-------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/kube/deploy/apps/joplin/app/hr.yaml b/kube/deploy/apps/joplin/app/hr.yaml
index 6d50df59..beee002d 100644
--- a/kube/deploy/apps/joplin/app/hr.yaml
+++ b/kube/deploy/apps/joplin/app/hr.yaml
@@ -36,27 +36,32 @@ spec:
       APP_PORT: "22300"
       APP_BASE_URL: "https://${APP_DNS_JOPLIN}"
       DB_CLIENT: "pg"
-      POSTGRES_PORT: "5432"
-      POSTGRES_HOST:
+      POSTGRES_CONNECTION_STRING:
         valueFrom:
           secretKeyRef:
             name: &pgsec "pg-joplin-pguser-joplin"
-            key: "pgbouncer-host"
-      POSTGRES_DATABASE:
-        valueFrom:
-          secretKeyRef:
-            name: *pgsec
-            key: "dbname"
-      POSTGRES_USER:
-        valueFrom:
-          secretKeyRef:
-            name: *pgsec
-            key: "user"
-      POSTGRES_PASSWORD:
-        valueFrom:
-          secretKeyRef:
-            name: *pgsec
-            key: "password"
+            key: "pgbouncer-uri"
+      # POSTGRES_PORT: "5432"
+      # POSTGRES_HOST:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       name: &pgsec "pg-joplin-pguser-joplin"
+      #       key: "pgbouncer-host"
+      # POSTGRES_DATABASE:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       name: *pgsec
+      #       key: "dbname"
+      # POSTGRES_USER:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       name: *pgsec
+      #       key: "user"
+      # POSTGRES_PASSWORD:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       name: *pgsec
+      #       key: "password"
       TERMS_ENABLED: "false"
       COOKIES_SECURE: "false"
       ERROR_STACK_TRACES: "false"