From 898a33d8ee99db79476db125b5601b445b6fe2eb Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Thu, 8 Jan 2026 03:18:03 -0300
Subject: [PATCH] comms: simplify mas db creation

---
 services/comms/mas-db-ensure-job.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/comms/mas-db-ensure-job.yaml b/services/comms/mas-db-ensure-job.yaml
index f5f95f7..f0237f6 100644
--- a/services/comms/mas-db-ensure-job.yaml
+++ b/services/comms/mas-db-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: mas-db-ensure-11
+  name: mas-db-ensure-12
   namespace: comms
 spec:
   backoffLimit: 1
@@ -36,6 +36,9 @@ spec:
                 exit 1
               fi
 
-              kubectl -n postgres exec -i "${POD_NAME}" -- psql -U postgres -d postgres -v ON_ERROR_STOP=1 -v mas_pass="${MAS_PASS}" \
-                -c "DO \\$\\$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_roles WHERE rolname = 'mas') THEN EXECUTE format('CREATE ROLE mas LOGIN PASSWORD %L', :'mas_pass'); ELSE EXECUTE format('ALTER ROLE mas WITH PASSWORD %L', :'mas_pass'); END IF; END \\$\\$;" \
-                -c "DO \\$\\$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = 'mas') THEN CREATE DATABASE mas OWNER mas; END IF; END \\$\\$;"
+              kubectl -n postgres exec -i "${POD_NAME}" -- psql -U postgres -d postgres -v mas_pass="${MAS_PASS}" \
+                -c "CREATE ROLE mas LOGIN PASSWORD :'mas_pass';" || true
+              kubectl -n postgres exec -i "${POD_NAME}" -- psql -U postgres -d postgres -v mas_pass="${MAS_PASS}" \
+                -c "ALTER ROLE mas WITH PASSWORD :'mas_pass';"
+              kubectl -n postgres exec -i "${POD_NAME}" -- psql -U postgres -d postgres \
+                -c "CREATE DATABASE mas OWNER mas;" || true