Skip to content

OCPBUGS-74510: vsphere: remove VSphereMultiDisk feature gate references - #10753

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
vr4manta:OCPBUGS-74510
Aug 12, 2026
Merged

OCPBUGS-74510: vsphere: remove VSphereMultiDisk feature gate references#10753
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
vr4manta:OCPBUGS-74510

Conversation

@vr4manta

@vr4manta vr4manta commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

OCPBUGS-74510

Changes

  • Removed VSphereMultiDisk references

Notes

The VSphereMultiDisk feature gate has been GA for several releases. Remove the gating checks so vSphere multi-disk functionality runs unconditionally.

Summary by CodeRabbit

  • Bug Fixes
    • vSphere disk setup now works without requiring the multi-disk feature gate.
    • Improved validation and handling of vSphere data disks, including clearer handling of unsupported disk data.
    • Removed unnecessary feature-gate checks for control-plane and compute data disks.
    • Existing multi-network, node-networking, and DNS-record validation remains unchanged.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Aug 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vr4manta: This pull request references Jira Issue OCPBUGS-74510, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

OCPBUGS-74510

Changes

  • Removed VSphereMultiDisk references

Notes

The VSphereMultiDisk feature gate has been GA for several releases. Remove the gating checks so vSphere multi-disk functionality runs unconditionally.

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.

@openshift-ci
openshift-ci Bot requested review from andfasano and jcpowermac August 10, 2026 16:01
@coderabbitai

coderabbitai Bot commented Aug 10, 2026

Copy link
Copy Markdown

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: 8f14ba74-5d80-4521-aa8e-e1971920fdfd

📥 Commits

Reviewing files that changed from the base of the PR and between 3a117ed and 82c4096.

📒 Files selected for processing (2)
  • pkg/asset/machines/util.go
  • pkg/types/vsphere/validation/featuregates.go
💤 Files with no reviewable changes (1)
  • pkg/types/vsphere/validation/featuregates.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • pkg/asset/machines/util.go

📝 Walkthrough

Walkthrough

The vSphere disk setup path no longer depends on the multi-disk feature gate. Feature-gate validation no longer checks control-plane or compute data disks. Valid disk data still produces disk setup ignition.

Changes

vSphere disk processing

Layer / File(s) Summary
Remove vSphere data-disk gating
pkg/types/vsphere/validation/featuregates.go
Removes control-plane and compute data-disk checks, related platform references, and the hasDataDisks helper.
Process vSphere disk data
pkg/asset/machines/util.go
Processes valid vsphere.DiskInfo values without the feature gate, builds the device path, creates disk setup ignition, and preserves error handling.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the removal of VSphereMultiDisk feature gate references, which matches the pull request's primary change.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
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.
Stable And Deterministic Test Names ✅ Passed The patch changes only two non-test Go files and adds no Ginkgo It, Describe, Context, or When declarations, so no test title can be dynamic.
Test Structure And Quality ✅ Passed The PR changes only two implementation files and no Ginkgo test files. Therefore, the listed test-structure requirements have no applicable violations.
Microshift Test Compatibility ✅ Passed The diff modifies only two non-test Go files and adds no Ginkgo e2e tests, so the MicroShift test compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The commit changes only two production Go files and adds no Ginkgo tests or test files, so the SNO test-compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed The commit modifies only vSphere disk setup and feature-gate validation. It adds no workload manifests or scheduling constraints such as affinity, topology spread, replica, selector, toleration, or...
Ote Binary Stdout Contract ✅ Passed The commit changes only two library files; added-line and changed-file scans found no stdout, logging, OTE entry point, or Ginkgo suite setup code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The commit changes only two non-test Go files, adds no Ginkgo e2e tests, and adds no IPv4 or external-connectivity test logic.
No-Weak-Crypto ✅ Passed The two-file patch only changes vSphere disk handling and feature-gate validation; it adds no cryptographic algorithms, crypto APIs, custom crypto, or secret comparisons.
Container-Privileges ✅ Passed The commit modifies only two Go source files; it adds no container or Kubernetes manifests and no privileged, host namespace, SYS_ADMIN, or escalation settings.
No-Sensitive-Data-In-Logs ✅ Passed The commit adds no logging calls or sensitive values to log messages; its changes only create vSphere disk configuration and return generic errors.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions
The command is terminated due to an error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions


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

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vr4manta: This pull request references Jira Issue OCPBUGS-74510, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

OCPBUGS-74510

Changes

  • Removed VSphereMultiDisk references

Notes

The VSphereMultiDisk feature gate has been GA for several releases. Remove the gating checks so vSphere multi-disk functionality runs unconditionally.

Summary by CodeRabbit

  • Bug Fixes
  • vSphere disk setup now works without requiring the multi-disk feature gate.
  • Improved validation and handling of vSphere data disks.
  • Removed unnecessary feature-gate checks for control-plane and compute data disks.

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 coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@pkg/asset/machines/util.go`:
- Around line 56-64: Add unit tests for NodeDiskSetup with
FeatureGateVSphereMultiDisk disabled, covering both a valid vsphere.DiskInfo
input and an unsupported dataDisk type. Assert that the valid input returns disk
setup ignition without error, while the unsupported type returns an error.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 91ad8051-7c58-4ae1-b3a0-b63885f676e5

📥 Commits

Reviewing files that changed from the base of the PR and between 1b579f1 and eec51ce.

📒 Files selected for processing (2)
  • pkg/asset/machines/util.go
  • pkg/types/vsphere/validation/featuregates.go
💤 Files with no reviewable changes (1)
  • pkg/types/vsphere/validation/featuregates.go

Comment on lines +56 to +64
if vsphereDataDisk, ok := dataDisk.(vsphere.DiskInfo); ok {
device := fmt.Sprintf(VsphereScsiByPath, vsphereDataDisk.Index+1)
diskSetupIgn, err := machineconfig.ForDiskSetup(role, device, label, path, diskSetup.Type)
if err != nil {
return nil, errors.Wrap(err, "failed to create ignition to setup disks for master machines")
}
return nil, errors.Errorf("unsupported vsphere data disk type")
return diskSetupIgn, nil
}
return nil, errors.Errorf("unsupported vsphere data disk type")

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick win

Add unit coverage for unconditional vSphere disk setup.

Add or update tests for NodeDiskSetup with FeatureGateVSphereMultiDisk disabled. Cover a valid vsphere.DiskInfo value and an unsupported dataDisk type. Assert that the valid case returns disk setup ignition and the unsupported case returns an error.

As per coding guidelines, all Go code under pkg/ must have unit tests.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/asset/machines/util.go` around lines 56 - 64, Add unit tests for
NodeDiskSetup with FeatureGateVSphereMultiDisk disabled, covering both a valid
vsphere.DiskInfo input and an unsupported dataDisk type. Assert that the valid
input returns disk setup ignition without error, while the unsupported type
returns an error.

Source: Coding guidelines

The VSphereMultiDisk feature gate has been GA for several releases.
Remove the gating checks so vSphere multi-disk functionality runs
unconditionally.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 11, 2026

Copy link
Copy Markdown

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@jcpowermac

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-vsphere-multi-vcenter-ovn
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-devpreview
/test e2e-vsphere-ovn-disk-setup-techpreview
/test e2e-vsphere-ovn-hybrid-env
/test e2e-vsphere-ovn-techpreview
/test e2e-vsphere-ovn-zones
/test e2e-aws-ovn

@openshift-ci

openshift-ci Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcpowermac

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 Aug 12, 2026
@openshift-ci

openshift-ci Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

@vr4manta: The following test 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/prow/e2e-vsphere-ovn-devpreview 82c4096 link false /test e2e-vsphere-ovn-devpreview

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.

@vr4manta

Copy link
Copy Markdown
Contributor Author

/verified by @vr4manta

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 12, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vr4manta: This PR has been marked as verified by @vr4manta.

Details

In response to this:

/verified by @vr4manta

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.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 4745066 into openshift:main Aug 12, 2026
21 of 22 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vr4manta: Jira Issue OCPBUGS-74510: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-74510 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

OCPBUGS-74510

Changes

  • Removed VSphereMultiDisk references

Notes

The VSphereMultiDisk feature gate has been GA for several releases. Remove the gating checks so vSphere multi-disk functionality runs unconditionally.

Summary by CodeRabbit

  • Bug Fixes
  • vSphere disk setup now works without requiring the multi-disk feature gate.
  • Improved validation and handling of vSphere data disks, including clearer handling of unsupported disk data.
  • Removed unnecessary feature-gate checks for control-plane and compute data disks.
  • Existing multi-network, node-networking, and DNS-record validation remains unchanged.

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.

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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants