From ad2f2f8499dafc3bdcc2c99250d4a2c49d5d3f01 Mon Sep 17 00:00:00 2001 From: Abraham Egnor Date: Tue, 7 Jan 2025 10:56:00 -0500 Subject: [PATCH] DRIVERS-2882 Update k8s setup script and readme --- .evergreen/auth_oidc/k8s/README.md | 4 +++- .evergreen/auth_oidc/k8s/setup.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.evergreen/auth_oidc/k8s/README.md b/.evergreen/auth_oidc/k8s/README.md index 020a2ac6..2c8cd1f4 100644 --- a/.evergreen/auth_oidc/k8s/README.md +++ b/.evergreen/auth_oidc/k8s/README.md @@ -112,5 +112,7 @@ Where the test looks something like: export K8S_DRIVERS_TAR_FILE=/tmp/driver.tgz git archive -o $K8S_DRIVERS_TAR_FILE HEAD export K8S_TEST_CMD="OIDC_PROVIDER_NAME=k8s ./.evergreen/run-mongodb-oidc-test.sh" - bash ./.evergreen/auth_oidc/k8s/run-driver-test.sh + bash ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup-pod.sh + bash ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/run-driver-test.sh + bash ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown-pod.sh ``` diff --git a/.evergreen/auth_oidc/k8s/setup.sh b/.evergreen/auth_oidc/k8s/setup.sh index dd1bb149..306f8eb8 100755 --- a/.evergreen/auth_oidc/k8s/setup.sh +++ b/.evergreen/auth_oidc/k8s/setup.sh @@ -13,7 +13,7 @@ if [ "$1" == "local" ]; then cat <> "$SCRIPT_DIR/secrets-export.sh" export OIDC_SERVER_TYPE=local export MONGODB_URI="$URI" -export MONGODB_URI_SINGLE="$URI/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:k8s" +export MONGODB_URI_SINGLE="$URI/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:k8s&authSource=%24external" export OIDC_ADMIN_USER=bob export OIDC_ADMIN_PWD=pwd123 EOF @@ -97,7 +97,7 @@ URI=$(check_deployment) cat <> "secrets-export.sh" export OIDC_SERVER_TYPE=atlas export MONGODB_URI="$URI" -export MONGODB_URI_SINGLE="$URI/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:k8s" +export MONGODB_URI_SINGLE="$URI/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:k8s&authSource=%24external" export OIDC_ADMIN_USER=$OIDC_ATLAS_USER export OIDC_ADMIN_PWD=$OIDC_ATLAS_PASSWORD EOF