From 3d2f04d67218c87d175c9f210627d87ca8f7bf29 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Thu, 8 Jan 2026 03:15:25 -0300 Subject: [PATCH] comms: fix mas db psql exec --- services/comms/mas-db-ensure-job.yaml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/services/comms/mas-db-ensure-job.yaml b/services/comms/mas-db-ensure-job.yaml index 6a31080..f5f95f7 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-10 + name: mas-db-ensure-11 namespace: comms spec: backoffLimit: 1 @@ -36,21 +36,6 @@ 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}" <<'SQL' - 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 - $$; - DO $$ - BEGIN - IF NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = 'mas') THEN - CREATE DATABASE mas OWNER mas; - END IF; - END - $$; - SQL + 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 \\$\\$;"