Refactored mongodb_custom_roles to leverage multi-project configure

Author: lsierant

api/v1/mdbmulti/mongodb_multi_types.go

@@ -65,7 +65,7 @@ func (m *MongoDBMultiCluster) GetCredentialsSecretNamespace() string {
 }
 
 func (m *MongoDBMultiCluster) GetProjectConfigMapName() string {
-	return m.Spec.OpsManagerConfig.ConfigMapRef.Name
+	return m.Spec.GetProject()
 }
 
 func (m *MongoDBMultiCluster) GetCredentialsSecretName() string {

docker/mongodb-kubernetes-tests/tests/authentication/mongodb_custom_roles.py

@@ -1,69 +1,18 @@
 from kubetester import (
-    create_or_update_configmap,
     find_fixture,
     random_k8s_name,
-    read_configmap,
     try_load,
     wait_until,
 )
 from kubetester.mongodb import MongoDB, Phase
 from kubetester.mongodb_multi import MongoDBMulti
 from kubetester.mongodb_role import ClusterMongoDBRole, ClusterMongoDBRoleKind
+from kubetester.test_identifiers import set_test_identifier
 from pytest import fixture, mark
 from tests.multicluster.conftest import cluster_spec_list
 
 
-@fixture(scope="module")
-def project_name_prefix(namespace: str) -> str:
-    return random_k8s_name(f"{namespace}-project-")
-
-
-@fixture(scope="module")
-def first_project(namespace: str, project_name_prefix: str) -> str:
-    cm = read_configmap(namespace=namespace, name="my-project")
-    project_name = f"{project_name_prefix}-first"
-    return create_or_update_configmap(
-        namespace=namespace,
-        name=project_name,
-        data={
-            "baseUrl": cm["baseUrl"],
-            "projectName": project_name,
-            "orgId": cm["orgId"],
-        },
-    )
-
-
-@fixture(scope="module")
-def second_project(namespace: str, project_name_prefix: str) -> str:
-    cm = read_configmap(namespace=namespace, name="my-project")
-    project_name = f"{project_name_prefix}-second"
-    return create_or_update_configmap(
-        namespace=namespace,
-        name=project_name,
-        data={
-            "baseUrl": cm["baseUrl"],
-            "projectName": project_name,
-            "orgId": cm["orgId"],
-        },
-    )
-
-
-@fixture(scope="module")
-def third_project(namespace: str, project_name_prefix: str) -> str:
-    cm = read_configmap(namespace=namespace, name="my-project")
-    project_name = f"{project_name_prefix}-third"
-    return create_or_update_configmap(
-        namespace=namespace,
-        name=project_name,
-        data={
-            "baseUrl": cm["baseUrl"],
-            "projectName": project_name,
-            "orgId": cm["orgId"],
-        },
-    )
-
-
-@fixture(scope="module")
+@fixture(scope="function")
 def mongodb_role():
     resource = ClusterMongoDBRole.from_yaml(find_fixture("cluster-mongodb-role.yaml"), cluster_scoped=True)
 
@@ -73,9 +22,10 @@ def mongodb_role():
     return resource.update()
 
 
-@fixture(scope="module")
-def replica_set(namespace: str, mongodb_role: ClusterMongoDBRole, first_project: str) -> MongoDB:
+@fixture(scope="function")
+def replica_set(namespace: str, mongodb_role: ClusterMongoDBRole) -> MongoDB:
     resource = MongoDB.from_yaml(find_fixture("replica-set-scram.yaml"), namespace=namespace)
+    resource.configure(None, f"{resource.name}-first")
 
     if try_load(resource):
         return resource
@@ -87,14 +37,14 @@ def replica_set(namespace: str, mongodb_role: ClusterMongoDBRole, first_project:
             "kind": ClusterMongoDBRoleKind,
         }
     ]
-    resource["spec"]["opsManager"]["configMapRef"]["name"] = first_project
 
     return resource
 
 
-@fixture(scope="module")
-def sharded_cluster(namespace: str, mongodb_role: ClusterMongoDBRole, second_project: str) -> MongoDB:
+@fixture(scope="function")
+def sharded_cluster(namespace: str, mongodb_role: ClusterMongoDBRole) -> MongoDB:
     resource = MongoDB.from_yaml(find_fixture("sharded-cluster-scram-sha-1.yaml"), namespace=namespace)
+    resource.configure(None, f"{resource.name}-second")
 
     if try_load(resource):
         return resource
@@ -109,14 +59,14 @@ def sharded_cluster(namespace: str, mongodb_role: ClusterMongoDBRole, second_pro
             "kind": ClusterMongoDBRoleKind,
         }
     ]
-    resource["spec"]["opsManager"]["configMapRef"]["name"] = second_project
 
     return resource
 
 
-@fixture(scope="module")
-def mc_replica_set(namespace: str, mongodb_role: ClusterMongoDBRole, third_project: str) -> MongoDBMulti:
+@fixture(scope="function")
+def mc_replica_set(namespace: str, mongodb_role: ClusterMongoDBRole) -> MongoDBMulti:
     resource = MongoDBMulti.from_yaml(find_fixture("mongodb-multi.yaml"), namespace=namespace)
+    resource.configure(None, f"{resource.name}-third")
 
     if try_load(resource):
         return resource
@@ -129,7 +79,6 @@ def mc_replica_set(namespace: str, mongodb_role: ClusterMongoDBRole, third_proje
             }
         ]
     }
-    resource["spec"]["opsManager"]["configMapRef"]["name"] = third_project
     resource["spec"]["clusterSpecList"] = cluster_spec_list(["kind-e2e-cluster-1"], [1])
 
     return resource

docker/mongodb-kubernetes-tests/tests/common/ops_manager/cloud_manager.py

@@ -0,0 +1,5 @@
+import os
+
+
+def is_cloud_qa() -> bool:
+    return os.getenv("ops_manager_version", "cloud_qa") == "cloud_qa"

scripts/dev/contexts/root-context

@@ -62,6 +62,7 @@ export INIT_OPS_MANAGER_VERSION="${VERSION_ID}"
 export DATABASE_VERSION="${VERSION_ID}"
 
 export KUBE_ENVIRONMENT_NAME=kind
+export CLUSTER_TYPE=kind
 
 # when using EVG ec2 instance, we copy kubeconfig locally and use it
 if [[ "${EVG_HOST_NAME:-}" != "" ]]; then

scripts/funcs/multicluster

@@ -277,7 +277,7 @@ run_multi_cluster_kube_config_creator() {
     params+=("--install-database-roles")
   fi
 
-  if [[ "${OPERATOR_CLUSTER_SCOPED}" == "true" ]]; then
+  if [[ "${OPERATOR_CLUSTER_SCOPED:-"false"}" == "true" ]]; then
     params+=("--cluster-scoped")
   fi
   if [[ "${MULTI_CLUSTER_CREATE_SERVICE_ACCOUNT_TOKEN_SECRETS}" == "true" ]]; then