add deploy_hyperconverged to main deploy function

Signed-off-by: Daniel Osypenko <[email protected]>

Author: DanielOsypenko

conf/README.md

@@ -338,7 +338,6 @@ higher priority).
 * `metallb_version` - MetalLB operator version to install
 * `deploy_acm_hub_cluster` - Deploy ACM hub cluster or not (Default: false)
 * `cnv_deployment` - Deploy CNV or not (Default: false) necessary for Converged clusters with hosted clients
-* `mce_deployment` - Deploy MCE or not (Default: false)
 * `deploy_hyperconverged` - Deploy hyperconverged operator or not (Default: false).  Necessary for Converged clusters with hosted clients with unreleased OCP version
 * `clusters` - section for hosted clusters
     * `<cluster name>` - name of the cluster

conf/examples/provider_mode_ibm_cloud_baremetal_kubevirt_clients.yaml

@@ -11,7 +11,6 @@ DEPLOYMENT:
   metallb_operator: true
   cnv_latest_stable: true
   local_storage: true
-  mce_deployment: false # use when unreleased version on Clients is needed
   deploy_hyperconverged: false # use when unreleased version on Clients is needed
 ENV_DATA:
   platform: "hci_baremetal"
@@ -21,6 +20,7 @@ ENV_DATA:
   acm_hub_channel: "release-2.10" # this is an example, please provide the desired version
   hcp_version: "4.16" # this is an example, please provide the desired version
   metallb_version: "4.16" # this is an example, please provide the desired version
+  deploy_mce: false # second option to enable multicluster setup; used instead of ACM
   clusters: # the list of the Hosted clusters and their configuration. If field does not exist HostedClsuter installation will be skipped
     hcp415-bm3-e: # the field name is the name of the Hosted cluster
       hosted_cluster_path: "~/clusters/hcp416-bm3-e/openshift-cluster-dir" # path to store auth_path dir or cluster related files

ocs_ci/deployment/deployment.py

@@ -459,11 +459,14 @@ def do_deploy_ocs(self):
     def do_deploy_mce(self):
         """
         Deploy Multicluster Engine
+        Shall run on OCP deployment phase
 
         """
-        if config.DEPLOYMENT.get("deploy_mce"):
-            mce_installer = MCEInstaller()
-            mce_installer.deploy_mce()
+        if config.ENV_DATA["skip_ocs_deployment"]:
+
+            if config.DEPLOYMENT.get("deploy_mce"):
+                mce_installer = MCEInstaller()
+                mce_installer.deploy_mce()
 
     def do_deploy_oadp(self):
         """
@@ -641,6 +644,21 @@ def do_deploy_cnv(self):
                 check_cnv_ready = True
             CNVInstaller().deploy_cnv(check_cnv_deployed, check_cnv_ready)
 
+    def do_deploy_hyperconverged(self):
+        """
+        Deploy HyperConverged Operator and resources that works instead of CNV operator.
+        Should run on OCP deployment phase
+        """
+        if config.ENV_DATA["skip_ocs_deployment"]:
+
+            if config.ENV_DATA.get(
+                "deploy_hyperconverged"
+            ) and not config.DEPLOYMENT.get("cnv_deployment"):
+                from ocs_ci.deployment.hyperconverged import HyperConverged
+
+                hyperconverged = HyperConverged()
+                hyperconverged.deploy_hyperconverged()
+
     def do_deploy_metallb(self):
         """
         Deploy MetalLB
@@ -739,6 +757,7 @@ def deploy_cluster(self, log_cli_level="DEBUG"):
         self.do_deploy_odf_provider_mode()
         self.do_deploy_mce()
         self.do_deploy_cnv()
+        self.do_deploy_hyperconverged()
         self.do_deploy_metallb()
         self.do_deploy_hosted_clusters()
 

ocs_ci/deployment/helpers/hypershift_base.py

@@ -260,9 +260,12 @@ def install_hcp_and_hypershift_from_git(self):
                 f"hypershift binary download failed to path:{self.hypershift_binary_path}"
             )
 
-    def download_hcp_binary_with_podman(self):
+    def _download_hcp_binary_with_podman(self):
         """
         Download hcp binary to bin_dir
+
+        !!! This method is not used in the code, but it is kept for reference !!!
+        Use install_hcp_and_hypershift_from_git instead
         """
         if self.hcp_binary_exists():
             logger.info(

ocs_ci/deployment/hosted_cluster.py

@@ -264,18 +264,18 @@ def deploy_hosted_ocp_clusters(self, cluster_names_list=None):
             # Put logic on checking and deploying dependencies here
             if first_ocp_deployment:
                 # ACM installation is a default for Provider/Converged deployments
-                deploy_acm_hub = config.ENV_DATA.get("deploy_acm_hub_cluster", True)
+                deploy_acm_hub = config.ENV_DATA.get("deploy_acm_hub_cluster", False)
                 # CNV installation is a default for Provider/Converged deployments
-                deploy_cnv = config.DEPLOYMENT.get("cnv_deployment", True)
-                deploy_mce = config.DEPLOYMENT.get("mce_deployment", False)
+                deploy_cnv = config.DEPLOYMENT.get("cnv_deployment", False)
+                deploy_mce = config.DEPLOYMENT.get("deploy_mce", False)
                 deploy_hyperconverged = config.ENV_DATA.get(
                     "deploy_hyperconverged", False
                 )
 
                 # Validate conflicting deployments
                 if deploy_acm_hub and deploy_mce:
                     raise UnexpectedDeploymentConfiguration(
-                        "Conflict: Both 'deploy_acm_hub_cluster' and 'mce_deployment' are enabled. Choose one."
+                        "Conflict: Both 'deploy_acm_hub_cluster' and 'deploy_mce' are enabled. Choose one."
                     )
                 if deploy_cnv and deploy_hyperconverged:
                     raise UnexpectedDeploymentConfiguration(
@@ -291,9 +291,6 @@ def deploy_hosted_ocp_clusters(self, cluster_names_list=None):
             if not config.ENV_DATA["platform"].lower() in HCI_PROVIDER_CLIENT_PLATFORMS:
                 raise ProviderModeNotFoundException()
 
-            if not config.ENV_DATA.get("deploy_acm_hub_cluster", True):
-                deploy_acm_hub = False
-
             hosted_ocp_cluster.deploy_dependencies(
                 deploy_acm_hub=deploy_acm_hub,
                 deploy_cnv=deploy_cnv,
@@ -356,7 +353,7 @@ def download_hosted_clusters_kubeconfig_files(self):
         """
 
         if not (self.hcp_binary_exists() and self.hypershift_binary_exists()):
-            self.download_hcp_binary_with_podman()
+            self.update_hcp_binary()
 
         for name in config.ENV_DATA.get("clusters").keys():
             path = config.ENV_DATA.get("clusters").get(name).get("hosted_cluster_path")
@@ -526,14 +523,21 @@ def deploy_dependencies(
                 "Both deploy_cnv and deploy_hyperconverged are set to True. "
                 "Please choose only one of them."
             )
-        if deploy_acm_hub:
+
+        if deploy_acm_hub and not deploy_mce:
             self.deploy_acm_hub()
+        elif deploy_mce and not deploy_acm_hub:
+            self.deploy_mce()
+        elif deploy_acm_hub and deploy_mce:
+            raise UnexpectedDeploymentConfiguration(
+                "Both deploy_acm_hub and deploy_mce are set to True. "
+                "Please choose only one of them."
+            )
+
         if deploy_metallb:
             self.deploy_lb()
         if download_hcp_binary:
             self.update_hcp_binary()
-        if deploy_mce and not deploy_acm_hub:
-            self.deploy_mce()
 
         # Enable central infrastructure management service for agent
         if config.DEPLOYMENT.get("hosted_cluster_platform") == "agent":

ocs_ci/deployment/hyperconverged.py

@@ -1,6 +1,7 @@
 import logging
 import semantic_version
 
+from ocs_ci.ocs.exceptions import HyperConvergedNotDeployedException
 from ocs_ci.ocs.ocp import OCP
 from ocs_ci.ocs import constants
 from ocs_ci.ocs.resources.deployment import Deployment
@@ -10,6 +11,7 @@
 from ocs_ci.ocs.version import get_ocp_version
 from ocs_ci.utility import templating
 from ocs_ci.ocs.resources.catalog_source import CatalogSource
+from ocs_ci.utility.utils import wait_custom_resource_defenition_available
 
 logger = logging.getLogger(__name__)
 
@@ -150,7 +152,7 @@ def create_hyperconverged_instance(self):
             should_exist=True, resource_name=constants.HYPERCONVERGED_NAME
         )
         # wait for pods to be up and running
-        deployments = ["virt-api", "virt-controller", "virt-exporterproxy"]
+        deployments = ["virt-operator", "virt-api", "virt-controller"]
 
         for resource_name in deployments:
             depl_ocp_obj = OCP(
@@ -172,6 +174,10 @@ def deploy_hyperconverged(self):
         HyperConverged.create_operator_group(self)
         HyperConverged.create_catalog_source(self)
         HyperConverged.create_subscription(self)
+        if not wait_custom_resource_defenition_available(constants.HYPERCONVERGED_CRD):
+            raise HyperConvergedNotDeployedException(
+                f"crd {constants.HYPERCONVERGED_CRD} is unavailable"
+            )
         HyperConverged.create_hyperconverged_instance(self)
 
 
@@ -184,13 +190,14 @@ def get_hyperconverged_corresponding_version(ocp_version: str) -> str:
     - Hyperconverged Minor = OCP Minor - 4
 
     Args:
-        ocp_version: OCP version as a string (e.g., "4.18")
+        ocp_version: OCP version as a string (e.g., "4.18" or "4.18.3")
     Returns:
         Corresponding Hyperconverged version as a string (e.g., "1.14")
     """
-    ocp_semver = semantic_version.Version(
-        ocp_version + ".0"
-    )  # Ensure valid semantic versioning
+    if not semantic_version.validate(ocp_version):
+        ocp_version += ".0"  # Ensure valid semantic versioning if patch is missing
+
+    ocp_semver = semantic_version.Version(ocp_version)
     hyperconverged_major = ocp_semver.major - 3
     hyperconverged_minor = ocp_semver.minor - 4
 
@@ -210,7 +217,12 @@ def get_ocp_corresponding_version(hyperconverged_version: str) -> str:
     Returns:
         Corresponding OCP version as a string (e.g., "4.18")
     """
-    hyperconverged_semver = semantic_version.Version(hyperconverged_version + ".0")
+    if not semantic_version.validate(hyperconverged_version):
+        hyperconverged_version += (
+            ".0"  # Ensure valid semantic versioning if patch is missing
+        )
+
+    hyperconverged_semver = semantic_version.Version(hyperconverged_version)
     ocp_major = hyperconverged_semver.major + 3
     ocp_minor = hyperconverged_semver.minor + 4
 

ocs_ci/deployment/mce.py

@@ -15,11 +15,16 @@
 from ocs_ci.utility.utils import (
     run_cmd,
     exec_cmd,
+    wait_custom_resource_defenition_available,
 )
 from ocs_ci.ocs.resources.catalog_source import CatalogSource
 from ocs_ci.ocs.resources.deployment import Deployment
 from ocs_ci.utility.utils import get_running_ocp_version
-from ocs_ci.ocs.exceptions import CommandFailed, UnavailableResourceException
+from ocs_ci.ocs.exceptions import (
+    CommandFailed,
+    UnavailableResourceException,
+    MultiClusterEngineNotDeployedException,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -235,6 +240,12 @@ def deploy_mce(self):
             qe_app_registry.catalog_source()
             self.create_mce_namespace()
             self.create_mce_subscription()
+            if not wait_custom_resource_defenition_available(
+                constants.MULTICLUSTER_ENGINE_CRD
+            ):
+                raise MultiClusterEngineNotDeployedException(
+                    f"crd {constants.MULTICLUSTER_ENGINE_CRD} is unavailable"
+                )
             self.create_multiclusterengine_operatorgroup()
 
         # check whether mce instance is created, if it is installed but mce don't pass validation we can not heal it in

ocs_ci/ocs/constants.py

@@ -249,6 +249,7 @@
 ENCRYPTIONKEYROTATIONCRONJOB = "encryptionkeyrotationcronjobs.csiaddons.openshift.io"
 ENCRYPTIONKEYROTATIONJOB = "encryptionkeyrotationjobs.csiaddons.openshift.io"
 DEFAULT_CEPH_DEVICECLASS = "defaultCephDeviceClass"
+CRD_KIND = "CustomResourceDefinition"
 
 # Provisioners
 AWS_EFS_PROVISIONER = "openshift.org/aws-efs"
@@ -532,6 +533,7 @@
 HYPERCONVERGED_YAML = os.path.join(
     TEMPLATE_DEPLOYMENT_DIR_HYPERCONVERGED, "hyperconverged.yaml"
 )
+HYPERCONVERGED_CRD = "hyperconvergeds.hco.kubevirt.io"
 
 
 # CNV deployment constants
@@ -2811,6 +2813,7 @@
 MCE_OPERATOR_GROUP_YAML = os.path.join(
     TEMPLATE_DEPLOYMENT_DIR_MCE, "mce_operatorgroup.yaml"
 )
+MULTICLUSTER_ENGINE_CRD = "multiclusterengines.multicluster.openshift.io"
 HYPERSHIFT_NAMESPACE = "hypershift"
 SUPPORTED_VERSIONS_CONFIGMAP = "supported-versions"
 IMAGE_OVERRIDE_JSON = os.path.join(TEMPLATE_DEPLOYMENT_DIR_MCE, "image-override.json")

ocs_ci/ocs/exceptions.py

@@ -687,6 +687,14 @@ class HyperConvergedHealthException(Exception):
     pass
 
 
+class HyperConvergedNotDeployedException(Exception):
+    pass
+
+
+class MultiClusterEngineNotDeployedException(Exception):
+    pass
+
+
 class OpenShiftAPIResponseException(Exception):
     def __init__(self, response):
         self.response = response

ocs_ci/utility/utils.py

@@ -5389,3 +5389,30 @@ def create_config_ini_file(params):
     log.info(f"config.ini file for cluster is located at {config_ini_file.name}")
 
     return config_ini_file.name
+
+
+def wait_custom_resource_defenition_available(crd_name, timeout=600):
+    """
+    Wait for the custom resource definition to be available
+
+    Args:
+        crd_name (str): Name of the custom resource definition
+        timeout (int): Time in seconds to wait for the CRD to be available
+    Returns:
+        bool: True if CRD is available, False otherwise
+
+    """
+    from ocs_ci.ocs.ocp import OCP
+
+    wait = 10
+    retry_num = timeout // wait
+    crd_obj = OCP(kind=constants.CRD_KIND)
+    return bool(
+        crd_obj.get(
+            resource_name=crd_name,
+            out_yaml_format=False,
+            retry=retry_num,
+            wait=wait,
+            dont_raise=True,
+        )
+    )