From 211a420f096374dbe452c3543a1ad1ea28417add Mon Sep 17 00:00:00 2001 From: Kochetkov S Date: Mon, 20 Jul 2026 17:19:07 +0300 Subject: [PATCH] ++ skip minio admin creds when SKIP_MINIO_ADMIN=true --- scripts/load_admin_creds.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/load_admin_creds.sh b/scripts/load_admin_creds.sh index 49a4ee6..743b37f 100755 --- a/scripts/load_admin_creds.sh +++ b/scripts/load_admin_creds.sh @@ -31,9 +31,13 @@ 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}" -export MINIO_ENDPOINT="${MINIO_ENDPOINT:-minio.minio.svc.cluster.local:9000}" -export MINIO_ADMIN_USER="$(_kv minio/admin rootUser)" -export MINIO_ADMIN_PASSWORD="$(_kv minio/admin rootPassword)" +# 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)" + export MINIO_ADMIN_PASSWORD="$(_kv minio/admin rootPassword)" +fi export RABBITMQ_ENDPOINT="${RABBITMQ_ENDPOINT:-http://rabbitmq.rabbitmq.svc.cluster.local:15672}" export RABBITMQ_ADMIN_USER="$(_kv rabbitmq/auth username)" @@ -41,7 +45,9 @@ export RABBITMQ_ADMIN_PASSWORD="$(_kv rabbitmq/auth password)" # fail fast with the exact empties instead of leaving providers to give cryptic errors _missing="" -for _v in PG_ADMIN_PASSWORD KAFKA_ADMIN_PASSWORD MINIO_ADMIN_USER MINIO_ADMIN_PASSWORD RABBITMQ_ADMIN_USER RABBITMQ_ADMIN_PASSWORD; do +_required="PG_ADMIN_PASSWORD KAFKA_ADMIN_PASSWORD RABBITMQ_ADMIN_USER RABBITMQ_ADMIN_PASSWORD" +[ "${SKIP_MINIO_ADMIN:-false}" != "true" ] && _required="$_required MINIO_ADMIN_USER MINIO_ADMIN_PASSWORD" +for _v in $_required; do eval "_val=\${$_v}" [ -n "$_val" ] || _missing="$_missing $_v" done