From b5a232776556e9be47530cc9052ad9c5fe97a224 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Thu, 22 Aug 2024 11:59:18 -0400 Subject: [PATCH 1/3] remove reference to no-longer-used `LOADBALANCED` --- .evergreen/serverless/create-instance.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.evergreen/serverless/create-instance.sh b/.evergreen/serverless/create-instance.sh index 47e3333a..460152c3 100755 --- a/.evergreen/serverless/create-instance.sh +++ b/.evergreen/serverless/create-instance.sh @@ -52,14 +52,6 @@ for VARNAME in ${VARLIST[*]}; do [[ -z "${!VARNAME:-}" ]] && echo "ERROR: $VARNAME not set" && exit 1; done -# Historically, this script accepted LOADBALANCED=ON to opt in to testing load -# balanced serverless instances. Since all serverless instances now use a load -# balancer, prohibit opting out (i.e. defining LOADBALANCED != ON). -if [ -n "${LOADBALANCED:-}" -a "${LOADBALANCED:-}" != "ON" ]; then - echo "Cannot opt out of testing load balanced serverless instances" - exit 1 -fi - # Generate a random instance name if one was not provided. # See: https://docs.atlas.mongodb.com/reference/atlas-limits/#label-limits if [ -z "${SERVERLESS_INSTANCE_NAME:-}" ]; then From 5403e45f8d627c9f79b577711dff96cace36b6b1 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Thu, 22 Aug 2024 11:59:32 -0400 Subject: [PATCH 2/3] remove unnecessary expansions --- .evergreen/serverless/create-instance.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.evergreen/serverless/create-instance.sh b/.evergreen/serverless/create-instance.sh index 460152c3..1e959d19 100755 --- a/.evergreen/serverless/create-instance.sh +++ b/.evergreen/serverless/create-instance.sh @@ -112,17 +112,6 @@ echo "SERVERLESS_MONGODB_VERSION=$SERVERLESS_MONGODB_VERSION" cat << EOF >> $CURRENT_DIR/serverless-expansion.yml SERVERLESS_URI: "$SERVERLESS_URI" - -# Define original variables for backwards compatibility -MONGODB_URI: "$SERVERLESS_URI" -MONGODB_SRV_URI: "$SERVERLESS_URI" -SSL: "ssl" -AUTH: "auth" -TOPOLOGY: "sharded_cluster" -SERVERLESS: "serverless" -SINGLE_ATLASPROXY_SERVERLESS_URI: "$SERVERLESS_URI" -MULTI_ATLASPROXY_SERVERLESS_URI: "$SERVERLESS_URI" -SERVERLESS_MONGODB_VERSION: "$SERVERLESS_MONGODB_VERSION" EOF # Add the uri to the secrets file. From 053081d562176935c7df32dca422b589cd3ff18c Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Wed, 28 Aug 2024 13:39:25 -0400 Subject: [PATCH 3/3] remove unnecessary EOF string --- .evergreen/serverless/create-instance.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.evergreen/serverless/create-instance.sh b/.evergreen/serverless/create-instance.sh index 1e959d19..3c60cdd0 100755 --- a/.evergreen/serverless/create-instance.sh +++ b/.evergreen/serverless/create-instance.sh @@ -110,9 +110,7 @@ RESP=$(curl -sS \ SERVERLESS_MONGODB_VERSION=$($PYTHON -c "import json;d=json.loads('${RESP}');print(d['mongoDBVersion'])") echo "SERVERLESS_MONGODB_VERSION=$SERVERLESS_MONGODB_VERSION" -cat << EOF >> $CURRENT_DIR/serverless-expansion.yml -SERVERLESS_URI: "$SERVERLESS_URI" -EOF +echo "SERVERLESS_URI: \"$SERVERLESS_URI\"" >> $CURRENT_DIR/serverless-expansion.yml # Add the uri to the secrets file. if [ -f "./secrets-export.sh" ]; then