Skip to content

Commit 450e375

Browse files
committed
fix test
1 parent bc3e186 commit 450e375

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_reconcile_races.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,20 @@ def ops_manager(
5151

5252

5353
@pytest.fixture(scope="module")
54-
def om_external_base_url(
54+
def om_external_base_domain(
5555
ops_manager: MongoDBOpsManager,
5656
) -> str:
57+
interconnected_domain = f"om.{ops_manager.namespace}.interconnected"
58+
return interconnected_domain
59+
60+
61+
@pytest.fixture(scope="module")
62+
def om_external_base_url(ops_manager: MongoDBOpsManager, om_external_base_domain: str) -> str:
5763
"""
5864
The base_url makes OM accessible from member clusters via a special interconnected dns address.
5965
This address only works for member clusters.
6066
"""
61-
interconnected_field = f"https://om-backup.{ops_manager.namespace}.interconnected"
62-
new_address = f"{interconnected_field}:8443"
63-
64-
return new_address
67+
return f"http://{om_external_base_domain}:8080"
6568

6669

6770
@pytest.fixture(scope="module")
@@ -195,6 +198,7 @@ def test_setup_om_external_connectivity(
195198
central_cluster_client: kubernetes.client.ApiClient,
196199
member_cluster_clients: List[MultiClusterClient],
197200
om_external_base_url: str,
201+
om_external_base_domain: str,
198202
):
199203
"""
200204
Set up external connectivity for Ops Manager so that MongoDBMulti pods
@@ -208,20 +212,17 @@ def test_setup_om_external_connectivity(
208212
# Get the external IP from the LoadBalancer service
209213
ip = svc.status.load_balancer.ingress[0].ip
210214

211-
# Create the interconnected domain for this OM instance
212-
interconnected_domain = f"om.{ops_manager.namespace}.interconnected"
213-
214215
# Update CoreDNS in each member cluster to resolve the interconnected domain to the OM external IP
215216
for c in member_cluster_clients:
216217
update_coredns_hosts(
217-
host_mappings=[(ip, interconnected_domain)],
218+
host_mappings=[(ip, om_external_base_domain)],
218219
api_client=c.api_client,
219220
cluster_name=c.cluster_name,
220221
)
221222

222223
# Also update CoreDNS in the central cluster for consistency
223224
update_coredns_hosts(
224-
host_mappings=[(ip, interconnected_domain)],
225+
host_mappings=[(ip, om_external_base_domain)],
225226
api_client=central_cluster_client,
226227
cluster_name="central-cluster",
227228
)

0 commit comments

Comments
 (0)