Skip to content

SPLAT-2592: Removed logic that adds the platform-type labels to nodes for hybrid-env#79296

Open
vr4manta wants to merge 1 commit into
openshift:mainfrom
vr4manta:SPLAT-2592
Open

SPLAT-2592: Removed logic that adds the platform-type labels to nodes for hybrid-env#79296
vr4manta wants to merge 1 commit into
openshift:mainfrom
vr4manta:SPLAT-2592

Conversation

@vr4manta
Copy link
Copy Markdown
Contributor

@vr4manta vr4manta commented May 14, 2026

SPLAT-2592

Changes

  • Removed logic that adds the platform-type labels to nodes for hybrid-env

Removed platform-type labeling workaround for vSphere hybrid environments

This PR removes a downstream workaround from the vSphere IPI installer step that was adding node.openshift.io/platform-type=vsphere labels to nodes in hybrid-environment clusters.

What changed:
The label_vsphere_nodes() helper function and its invocation (18 lines) have been removed from the vSphere virtualization installation script (ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh). This script is used during CI testing to set up hybrid clusters with vSphere virtual machine nodes.

Practical impact:
The vSphere hybrid environment CI tests no longer perform manual node labeling after CSR approval. The script now proceeds directly from node approval to storage and cluster operator configuration. This change suggests that upstream Cloud Controller Manager (CCM) changes have been deployed, making the temporary downstream labeling workaround unnecessary.

Affected infrastructure:
CI configuration for OpenShift clusters using vSphere virtualization with hybrid node types in integration tests.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 14, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 14, 2026

@vr4manta: This pull request references SPLAT-2592 which is a valid jira issue.

Details

In response to this:

SPLAT-2592

Changes

  • Removed logic that adds the platform-type labels to nodes for hybrid-env

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 14, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 2410e213-30ec-4865-8317-614500964c19

📥 Commits

Reviewing files that changed from the base of the PR and between 55c6069 and e144129.

📒 Files selected for processing (1)
  • ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh
💤 Files with no reviewable changes (1)
  • ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh

Walkthrough

Removes the label_vsphere_nodes helper function and its invocation from the vSphere IPI installation script, eliminating a downstream labeling workaround for the node.openshift.io/platform-type=vsphere label. The script now proceeds directly from CSR approval to storage operator setup.

Changes

vSphere Node Labeling Workaround Removal

Layer / File(s) Summary
Labeling workaround function and call removal
ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh
Deleted the label_vsphere_nodes() function definition and its top-level invocation that previously applied the node.openshift.io/platform-type=vsphere label as a downstream workaround. Execution now flows directly from CSR approval to storage operator enablement.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

lgtm, rehearsals-ack

Suggested reviewers

  • sosiouxme
  • dgoodwin
  • petr-muller
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and specifically summarizes the main change: removal of platform-type labeling logic for hybrid-env, which aligns with the code change removing the label_vsphere_nodes function and its invocation.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vr4manta

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2026
@openshift-ci openshift-ci Bot requested review from dgoodwin and sosiouxme May 14, 2026 12:28
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@vr4manta: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-installer-main-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.1-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.0-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.23-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.22-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.21-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.20-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.1-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.0-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.23-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.22-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.21-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.20-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.1-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.0-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.23-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.22-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.21-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.20-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-vsphere-ovn-upi-hybrid-env-techpreview N/A periodic Registry content changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-upi-hybrid-env-techpreview N/A periodic Registry content changed
periodic-ci-openshift-release-main-nightly-4.20-e2e-vsphere-ovn-upi-hybrid-env N/A periodic Registry content changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2 N/A periodic Registry content changed

A total of 37 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@vr4manta
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2
/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-2of2

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@vr4manta: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

@vr4manta: the repo openshift/release does not contribute to the OpenShift official images, or the base branch is not currently having images promoted

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@vr4manta: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.1-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.0-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.23-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.22-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.21-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.20-e2e-vsphere-csi-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.1-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-5.0-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.23-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.22-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.21-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.20-e2e-vsphere-ovn-hybrid-env openshift/vmware-vsphere-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-installer-main-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.1-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.0-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.23-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.22-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.21-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.20-e2e-vsphere-ovn-hybrid-env openshift/installer presubmit Registry content changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2 N/A periodic Registry content changed
periodic-ci-openshift-release-main-nightly-4.21-e2e-vsphere-ovn-upi-hybrid-env N/A periodic Registry content changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2 N/A periodic Registry content changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-vsphere-ovn-hybrid-env-serial-techpreview-2of2 N/A periodic Registry content changed

A total of 37 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@vr4manta
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-2of2

@vr4manta
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-release-main-nightly-4.21-e2e-vsphere-ovn-upi-hybrid-env

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@vr4manta: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

1 similar comment
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@vr4manta: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

@vr4manta: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/periodic-ci-openshift-release-main-nightly-4.21-e2e-vsphere-ovn-upi-hybrid-env e144129 link unknown /pj-rehearse periodic-ci-openshift-release-main-nightly-4.21-e2e-vsphere-ovn-upi-hybrid-env
ci/rehearse/periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-2of2 e144129 link unknown /pj-rehearse periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-2of2
ci/rehearse/periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2 e144129 link unknown /pj-rehearse periodic-ci-openshift-release-main-nightly-5.0-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants