Skip to content

Commit 4de9437

Browse files
authored
CLOUDP-394228: Fix public e2e env_variables for managed LB search snippets (#962)
## Summary - The `env_variables_e2e_public.sh` files for managed LB search snippet directories (07, 09, 10, 11) were missing the Ops Manager credential mappings (`OM_*` → `OPS_MANAGER_*`), causing the `om-project` configmap to be created with placeholder values like `<SET API URL>` instead of actual Cloud QA credentials - This caused all 4 `public_kind_code_snippets` tasks to fail with `unsupported protocol scheme ""` when the operator tried to connect to Ops Manager - For external variants (07, 10), extracted shared e2e variables (external cluster topology, connection strings, Ops Manager overrides) into `env_variables_e2e_common.sh` sourced by both public and private env files ## Test plan - [x] Evergreen patch: https://evergreen.mongodb.com/version/69ce79039a74900007939618 - `test_kind_search_external_sharded_managed_lb_snippets.sh` - `test_kind_search_sharded_managed_lb_snippets.sh` - `test_kind_search_external_rs_managed_lb_snippets.sh` - `test_kind_search_rs_managed_lb_snippets.sh`
1 parent bc48cd8 commit 4de9437

File tree

8 files changed

+65
-38
lines changed

8 files changed

+65
-38
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# E2E Test Environment - Common Configuration
2+
#
3+
# Shared variables for both public and private E2E testing.
4+
# Sourced by env_variables_e2e_public.sh and env_variables_e2e_private.sh.
5+
6+
# Simulated external cluster
7+
export MDB_EXTERNAL_CLUSTER_NAME="ext-mdb-sh"
8+
export MDB_EXTERNAL_DOMAIN="ext-mdb.example.com"
9+
export MDB_TLS_CA_CONFIGMAP="${MDB_EXTERNAL_CLUSTER_NAME}-ca"
10+
export MDB_EXTERNAL_SHARD_0_NAME="ext-mdb-sh-0"
11+
export MDB_EXTERNAL_SHARD_0_HOST="${MDB_EXTERNAL_CLUSTER_NAME}-0-0.${MDB_EXTERNAL_DOMAIN}:27017"
12+
export MDB_EXTERNAL_SHARD_1_NAME="ext-mdb-sh-1"
13+
export MDB_EXTERNAL_SHARD_1_HOST="${MDB_EXTERNAL_CLUSTER_NAME}-1-0.${MDB_EXTERNAL_DOMAIN}:27017"
14+
export MDB_EXTERNAL_MONGOS_HOST="${MDB_EXTERNAL_CLUSTER_NAME}-mongos-0.${MDB_EXTERNAL_DOMAIN}:27017"
15+
16+
# Derived values
17+
SEARCH_PFX="${MDB_SEARCH_RESOURCE_NAME}-search-0"
18+
export MDB_PROXY_SVC_SHARD_0="${SEARCH_PFX}-${MDB_EXTERNAL_SHARD_0_NAME}-proxy-svc"
19+
export MDB_PROXY_SVC_SHARD_1="${SEARCH_PFX}-${MDB_EXTERNAL_SHARD_1_NAME}-proxy-svc"
20+
SVC_SUFFIX="${MDB_NS}.svc.cluster.local:27028"
21+
export MDB_PROXY_HOST_SHARD_0="${MDB_PROXY_SVC_SHARD_0}.${SVC_SUFFIX}"
22+
export MDB_PROXY_HOST_SHARD_1="${MDB_PROXY_SVC_SHARD_1}.${SVC_SUFFIX}"
23+
24+
# Connection strings
25+
MDB_TLS_OPTS="tls=true&tlsCAFile=/tls/ca-pem"
26+
MDB_AUTH_OPTS="authSource=admin&authMechanism=SCRAM-SHA-256"
27+
MDB_CONN_OPTS="?${MDB_TLS_OPTS}&${MDB_AUTH_OPTS}"
28+
export MDB_ADMIN_CONNECTION_STRING="mongodb://mdb-admin:${MDB_ADMIN_USER_PASSWORD}@${MDB_EXTERNAL_MONGOS_HOST}/${MDB_CONN_OPTS}"
29+
export MDB_USER_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_EXTERNAL_MONGOS_HOST}/${MDB_CONN_OPTS}"
30+
31+
# Ops Manager
32+
export OPS_MANAGER_PROJECT_NAME="${NAMESPACE}-${MDB_EXTERNAL_CLUSTER_NAME}"
33+
export OPS_MANAGER_API_URL="${OM_BASE_URL}"
34+
export OPS_MANAGER_API_USER="${OM_USER}"
35+
export OPS_MANAGER_API_KEY="${OM_API_KEY}"
36+
export OPS_MANAGER_ORG_ID="${OM_ORGID}"

docs/search/07-search-external-sharded-mongod-managed-lb/env_variables_e2e_private.sh

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,4 @@ OPERATOR_ADDITIONAL_HELM_VALUES="$(get_operator_helm_values | tr ' ' ',')"
1414
export OPERATOR_ADDITIONAL_HELM_VALUES
1515
export OPERATOR_HELM_CHART="${PROJECT_DIR}/helm_chart"
1616

17-
# Simulated external cluster
18-
export MDB_EXTERNAL_CLUSTER_NAME="ext-mdb-sh"
19-
export MDB_EXTERNAL_DOMAIN="ext-mdb.example.com"
20-
export MDB_TLS_CA_CONFIGMAP="${MDB_EXTERNAL_CLUSTER_NAME}-ca"
21-
export MDB_EXTERNAL_SHARD_0_NAME="ext-mdb-sh-0"
22-
export MDB_EXTERNAL_SHARD_0_HOST="${MDB_EXTERNAL_CLUSTER_NAME}-0-0.${MDB_EXTERNAL_DOMAIN}:27017"
23-
export MDB_EXTERNAL_SHARD_1_NAME="ext-mdb-sh-1"
24-
export MDB_EXTERNAL_SHARD_1_HOST="${MDB_EXTERNAL_CLUSTER_NAME}-1-0.${MDB_EXTERNAL_DOMAIN}:27017"
25-
export MDB_EXTERNAL_MONGOS_HOST="${MDB_EXTERNAL_CLUSTER_NAME}-mongos-0.${MDB_EXTERNAL_DOMAIN}:27017"
26-
27-
# Derived values
28-
SEARCH_PFX="${MDB_SEARCH_RESOURCE_NAME}-search-0"
29-
export MDB_PROXY_SVC_SHARD_0="${SEARCH_PFX}-${MDB_EXTERNAL_SHARD_0_NAME}-proxy-svc"
30-
export MDB_PROXY_SVC_SHARD_1="${SEARCH_PFX}-${MDB_EXTERNAL_SHARD_1_NAME}-proxy-svc"
31-
SVC_SUFFIX="${MDB_NS}.svc.cluster.local:27028"
32-
export MDB_PROXY_HOST_SHARD_0="${MDB_PROXY_SVC_SHARD_0}.${SVC_SUFFIX}"
33-
export MDB_PROXY_HOST_SHARD_1="${MDB_PROXY_SVC_SHARD_1}.${SVC_SUFFIX}"
34-
35-
# Connection strings
36-
MDB_TLS_OPTS="tls=true&tlsCAFile=/tls/ca-pem"
37-
MDB_AUTH_OPTS="authSource=admin&authMechanism=SCRAM-SHA-256"
38-
MDB_CONN_OPTS="?${MDB_TLS_OPTS}&${MDB_AUTH_OPTS}"
39-
export MDB_ADMIN_CONNECTION_STRING="mongodb://mdb-admin:${MDB_ADMIN_USER_PASSWORD}@${MDB_EXTERNAL_MONGOS_HOST}/${MDB_CONN_OPTS}"
40-
export MDB_USER_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_EXTERNAL_MONGOS_HOST}/${MDB_CONN_OPTS}"
41-
42-
# Ops Manager
43-
export OPS_MANAGER_PROJECT_NAME="${NAMESPACE}-${MDB_EXTERNAL_CLUSTER_NAME}"
44-
export OPS_MANAGER_API_URL="${OM_BASE_URL}"
45-
export OPS_MANAGER_API_USER="${OM_USER}"
46-
export OPS_MANAGER_API_KEY="${OM_API_KEY}"
47-
export OPS_MANAGER_ORG_ID="${OM_ORGID}"
17+
source "$(dirname "${BASH_SOURCE[0]}")/env_variables_e2e_common.sh"

docs/search/07-search-external-sharded-mongod-managed-lb/env_variables_e2e_public.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
source "$(dirname "${BASH_SOURCE[0]}")/env_variables.sh"
77

88
export K8S_CTX="kind-kind"
9+
10+
source "$(dirname "${BASH_SOURCE[0]}")/env_variables_e2e_common.sh"

docs/search/09-search-sharded-mongod-managed-lb/env_variables_e2e_public.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@
66
source "$(dirname "${BASH_SOURCE[0]}")/env_variables.sh"
77

88
export K8S_CTX="kind-kind"
9+
10+
export OPS_MANAGER_PROJECT_NAME="${NAMESPACE}-${MDB_RESOURCE_NAME}"
11+
export OPS_MANAGER_API_URL="${OM_BASE_URL}"
12+
export OPS_MANAGER_API_USER="${OM_USER}"
13+
export OPS_MANAGER_API_KEY="${OM_API_KEY}"
14+
export OPS_MANAGER_ORG_ID="${OM_ORGID}"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# E2E Test Environment - Common Configuration
2+
#
3+
# Shared variables for both public and private E2E testing.
4+
# Sourced by env_variables_e2e_public.sh and env_variables_e2e_private.sh.
5+
6+
# Ops Manager
7+
export OPS_MANAGER_PROJECT_NAME="${NAMESPACE}-${MDB_EXTERNAL_CLUSTER_NAME}"
8+
export OPS_MANAGER_API_URL="${OM_BASE_URL}"
9+
export OPS_MANAGER_API_USER="${OM_USER}"
10+
export OPS_MANAGER_API_KEY="${OM_API_KEY}"
11+
export OPS_MANAGER_ORG_ID="${OM_ORGID}"

docs/search/10-search-external-rs-mongod-managed-lb/env_variables_e2e_private.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,4 @@ OPERATOR_ADDITIONAL_HELM_VALUES="$(get_operator_helm_values | tr ' ' ',')"
1414
export OPERATOR_ADDITIONAL_HELM_VALUES
1515
export OPERATOR_HELM_CHART="${PROJECT_DIR}/helm_chart"
1616

17-
# we need project name with a timestamp (NAMESPACE in evg is randomized) to allow for cloud-qa cleanups
18-
# NOTE: This snippet uses MDB_EXTERNAL_CLUSTER_NAME instead of MDB_RESOURCE_NAME
19-
export OPS_MANAGER_PROJECT_NAME="${NAMESPACE}-${MDB_EXTERNAL_CLUSTER_NAME}"
20-
export OPS_MANAGER_API_URL="${OM_BASE_URL}"
21-
export OPS_MANAGER_API_USER="${OM_USER}"
22-
export OPS_MANAGER_API_KEY="${OM_API_KEY}"
23-
export OPS_MANAGER_ORG_ID="${OM_ORGID}"
17+
source "$(dirname "${BASH_SOURCE[0]}")/env_variables_e2e_common.sh"

docs/search/10-search-external-rs-mongod-managed-lb/env_variables_e2e_public.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
source "$(dirname "${BASH_SOURCE[0]}")/env_variables.sh"
77

88
export K8S_CTX="kind-kind"
9+
10+
source "$(dirname "${BASH_SOURCE[0]}")/env_variables_e2e_common.sh"

docs/search/11-search-rs-mongod-managed-lb/env_variables_e2e_public.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@
66
source "$(dirname "${BASH_SOURCE[0]}")/env_variables.sh"
77

88
export K8S_CTX="kind-kind"
9+
10+
export OPS_MANAGER_PROJECT_NAME="${NAMESPACE}-${MDB_RESOURCE_NAME}"
11+
export OPS_MANAGER_API_URL="${OM_BASE_URL}"
12+
export OPS_MANAGER_API_USER="${OM_USER}"
13+
export OPS_MANAGER_API_KEY="${OM_API_KEY}"
14+
export OPS_MANAGER_ORG_ID="${OM_ORGID}"

0 commit comments

Comments
 (0)