Deploy HCP agent clusters on vSphere #13858

DanielOsypenko · 2025-12-07T17:23:00Z

This PR is a continuation of the Create hosted cluster with agents #13272 PR

With this PR we added:

get_ip_list_by_cluster_id from assistant installer
dns records modification
booting machines with specs based on hosted cluster configuration
added a class VSPHEREAgentAI
some restructuring to align deployment classes relation with the logic of the product (1 Hosted Cluster attached to 1 Host Environment)
resolve MCE mirrors issues

Signed-off-by: Jilju Joy <[email protected]>

jilju · 2025-12-08T05:14:30Z

conf/deployment/vsphere/ai_1az_rhcos_vsan_3w_agent.yaml

+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+ENV_DATA:
+  platform: "vsphere_agent"


Please use only "hosted_cluster_platform" value as an identifier for agent/kubevirt.
We are working on changing the platform values to represent as platform only, not the type of cluster configuration.

cluster still must have a platform, if we do not put it here it will be aws by a default.

We continue use hosted_cluster_platform as a distinctive key-value pair to separate kubevirt from agent deployments.

The platform should be only vsphere and the information that it is agent deployment should be specified somewhere else.
I think it will make more sense to set the deployment_type to agent or ai_agent, because it actually is not deployed via Assisted Installer service, event though the process is very similar.

DanielOsypenko · 2025-12-08T09:47:57Z

ocs_ci/deployment/factory.py

+        elif self.deployment_platform in [
+            constants.VSPHERE_PLATFORM,
+            constants.VSPHERE_AGENT_PLATFORM,
+        ]:


@jilju, referring to your comment. We must use a platform to identify deployer class with deployment factory

Can we use only

Suggested change

elif self.deployment_platform in [

constants.VSPHERE_PLATFORM,

constants.VSPHERE_AGENT_PLATFORM,

]:

elif self.deployment_platform in [

constants.VSPHERE_PLATFORM

]:

?
The keys in self.cls_map.update is platform+_+deployment_type which will be vsphere_ai_agent.

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

dahorak · 2025-12-08T12:22:13Z

conf/deployment/vsphere/ai_1az_rhcos_vsan_3w_agent.yaml

+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+ENV_DATA:
+  platform: "vsphere_agent"


The platform should be only vsphere and the information that it is agent deployment should be specified somewhere else.
I think it will make more sense to set the deployment_type to agent or ai_agent, because it actually is not deployed via Assisted Installer service, event though the process is very similar.

dahorak · 2025-12-08T12:39:13Z

ocs_ci/deployment/hub_spoke.py

+            log_step("Boot machines for Agent hosted cluster with min image")
+            if not self.boot_machines_for_agent():
+                # this cluster will not be added to the list of deployed clusters and ODF installation will be skipped
+                return ""


Not sure, if I didn't miss anything there - but wouldn't this silently skip any issue with the creating of the machines?

yes it will log the issue with error and move to deploy rest of the hosted clusters. In a later step we are checking if all desired clusters were actually created and failing the job if not ->

ocs-ci/ocs_ci/deployment/hub_spoke.py

Line 628 in 3c4ad90

logger.error("Some of the desired hosted OCP clusters were not created")

dahorak · 2025-12-08T12:45:56Z

ocs_ci/deployment/vmware.py

+            self.ai_cluster = assisted_installer.AssistedInstallerCluster(
+                name=self.cluster_name,
+                cluster_path=self.cluster_path,
+                openshift_version=str(version.get_semantic_ocp_version_from_config()),
+                base_dns_domain=config.ENV_DATA["base_domain"],
+                api_vip=self.api_vip,
+                ingress_vip=self.ingress_vip,
+                ssh_public_key=self.get_ssh_key(),
+                pull_secret=self.get_pull_secret(),
+            )
+
+            log_step("create (register) cluster in Assisted Installer console")
+            self.ai_cluster.create_cluster()


Is this part relevant for the Agent deployment?

not relevant, removed

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

jilju · 2025-12-10T09:45:10Z

ocs_ci/deployment/helpers/hypershift_base.py

+        for agent_info in agents_obj.get()["items"]:
+            agents_obj.patch(
+                resource_name=agent_info["metadata"]["name"],
+                params='{"spec":{"approved":true}}',


There is another function in this PR which does the approval

…s on vSphere Signed-off-by: Daniel Horak <[email protected]>

dahorak · 2025-12-12T09:56:09Z

Based on yesterday's discussion, I would propose to handle the HCP Agent cluster deployment similarly as standalone OCP deployment via Assisted Installer - with the difference, that we will provide a reference to the Hub cluster, which will be used instead of the public Assisted Installer service.
In other words, each Agent cluster will be deployed using separated Deploy OCS Cluster job, from the perspective of the agent cluster and the Hub cluster will be referenced in the configuration as DEPLOYMENT["hub_cluster_name"] and DEPLOYMENT["hub_cluster_path"] and based on this it will dynamically create the configuration context for the Hub cluster and use that context for the tasks performed on the Hub cluster (infrastructure creation, nodes approval,....).

Here I created proof of concept update for creating the Hub cluster config context: 86292e7.

@jilju WDYT?

Related MR for enabling this in the main Deploy OCS Cluster job: https://url.corp.redhat.com/ade84c0

…s on vSphere Signed-off-by: Daniel Horak <[email protected]>

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

dahorak · 2026-01-07T10:53:32Z

ocs_ci/deployment/vmware.py

+                self.terraform_data_dir,
+                "terraform.tfvars.json",
+            )
+            # control plane specs removed by purpose. HCP spoke clusters can not have own control plane nodes


You will have to explicitly set:

"control_plane_count": 0,

because this variable is by default set to 3 in the terraform:

ocs-ci/terraform/ai/vsphere/variables.tf

Lines 90 to 93 in 732d87b

variable "control_plane_count" {

type = string

default = "3"

}

dahorak · 2026-01-07T11:04:20Z

ocs_ci/deployment/vmware.py

+            """
+            Request API and Ingress IPs from IPAM server


Do we need additional API IP for the hosted cluster? IIUC API is provided by the control plane/master nodes, which means that it is provided by the hosting cluster.

dahorak · 2026-01-07T11:05:31Z

ocs_ci/deployment/vmware.py

+
+    Args:
+        api_ips (list(str)): IPs for api.<cluster>.
+        apps_ips (list(str)): IPs for *.apps.<cluster>.


Better to use ingress instead of apps to align it with the other code and also with the naming from OCP.

dahorak · 2026-01-07T11:08:12Z

ocs_ci/ocs/constants.py

 AZURE_WITH_LOGS_PLATFORM = "azure-with-logs"
 GCP_PLATFORM = "gcp"
 VSPHERE_PLATFORM = "vsphere"
+VSPHERE_AGENT_PLATFORM = "vsphere_agent"


I think this is not used anywhere (agent is part of deployment type, not platform).

dahorak · 2026-01-07T11:13:55Z

ocs_ci/utility/utils.py

+def download_with_retries(url, boot_image_path, max_retries=3):
+    """
+    Download file with retries and proper error handling
+
+    Args:
+        url (str): URL of the file to download
+        boot_image_path (str): Path where to save the downloaded file
+        max_retries (int): Maximum number of retries for downloading the file


Since the function is quite common/universal, I would propose to change the boot_image_path (and other references to ISO/boot image) to some common name (like filename in the above download_file function).

I'm also thinking, if it is worth to keep both the old download_file and new download_with_retries functions, while they do the same and this new one is just enhancement of the old one.

makes sense

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

openshift-ci · 2026-01-14T13:25:48Z

New changes are detected. LGTM label has been removed.

openshift-ci · 2026-01-14T13:25:50Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: DanielOsypenko

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

Details

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

openshift-ci · 2026-01-14T13:25:50Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: DanielOsypenko

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

Details

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

jilju added 6 commits December 7, 2025 19:14

Create hosted cluster with agents

bd0ddf6

Signed-off-by: Jilju Joy <[email protected]>

Create hosted cluster with agents

fb59345

Signed-off-by: Jilju Joy <[email protected]>

rebase, add readme

eada534

Signed-off-by: Jilju Joy <[email protected]>

create host inventory before hcp command

1700254

Signed-off-by: Jilju Joy <[email protected]>

create infraenv project

c5aee1b

Signed-off-by: Jilju Joy <[email protected]>

missing spaces

8c2bddd

Signed-off-by: Jilju Joy <[email protected]>

DanielOsypenko requested review from dahorak and jilju December 7, 2025 17:23

DanielOsypenko self-assigned this Dec 7, 2025

DanielOsypenko requested a review from a team as a code owner December 7, 2025 17:23

DanielOsypenko added provider-client Provider-client solution provider mode deployment Issues preventing Provider mode deployments on any stage labels Dec 7, 2025

pull-request-size bot added the size/XL label Dec 7, 2025

jilju reviewed Dec 8, 2025

View reviewed changes

DanielOsypenko commented Dec 8, 2025

View reviewed changes

deploy agent HCP clusters

3c4ad90

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

DanielOsypenko force-pushed the deploy-agents-420-1 branch from 1d2f931 to 3c4ad90 Compare December 8, 2025 10:56

pull-request-size bot added size/XXL and removed size/XL labels Dec 8, 2025

dahorak reviewed Dec 8, 2025

View reviewed changes

DanielOsypenko requested review from dahorak and jilju December 9, 2025 18:57

ai methods removal, review fixes

a97438b

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

DanielOsypenko force-pushed the deploy-agents-420-1 branch from 83c7b39 to a97438b Compare December 10, 2025 07:22

jilju previously approved these changes Dec 10, 2025

View reviewed changes

openshift-ci bot assigned jilju Dec 10, 2025

openshift-ci bot added the lgtm label Dec 10, 2025

dahorak added a commit to dahorak/ocs-ci that referenced this pull request Dec 11, 2025

POC/TMP - update for red-hat-storage#13858 - Deploy HCP agent cluster…

db94192

…s on vSphere Signed-off-by: Daniel Horak <[email protected]>

dahorak added a commit to dahorak/ocs-ci that referenced this pull request Dec 11, 2025

POC/TMP - update for red-hat-storage#13858 - Deploy HCP agent cluster…

86292e7

…s on vSphere Signed-off-by: Daniel Horak <[email protected]>

POC/TMP - update for red-hat-storage#13858 - Deploy HCP agent cluster…

6dbf942

…s on vSphere Signed-off-by: Daniel Horak <[email protected]>

DanielOsypenko dismissed jilju’s stale review via 0181e92 December 14, 2025 12:07

openshift-ci bot removed the lgtm label Dec 14, 2025

DanielOsypenko force-pushed the deploy-agents-420-1 branch 6 times, most recently from 8793bb4 to cb2e5a5 Compare December 14, 2025 16:52

refactor, clean

cbccdc9

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

DanielOsypenko force-pushed the deploy-agents-420-1 branch from cb2e5a5 to cbccdc9 Compare December 14, 2025 17:33

jilju previously approved these changes Jan 7, 2026

View reviewed changes

openshift-ci bot added the lgtm label Jan 7, 2026

dahorak reviewed Jan 7, 2026

View reviewed changes

add provisining resource

3a3e50d

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

DanielOsypenko dismissed jilju’s stale review via 3a3e50d January 14, 2026 13:25

openshift-ci bot removed the lgtm label Jan 14, 2026

Deploy HCP agent clusters on vSphere #13858

Are you sure you want to change the base?

Deploy HCP agent clusters on vSphere #13858

Uh oh!

Conversation

DanielOsypenko commented Dec 7, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dahorak commented Dec 12, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jan 14, 2026

Uh oh!

openshift-ci bot commented Jan 14, 2026

Uh oh!

openshift-ci bot commented Jan 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants