fix appdb spec

Author: nammn

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

@@ -69,7 +69,7 @@ def is_default_architecture_static() -> bool:
     return os.getenv("MDB_DEFAULT_ARCHITECTURE", "non-static") == "static"
 
 
-def assert_container_count(current_container_count: int, expected_counter_without_static: int):
+def assert_container_count_with_static(current_container_count: int, expected_counter_without_static: int):
     if is_default_architecture_static():
         assert current_container_count == expected_counter_without_static + 1
     else:

docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py

@@ -9,6 +9,7 @@
 from kubernetes import client
 from kubetester import try_load
 from kubetester.custom_podspec import assert_volume_mounts_are_equal
+from kubetester.kubetester import assert_container_count_with_static
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.kubetester import is_default_architecture_static
 from kubetester.opsmanager import MongoDBOpsManager
@@ -79,19 +80,26 @@ def test_backup_1_pod_becomes_ready(self, ops_manager: MongoDBOpsManager):
 
     def test_appdb_pod_template_containers(self, ops_manager: MongoDBOpsManager):
         appdb_sts = ops_manager.read_appdb_statefulset()
-        assert len(appdb_sts.spec.template.spec.containers) == 4
+        assert_container_count_with_static(len(appdb_sts.spec.template.spec.containers), 4)
 
         assert appdb_sts.spec.template.spec.service_account_name == APPDB_SA_NAME
 
-        appdb_agent_container = appdb_sts.spec.template.spec.containers[2]
-        assert appdb_agent_container.name == "mongodb-agent"
-        assert appdb_agent_container.resources.limits["cpu"] == "750m"
-        assert appdb_agent_container.resources.limits["memory"] == "850M"
-
-        assert appdb_sts.spec.template.spec.containers[0].name == "appdb-sidecar"
-        assert appdb_sts.spec.template.spec.containers[0].image == "busybox"
-        assert appdb_sts.spec.template.spec.containers[0].command == ["sleep"]
-        assert appdb_sts.spec.template.spec.containers[0].args == ["infinity"]
+        found_agent_container = False
+        found_sidecar_container = False
+        for container in appdb_sts.spec.template.spec.containers:
+            if container.name == "mongodb-agent":
+                found_agent_container = True
+                appdb_agent_container = container
+                assert appdb_agent_container.resources.limits["cpu"] == "750m"
+                assert appdb_agent_container.resources.limits["memory"] == "850M"
+            elif container.name == "appdb-sidecar":
+                found_sidecar_container = True
+                assert container.image == "busybox"
+                assert container.command == ["sleep"]
+                assert container.args == ["infinity"]
+
+        assert found_agent_container, "mongodb-agent container not found"
+        assert found_sidecar_container, "appdb-sidecar container not found"
 
     def test_appdb_persistence(self, ops_manager: MongoDBOpsManager, namespace: str):
         # appdb pod volume claim template
@@ -362,16 +370,15 @@ def test_backup_1_pod_becomes_ready(self, ops_manager: MongoDBOpsManager):
 
     def test_appdb_pod_template(self, ops_manager: MongoDBOpsManager):
         appdb_sts = ops_manager.read_appdb_statefulset()
-        assert len(appdb_sts.spec.template.spec.containers) == 4
-
-        appdb_mongod_container = appdb_sts.spec.template.spec.containers[1]
-        assert appdb_mongod_container.name == "mongod"
+        assert_container_count_with_static(len(appdb_sts.spec.template.spec.containers), 4)
 
-        appdb_agent_container = appdb_sts.spec.template.spec.containers[2]
-        assert appdb_agent_container.name == "mongodb-agent"
+        # Find each container by name instead of position
+        containers_by_name = {c.name: c for c in appdb_sts.spec.template.spec.containers}
 
-        appdb_agent_monitoring_container = appdb_sts.spec.template.spec.containers[3]
-        assert appdb_agent_monitoring_container.name == "mongodb-agent-monitoring"
+        # Check that all required containers exist
+        assert "mongod" in containers_by_name, "mongod container not found"
+        assert "mongodb-agent" in containers_by_name, "mongodb-agent container not found"
+        assert "mongodb-agent-monitoring" in containers_by_name, "mongodb-agent-monitoring container not found"
 
         assert appdb_sts.spec.template.metadata.annotations == {"annotation1": "val"}
 

docker/mongodb-kubernetes-tests/tests/vaultintegration/om_backup_vault.py

@@ -15,7 +15,7 @@
 from kubetester.awss3client import AwsS3Client, s3_endpoint
 from kubetester.certs import create_mongodb_tls_certs, create_ops_manager_tls_certs
 from kubetester.http import https_endpoint_is_reachable
-from kubetester.kubetester import KubernetesTester, assert_container_count
+from kubetester.kubetester import KubernetesTester, assert_container_count_with_static
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.kubetester import get_pods
 from kubetester.mongodb import MongoDB
@@ -452,7 +452,7 @@ def test_appdb_reached_running_and_pod_count(ops_manager: MongoDBOpsManager, nam
     # check AppDB has 4 containers(+1 because of vault-agent)
     for pod_name in get_pods(ops_manager.name + "-db-{}", 3):
         pod = client.CoreV1Api().read_namespaced_pod(pod_name, namespace)
-        assert_container_count(len(pod.spec.containers), 4)
+        assert_container_count_with_static(len(pod.spec.containers), 4)
 
 
 @mark.e2e_vault_setup_om_backup

docker/mongodb-kubernetes-tests/tests/vaultintegration/om_deployment_vault.py

@@ -12,7 +12,7 @@
     read_secret,
 )
 from kubetester.certs import create_mongodb_tls_certs, create_ops_manager_tls_certs
-from kubetester.kubetester import KubernetesTester, assert_container_count
+from kubetester.kubetester import KubernetesTester, assert_container_count_with_static
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.kubetester import get_pods, is_default_architecture_static
 from kubetester.operator import Operator
@@ -277,7 +277,7 @@ def test_appdb_reached_running_and_pod_count(ops_manager: MongoDBOpsManager, nam
     # check AppDB has 4 containers(+1 because of vault-agent)
     for pod_name in get_pods(ops_manager.name + "-db-{}", 3):
         pod = client.CoreV1Api().read_namespaced_pod(pod_name, namespace)
-        assert_container_count(len(pod.spec.containers), 4)
+        assert_container_count_with_static(len(pod.spec.containers), 4)
 
 
 @mark.e2e_vault_setup_om