Skip to content

Commit 371ccbf

Browse files
committed
Review fixes
1 parent 434bd55 commit 371ccbf

File tree

1 file changed

+3
-13
lines changed
  • docker/mongodb-kubernetes-tests/kubetester

1 file changed

+3
-13
lines changed

docker/mongodb-kubernetes-tests/kubetester/mongodb.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,26 +266,16 @@ def configure_ops_manager(
266266
def configure_cloud_qa(
267267
self,
268268
project_name,
269-
src_project_config_map_name: str = None,
270269
api_client: Optional[client.ApiClient] = None,
271270
) -> MongoDB:
272271
if "opsManager" in self["spec"]:
273272
del self["spec"]["opsManager"]
274273

275-
if src_project_config_map_name is None and "cloudManager" in self["spec"]:
274+
src_project_config_map_name = "my-project"
275+
if "cloudManager" in self["spec"]:
276276
src_project_config_map_name = self["spec"]["cloudManager"]["configMapRef"]["name"]
277-
else:
278-
# my-project cm and my-credentials secret are created by scripts/evergreen/e2e/configure_operator.sh
279-
src_project_config_map_name = "my-project"
280277

281-
try:
282-
src_cm = read_configmap(self.namespace, src_project_config_map_name, api_client=api_client)
283-
except client.ApiException as e:
284-
if e.status == 404:
285-
logger.debug("project config map is not specified, trying my-project as the source")
286-
src_cm = read_configmap(self.namespace, "my-project", api_client=api_client)
287-
else:
288-
raise e
278+
src_cm = read_configmap(self.namespace, src_project_config_map_name, api_client=api_client)
289279

290280
new_project_config_map_name = f"{self.name}-project-config"
291281
ensure_nested_objects(self, ["spec", "cloudManager", "configMapRef"])

0 commit comments

Comments
 (0)