WIP: Create Cluster via ACM #8935

OdedViner · 2023-11-26T11:03:56Z

multicluster 2 tests/ecosystem/deployment/test_acm.py::test_acm_create --dev-mode  --skip-download-client --default-cluster-context-index 1 --cluster1 --cluster-name oviner-hub --cluster-path ~/ClusterPath --ocsci-conf /home/oviner/vSphere7-DC-CP_VC1.yaml --ocsci-conf  conf/deployment/vsphere/acm/ipi_1az_rhcos_vmfs_3m_3w_acm_hub.yaml  --cluster2  --cluster-name oviner-slave --cluster-path ~/ClusterPath --ocsci-conf /home/oviner/vSphere7-DC-CP_VC1.yaml --ocsci-conf  conf/deployment/vsphere/acm/ipi_1az_rhcos_vmfs_3m_3w_acm_slave.yam

openshift-ci · 2023-11-26T11:04:03Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: OdedViner

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

petr-balogh · 2023-12-13T11:15:34Z

tests/ecosystem/deployment/test_acm.py

+
+
+@purple_squad
+@acm_import


Suppose to be acm_install and not import.

ocs_ci/ocs/acm/acm.py

petr-balogh · 2023-12-20T09:21:08Z

ocs_ci/framework/conf/default_config.yaml

@@ -334,3 +334,18 @@ MULTICLUSTER:
  acm_cluster: False
  primary_cluster: False
  active_acm_cluster: False
+
+ACM_CONFIG:
+  ocp_image: "img4.14.3-multi-appsub"


Is there an option to use 4.15? As master is default to 4.15.
Also I would move this option to OCP version config file.

Please document all of this values and section in the config/README.md

petr-balogh · 2023-12-20T09:29:14Z

ocs_ci/framework/conf/default_config.yaml

+  memoryMB: 65536
+  diskSizeGB: 120
+  replicas: 3
+  cluster_name: "cluster-name"


Should not be defined here but rather used from ENV_DATA["cluster_name"]

petr-balogh · 2023-12-20T09:37:43Z

ocs_ci/framework/conf/default_config.yaml

+  cpus: 16
+  coresPerSocket: 2
+  memoryMB: 65536
+  diskSizeGB: 120
+  replicas: 3


This we already have in env_data section, we should not duplicate it here but rather use what we already have at's it's a per cluster configuration which will be loaded per cluster.

If you need extra different configuration for cluster being deployed via ACM I suggest to create extra config file for it which will be loaded for that specific cluster index . E.g. conf/deployment/vsphere/acm_1az_rhcos_vsan_3m_3w.yaml

You can also add flag in this config file like:

ENV_DATA: amc_deployed: true all_other_values like (worker_replicas, worker_num_cpus) # Follow same naming convention like we do in other vsphere config files: https://github.com/red-hat-storage/ocs-ci/blob/master/conf/deployment/vsphere/upi_1az_rhcos_vsan_3m_3w.yaml

Maybe you don't even need new ACM_CONFIG but you can just use ENV_DATA.
We should not put those values in default config but move to one specific mentioned above for this kind of deployment via ACM over vsphere for example.

petr-balogh · 2023-12-20T09:44:09Z

ocs_ci/ocs/acm/acm.py

@@ -41,6 +44,11 @@
 from ocs_ci.ocs.resources.ocs import OCS
 from ocs_ci.helpers.helpers import create_project

+# from ocs_ci.utility.retry import retry


petr-balogh · 2023-12-20T09:52:04Z

ocs_ci/ocs/acm/acm.py

+        with open(constants.VSPHERE_CA_FILE_PATH, "r") as fp:
+            self.vsphere_ca = fp.read()
+
+        with open("/home/oviner/OCS-AP/ocs-ci/data/pull-secret", "r") as fp:


Don't forgot to read it from the framework constants/ defaults or config or where we have it defined.

ocs_ci/ocs/acm/acm.py

petr-balogh · 2023-12-20T09:58:03Z

ocs_ci/ocs/acm/acm.py

+        logging.info(f"Tmp file name: {manifest.name}")
+        templating.dump_data_to_temp_yaml(data, manifest.name)
+        self.file_paths.append(manifest.name)
+        # run_cmd(f"oc apply -f {manifest.name}")


I would store those manifests file under cluster_path/manifests/manifest-tmpX.yaml e.g. .

@dahorak how to get access to the relevant path?

petr-balogh · 2023-12-20T09:59:01Z

ocs_ci/ocs/acm/acm.py

+        ] = f"{self.cluster_name}-ssh-private-key"
+        cluster_deployment["spec"]["provisioning"]["imageSetRef"][
+            "name"
+        ] = "img4.14.3-multi-appsub"


From config value

petr-balogh · 2023-12-20T10:38:33Z

ocs_ci/ocs/acm/acm.py

+        ocp_obj = OCP(kind=constants.ACM_MANAGEDCLUSTER)
+        ocp_obj.wait_for_resource(
+            timeout=10,
+            condition="True",
+            column="AVAILABLE",
+            resource_name=self.cluster_name,
+        )
+        ocp_obj.wait_for_resource(
+            timeout=10,
+            condition="True",
+            column="JOINED",
+            resource_name=self.cluster_name,
+        )


I suggest you to use the context manage (in python using with block) to make sure the context for this block of the code is running on the ACM hub.

In this context manager you need to do:

Sore current config context - as you will need to return back to original config context after you finish this block of code

Switch to ACM hub config object

Do operations defined within with block

Switch config context back to original stale - even though the code in the block will fail.

Suggested change

ocp_obj = OCP(kind=constants.ACM_MANAGEDCLUSTER)

ocp_obj.wait_for_resource(

timeout=10,

condition="True",

column="AVAILABLE",

resource_name=self.cluster_name,

)

ocp_obj.wait_for_resource(

timeout=10,

condition="True",

column="JOINED",

resource_name=self.cluster_name,

)

with acmHubContext():

ocp_obj = OCP(kind=constants.ACM_MANAGEDCLUSTER)

ocp_obj.wait_for_resource(

timeout=10,

condition="True",

column="AVAILABLE",

resource_name=self.cluster_name,

)

ocp_obj.wait_for_resource(

timeout=10,

condition="True",

column="JOINED",

resource_name=self.cluster_name,

)

Define context manager, see doc here: https://book.pythontips.com/en/latest/context_managers.html#implementing-a-context-manager-as-a-class

The same you will use the same in create cluster via acm as you need to run also from acm context.

I think we can have generic context manager like:

class RunWithConfigContext(object): def __init__(self, config_index): self.original_config_index = config.current_index self.config_index = config_index def __enter__(self): config.switch_context(self.config_index) def __exit__(self, type, value, traceback): config.switch_context(self.original_config_index)

than you can have the specific one which will reuse the above but will make sure it will find the acm_hub_config_index for you.

class RunWithAcmConfigContext(RunWithConfigContext): def __init__(self): config_index = findAcmContext() # you will need to make sure here to automatically get the index for acm hub cluster super(RunWithAcmConfigContext, self).__init__(config_index)

I created one class RunWithConfigContext

class RunWithConfigContext(object): def __init__(self): self.original_config_index = config.cur_index self.acm_index = get_all_acm_indexes()[0] def __enter__(self): config.switch_ctx(self.acm_index) return self def __exit__(self, exc_type, exc_value, exc_traceback): config.switch_ctx(self.original_config_index)

what do you think?

github-actions · 2024-05-15T20:05:54Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 30 days if no further activity occurs.

Signed-off-by: oviner <[email protected]>

openshift-merge-robot · 2024-07-12T22:36:04Z

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

github-actions · 2024-10-28T20:05:51Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 30 days if no further activity occurs.

OdedViner requested a review from a team as a code owner November 26, 2023 11:03

pull-request-size bot added the size/L PR that changes 100-499 lines label Nov 26, 2023

OdedViner changed the title ~~Create Cluster via ACM~~ WIP: Create Cluster via ACM Nov 26, 2023

openshift-ci bot added the do-not-merge/work-in-progress label Nov 26, 2023

pull-request-size bot added size/XL and removed size/L PR that changes 100-499 lines labels Dec 12, 2023

openshift-merge-robot added the needs-rebase label Dec 12, 2023

petr-balogh reviewed Dec 13, 2023

View reviewed changes

ocs_ci/ocs/acm/acm.py Outdated Show resolved Hide resolved

petr-balogh reviewed Dec 20, 2023

View reviewed changes

openshift-merge-robot added needs-rebase and removed needs-rebase labels Jan 1, 2024

OdedViner force-pushed the creare-cluster-via-acm branch from b162b0f to d6322b4 Compare January 3, 2024 09:56

openshift-merge-robot added needs-rebase and removed needs-rebase labels Jan 3, 2024

OdedViner force-pushed the creare-cluster-via-acm branch from d6322b4 to 0afd2b2 Compare January 28, 2024 12:28

openshift-merge-robot removed the needs-rebase label Jan 28, 2024

openshift-merge-robot added the needs-rebase label Feb 15, 2024

github-actions bot added the lifecycle/stale No recent activity label May 15, 2024

OdedViner added 2 commits June 6, 2024 15:21

Create Cluster via ACM

5791194

Signed-off-by: oviner <[email protected]>

Fix context manager

4e822ab

Signed-off-by: oviner <[email protected]>

OdedViner force-pushed the creare-cluster-via-acm branch from 1a8d546 to 4e822ab Compare June 6, 2024 12:21

openshift-merge-robot removed the needs-rebase label Jun 6, 2024

delete conflict leftovers

9c7d6c5

Signed-off-by: oviner <[email protected]>

openshift-merge-robot added the needs-rebase label Jul 12, 2024

github-actions bot removed the lifecycle/stale No recent activity label Jul 29, 2024

github-actions bot added the lifecycle/stale No recent activity label Oct 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Create Cluster via ACM #8935

WIP: Create Cluster via ACM #8935

OdedViner commented Nov 26, 2023 •

edited

Loading

openshift-ci bot commented Nov 26, 2023

petr-balogh Dec 13, 2023

OdedViner Dec 31, 2023

petr-balogh Dec 20, 2023

petr-balogh Dec 20, 2023

petr-balogh Dec 20, 2023

petr-balogh Dec 20, 2023

OdedViner Jan 1, 2024

petr-balogh Dec 20, 2023

OdedViner Dec 31, 2023

petr-balogh Dec 20, 2023

OdedViner Jan 1, 2024

petr-balogh Dec 20, 2023

OdedViner Jan 1, 2024

petr-balogh Dec 20, 2023

OdedViner Dec 31, 2023

OdedViner Jan 28, 2024

github-actions bot commented May 15, 2024

openshift-merge-robot commented Jul 12, 2024

github-actions bot commented Oct 28, 2024



		@purple_squad
		@acm_import

WIP: Create Cluster via ACM #8935

Are you sure you want to change the base?

WIP: Create Cluster via ACM #8935

Conversation

OdedViner commented Nov 26, 2023 • edited Loading

openshift-ci bot commented Nov 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented May 15, 2024

openshift-merge-robot commented Jul 12, 2024

github-actions bot commented Oct 28, 2024

OdedViner commented Nov 26, 2023 •

edited

Loading