From 964c718dc8cfce3de742e9f946020be2d3765b9b Mon Sep 17 00:00:00 2001
From: Kochetkov S <kochetkov.s@sarex.io>
Date: Wed, 5 Aug 2026 12:53:53 +0300
Subject: [PATCH] ++ add SKIP_POSTGRES_ADMIN/SKIP_KAFKA_ADMIN flags, mirroring
 SKIP_MINIO_ADMIN

---
 scripts/load_admin_creds.sh | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/scripts/load_admin_creds.sh b/scripts/load_admin_creds.sh
index 743b37f..6e32a4c 100755
--- a/scripts/load_admin_creds.sh
+++ b/scripts/load_admin_creds.sh
@@ -21,18 +21,23 @@ _kv() {
   jq -r --arg k "$2" '.data.data[$k] // ""' /tmp/_kv.json
 }
 
-export PG_ADMIN_HOST="${PG_ADMIN_HOST:-postgresql.postgresql.svc.cluster.local}"
-export PG_ADMIN_PORT="${PG_ADMIN_PORT:-5432}"
-export PG_ADMIN_USER="${PG_ADMIN_USER:-postgres}"
-export PG_ADMIN_PASSWORD="$(_kv postgresql/admin postgres-password)"
+# SKIP_POSTGRES_ADMIN/SKIP_KAFKA_ADMIN/SKIP_MINIO_ADMIN=true on contours with
+# no in-cluster instance of that backend (nothing to read, nothing declared)
+# — set as a CI var on that contour's repo.
+if [ "${SKIP_POSTGRES_ADMIN:-false}" != "true" ]; then
+  export PG_ADMIN_HOST="${PG_ADMIN_HOST:-postgresql.postgresql.svc.cluster.local}"
+  export PG_ADMIN_PORT="${PG_ADMIN_PORT:-5432}"
+  export PG_ADMIN_USER="${PG_ADMIN_USER:-postgres}"
+  export PG_ADMIN_PASSWORD="$(_kv postgresql/admin postgres-password)"
+fi
 
-export KAFKA_BOOTSTRAP="${KAFKA_BOOTSTRAP:-kafka-kafka-contour-controller-0.kafka-kafka-contour-controller-headless.kafka.svc.cluster.local:9094}"
-export KAFKA_ADMIN_USER="${KAFKA_ADMIN_USER:-inter_broker_user}"
-export KAFKA_ADMIN_PASSWORD="$(_kv kafka/bootstrap interBrokerPassword)"
-export KAFKA_SASL_MECHANISM="${KAFKA_SASL_MECHANISM:-plain}"
+if [ "${SKIP_KAFKA_ADMIN:-false}" != "true" ]; then
+  export KAFKA_BOOTSTRAP="${KAFKA_BOOTSTRAP:-kafka-kafka-contour-controller-0.kafka-kafka-contour-controller-headless.kafka.svc.cluster.local:9094}"
+  export KAFKA_ADMIN_USER="${KAFKA_ADMIN_USER:-inter_broker_user}"
+  export KAFKA_ADMIN_PASSWORD="$(_kv kafka/bootstrap interBrokerPassword)"
+  export KAFKA_SASL_MECHANISM="${KAFKA_SASL_MECHANISM:-plain}"
+fi
 
-# SKIP_MINIO_ADMIN=true on contours with no in-cluster MinIO (nothing to read, no
-# buckets declared) — set as a CI var on that contour's repo.
 if [ "${SKIP_MINIO_ADMIN:-false}" != "true" ]; then
   export MINIO_ENDPOINT="${MINIO_ENDPOINT:-minio.minio.svc.cluster.local:9000}"
   export MINIO_ADMIN_USER="$(_kv minio/admin rootUser)"
@@ -45,7 +50,9 @@ export RABBITMQ_ADMIN_PASSWORD="$(_kv rabbitmq/auth password)"
 
 # fail fast with the exact empties instead of leaving providers to give cryptic errors
 _missing=""
-_required="PG_ADMIN_PASSWORD KAFKA_ADMIN_PASSWORD RABBITMQ_ADMIN_USER RABBITMQ_ADMIN_PASSWORD"
+_required="RABBITMQ_ADMIN_USER RABBITMQ_ADMIN_PASSWORD"
+[ "${SKIP_POSTGRES_ADMIN:-false}" != "true" ] && _required="$_required PG_ADMIN_PASSWORD"
+[ "${SKIP_KAFKA_ADMIN:-false}" != "true" ] && _required="$_required KAFKA_ADMIN_PASSWORD"
 [ "${SKIP_MINIO_ADMIN:-false}" != "true" ] && _required="$_required MINIO_ADMIN_USER MINIO_ADMIN_PASSWORD"
 for _v in $_required; do
   eval "_val=\${$_v}"