Merge remote-tracking branch 'origin/master' into custom-roles

Author: lucian-tosa

LICENSE-THIRD-PARTY

@@ -5,7 +5,7 @@ github.com/cenkalti/backoff/v4,v4.3.0,https://github.com/cenkalti/backoff/blob/v
 github.com/cespare/xxhash/v2,v2.3.0,https://github.com/cespare/xxhash/blob/v2.3.0/LICENSE.txt,MIT
 github.com/davecgh/go-spew/spew,v1.1.1,https://github.com/davecgh/go-spew/blob/v1.1.1/LICENSE,ISC
 github.com/emicklei/go-restful/v3,v3.11.0,https://github.com/emicklei/go-restful/blob/v3.11.0/LICENSE,MIT
-github.com/evanphx/json-patch/v5,v5.9.0,https://github.com/evanphx/json-patch/blob/v5.9.0/v5/LICENSE,BSD-3-Clause
+github.com/evanphx/json-patch/v5,v5.9.0,https://github.com/evanphx/json-patch/blob/v5.9.0/LICENSE,BSD-3-Clause
 github.com/fsnotify/fsnotify,v1.7.0,https://github.com/fsnotify/fsnotify/blob/v1.7.0/LICENSE,BSD-3-Clause
 github.com/ghodss/yaml,v1.0.0,https://github.com/ghodss/yaml/blob/v1.0.0/LICENSE,MIT
 github.com/go-jose/go-jose/v4,v4.0.5,https://github.com/go-jose/go-jose/blob/v4.0.5/LICENSE,Apache-2.0

RELEASE_NOTES.md

@@ -186,7 +186,7 @@ type Logging struct {
 // ClusterSpecOMItem defines members cluster details for Ops Manager multi-cluster deployment.
 type ClusterSpecOMItem struct {
 	// ClusterName is name of the cluster where the Ops Manager Statefulset will be scheduled.
-	// The operator is using ClusterName to find API credentials in `mongodb-enterprise-operator-member-list` config map to use for this member cluster.
+	// The operator is using ClusterName to find API credentials in `mongodb-kubernetes-operator-member-list` config map to use for this member cluster.
 	// If the credentials are not found, then the member cluster is considered unreachable and ignored in the reconcile process.
 	// +kubebuilder:validation:Required
 	ClusterName string `json:"clusterName,omitempty"`

RELEASE_NOTES_MEKO.md

@@ -1438,7 +1438,7 @@ spec:
                     clusterName:
                       description: |-
                         ClusterName is name of the cluster where the Ops Manager Statefulset will be scheduled.
-                        The operator is using ClusterName to find API credentials in `mongodb-enterprise-operator-member-list` config map to use for this member cluster.
+                        The operator is using ClusterName to find API credentials in `mongodb-kubernetes-operator-member-list` config map to use for this member cluster.
                         If the credentials are not found, then the member cluster is considered unreachable and ignored in the reconcile process.
                       type: string
                     configuration:

api/v1/om/opsmanager_types.go

@@ -70,6 +70,7 @@
 DATABASE_SA_NAME = "mongodb-kubernetes-database-pods"
 OM_SA_NAME = "mongodb-kubernetes-ops-manager"
 TELEMETRY_CONFIGMAP_NAME = LEGACY_OPERATOR_NAME + "-telemetry"
+MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP = OPERATOR_NAME + "-member-list"
 
 logger = test_logger.get_test_logger(__name__)
 
@@ -855,7 +856,28 @@ def official_operator(
         central_cluster_client,
         member_cluster_clients,
         member_cluster_names,
-        None,
+    )
+
+
+@fixture(scope="module")
+def official_meko_operator(
+    namespace: str,
+    managed_security_context: str,
+    operator_installation_config: Dict[str, str],
+    central_cluster_name: str,
+    central_cluster_client: client.ApiClient,
+    member_cluster_clients: List[MultiClusterClient],
+    member_cluster_names: List[str],
+) -> Operator:
+    return install_official_operator(
+        namespace,
+        managed_security_context,
+        operator_installation_config,
+        central_cluster_name,
+        central_cluster_client,
+        member_cluster_clients,
+        member_cluster_names,
+        operator_name=LEGACY_OPERATOR_NAME,
     )
 
 
@@ -868,6 +890,7 @@ def install_official_operator(
     member_cluster_clients: Optional[List[MultiClusterClient]],
     member_cluster_names: Optional[List[str]],
     custom_operator_version: Optional[str] = None,
+    operator_name: Optional[str] = OPERATOR_NAME,
 ) -> Operator:
     """
     Installs the Operator from the official Helm Chart.
@@ -886,8 +909,6 @@ def install_official_operator(
         "operator.mdbDefaultArchitecture": operator_installation_config["operator.mdbDefaultArchitecture"],
     }
 
-    operator_name = "mongodb-enterprise-operator"
-
     # Note, that we don't intend to install the official Operator to standalone clusters (kops/openshift) as we want to
     # avoid damaged CRDs. But we may need to install the "openshift like" environment to Kind instead of the "ubi"
     # images are used for installing the dev Operator
@@ -924,6 +945,7 @@ def install_official_operator(
                 namespace,
                 member_cluster_names,
                 service_account_name=operator_name + "-multi-cluster",
+                operator_name=operator_name,
             )
         operator_name = operator_name + "-multi-cluster"
         helm_args.update(
@@ -1202,6 +1224,7 @@ def run_kube_config_creation_tool(
     member_cluster_names: List[str],
     cluster_scoped: Optional[bool] = False,
     service_account_name: Optional[str] = "mongodb-kubernetes-operator-multi-cluster",
+    operator_name: Optional[str] = OPERATOR_NAME,
 ):
     central_cluster = _read_multi_cluster_config_value("central_cluster")
     member_clusters_str = ",".join(member_clusters)
@@ -1222,6 +1245,8 @@ def run_kube_config_creation_tool(
         central_namespace,
         "--service-account",
         service_account_name,
+        "--operator-name",
+        operator_name,
     ]
 
     if os.getenv("MULTI_CLUSTER_CREATE_SERVICE_ACCOUNT_TOKEN_SECRETS") == "true":
@@ -1278,6 +1303,7 @@ def run_multi_cluster_recovery_tool(
     member_namespace: str,
     cluster_scoped: Optional[bool] = False,
     service_account_name: Optional[str] = "mongodb-kubernetes-operator-multi-cluster",
+    operator_name: Optional[str] = OPERATOR_NAME,
 ) -> int:
     central_cluster = _read_multi_cluster_config_value("central_cluster")
     member_clusters_str = ",".join(member_clusters)
@@ -1302,6 +1328,8 @@ def run_multi_cluster_recovery_tool(
         member_clusters[0],
         "--service-account",
         service_account_name,
+        "--operator-name",
+        operator_name,
     ]
     if os.getenv("MULTI_CLUSTER_CREATE_SERVICE_ACCOUNT_TOKEN_SECRETS") == "true":
         args.append("--create-service-account-secrets")

config/crd/bases/mongodb.com_opsmanagers.yaml

@@ -22,6 +22,7 @@
 from pytest import fixture, mark
 from tests.conftest import (
     MULTI_CLUSTER_OPERATOR_NAME,
+    OPERATOR_NAME,
     _install_multi_cluster_operator,
     run_kube_config_creation_tool,
     run_multi_cluster_recovery_tool,
@@ -97,6 +98,7 @@ def install_operator(
         member_cluster_names,
         True,
         service_account_name=MULTI_CLUSTER_OPERATOR_NAME,
+        operator_name=OPERATOR_NAME,
     )
 
     return _install_multi_cluster_operator(
@@ -218,7 +220,6 @@ def test_prepare_namespace(
 def test_copy_configmap_and_secret_across_ns(
     namespace: str,
     central_cluster_client: client.ApiClient,
-    multi_cluster_operator_installation_config: Dict[str, str],
     mdba_ns: str,
     mdbb_ns: str,
 ):

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

@@ -14,7 +14,11 @@
 from kubetester.mongodb import Phase
 from kubetester.opsmanager import MongoDBOpsManager
 from pytest import fixture, mark
-from tests.conftest import create_appdb_certs, get_member_cluster_api_client
+from tests.conftest import (
+    MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP,
+    create_appdb_certs,
+    get_member_cluster_api_client,
+)
 from tests.multicluster.conftest import cluster_spec_list
 
 FAILED_MEMBER_CLUSTER_NAME = "kind-e2e-cluster-3"
@@ -121,7 +125,7 @@ def test_remove_cluster_from_operator_member_list_to_simulate_it_is_unhealthy(
 ):
     member_list_cm = read_configmap(
         namespace,
-        "mongodb-enterprise-operator-member-list",
+        MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP,
         api_client=central_cluster_client,
     )
     # this if is only for allowing re-running the test locally
@@ -132,7 +136,7 @@ def test_remove_cluster_from_operator_member_list_to_simulate_it_is_unhealthy(
     # this will trigger operators restart as it panics on changing the configmap
     update_configmap(
         namespace,
-        "mongodb-enterprise-operator-member-list",
+        MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP,
         member_list_cm,
         api_client=central_cluster_client,
     )

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

@@ -2,8 +2,7 @@
 from typing import Dict, List, Optional
 
 import kubernetes.client
-from kubernetes import client
-from kubetester import create_or_update_configmap, get_deployments, read_configmap
+from kubetester import read_configmap
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.mongodb import Phase
 from kubetester.operator import Operator
@@ -15,12 +14,10 @@
     LEGACY_MULTI_CLUSTER_OPERATOR_NAME,
     LEGACY_OPERATOR_NAME,
     MULTI_CLUSTER_OPERATOR_NAME,
-    OPERATOR_NAME,
     create_appdb_certs,
     get_central_cluster_name,
     get_custom_appdb_version,
     install_official_operator,
-    local_operator,
     log_deployments_info,
 )
 from tests.multicluster.conftest import cluster_spec_list
@@ -200,7 +197,8 @@ def test_install_legacy_state_official_operator(
             central_cluster_client,
             member_cluster_clients,
             member_cluster_names,
-            LEGACY_DEPLOYMENT_STATE_VERSION,
+            custom_operator_version=LEGACY_DEPLOYMENT_STATE_VERSION,
+            operator_name=LEGACY_OPERATOR_NAME,
         )
         operator.assert_is_running()
         # Dumping deployments in logs ensure we are using the correct operator version
@@ -317,7 +315,8 @@ def test_install_legacy_state_official_operator(
             central_cluster_client,
             member_cluster_clients,
             member_cluster_names,
-            LEGACY_DEPLOYMENT_STATE_VERSION,
+            custom_operator_version=LEGACY_DEPLOYMENT_STATE_VERSION,
+            operator_name=LEGACY_OPERATOR_NAME,
         )
         operator.assert_is_running()
         # Dumping deployments in logs ensure we are using the correct operator version

docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_disaster_recovery.py

@@ -25,7 +25,11 @@
 from kubetester.opsmanager import MongoDBOpsManager
 from pytest import fixture, mark
 from tests import test_logger
-from tests.conftest import get_central_cluster_client, get_member_cluster_api_client
+from tests.conftest import (
+    MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP,
+    get_central_cluster_client,
+    get_member_cluster_api_client,
+)
 from tests.multicluster.conftest import cluster_spec_list
 from tests.shardedcluster.conftest import (
     enable_multi_cluster_deployment,
@@ -157,7 +161,7 @@ def test_create_sharded_cluster(self, sc: MongoDB, config_version_store):
     def test_remove_cluster_from_operator_member_list_to_simulate_it_is_unhealthy(
         self, namespace, central_cluster_client: kubernetes.client.ApiClient, multi_cluster_operator: Operator
     ):
-        operator_cm_name = "mongodb-enterprise-operator-member-list"
+        operator_cm_name = MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP
         logger.debug(f"Deleting cluster {FAILED_MEMBER_CLUSTER_NAME} from configmap {operator_cm_name}")
         member_list_cm = read_configmap(
             namespace,