Skip to content

Commit f763e34

Browse files
committed
Review fixes
1 parent 8d3f0b3 commit f763e34

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
@@ -261,26 +261,16 @@ def configure_ops_manager(
261261
def configure_cloud_qa(
262262
self,
263263
project_name,
264-
src_project_config_map_name: str = None,
265264
api_client: Optional[client.ApiClient] = None,
266265
) -> MongoDB:
267266
if "opsManager" in self["spec"]:
268267
del self["spec"]["opsManager"]
269268

270-
if src_project_config_map_name is None and "cloudManager" in self["spec"]:
269+
src_project_config_map_name = "my-project"
270+
if "cloudManager" in self["spec"]:
271271
src_project_config_map_name = self["spec"]["cloudManager"]["configMapRef"]["name"]
272-
else:
273-
# my-project cm and my-credentials secret are created by scripts/evergreen/e2e/configure_operator.sh
274-
src_project_config_map_name = "my-project"
275272

276-
try:
277-
src_cm = read_configmap(self.namespace, src_project_config_map_name, api_client=api_client)
278-
except client.ApiException as e:
279-
if e.status == 404:
280-
logger.debug("project config map is not specified, trying my-project as the source")
281-
src_cm = read_configmap(self.namespace, "my-project", api_client=api_client)
282-
else:
283-
raise e
273+
src_cm = read_configmap(self.namespace, src_project_config_map_name, api_client=api_client)
284274

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

0 commit comments

Comments
 (0)