Skip to content

OCPBUGS-74510: Removed VSphereMultiDisk feature gate - #1532

Open
vr4manta wants to merge 1 commit into
openshift:mainfrom
vr4manta:OCPBUGS-74510
Open

OCPBUGS-74510: Removed VSphereMultiDisk feature gate #1532
vr4manta wants to merge 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 usages of VSphereMultiDisk feature gate
  • Updated tests to assume GA of feature gate

Notes

Removed VSphereMultiDisk feature gate now that it has been GA for several releases

Summary by CodeRabbit

  • New Features

    • vSphere machines now support multiple data disks by default, without requiring a separate feature toggle.
    • Data disk validation is consistently applied, including size, naming, and provisioning constraints.
  • Bug Fixes

    • Removed the previous configuration restriction that blocked additional disks when the feature toggle was disabled.
    • Updated validation and end-to-end coverage to reflect the default multi-disk behavior.

…eral releases

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 10, 2026
@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)

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 usages of VSphereMultiDisk feature gate
  • Updated tests to assume GA of feature gate

Notes

Removed VSphereMultiDisk feature gate now that it has been GA for several releases

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-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 10, 2026
@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: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 7f00c274-c289-4165-9b7a-6f8b0becfd2d

📥 Commits

Reviewing files that changed from the base of the PR and between 0db39ee and d3f61d1.

📒 Files selected for processing (9)
  • cmd/machineset/main.go
  • cmd/vsphere/main.go
  • pkg/controller/vsphere/reconciler.go
  • pkg/operator/operator.go
  • pkg/operator/operator_test.go
  • pkg/util/testing/testing.go
  • pkg/webhooks/machine_webhook.go
  • pkg/webhooks/machine_webhook_test.go
  • test/e2e/vsphere/machines.go
💤 Files with no reviewable changes (3)
  • pkg/operator/operator.go
  • pkg/operator/operator_test.go
  • pkg/controller/vsphere/reconciler.go

Walkthrough

The VSphereMultiDisk feature gate was removed from registration, defaults, reconciliation, and webhook validation. vSphere data disks are now processed and validated without the gate. Unit and end-to-end tests were updated.

Changes

VSphereMultiDisk gate removal

Layer / File(s) Summary
Remove feature-gate registration and defaults
cmd/machineset/main.go, cmd/vsphere/main.go, pkg/operator/..., pkg/util/testing/testing.go
Command and operator configuration no longer registers or enables VSphereMultiDisk.
Process and validate vSphere data disks unconditionally
pkg/controller/vsphere/reconciler.go, pkg/webhooks/machine_webhook.go, pkg/webhooks/machine_webhook_test.go, test/e2e/vsphere/machines.go
Reconciliation and webhook validation no longer require VSphereMultiDisk. Related tests no longer configure the gate or require its test label.

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

🚥 Pre-merge checks | ✅ 13 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning The Ginkgo vSphere tests use bare error assertions and delete Machines/MachineSets only inline, so a failed step can leak resources; repository patterns use DeferCleanup for this case. Add DeferCleanup or AfterEach cleanup immediately after each resource is created, and add operation-specific messages to all cluster-operation assertions.
Single Node Openshift (Sno) Test Compatibility ⚠️ Warning The PR removes the feature-gate label from an existing serial vSphere suite whose tests add/remove machines and verify node counts; no SNO guard exists. Single Node OpenShift (SNO) compatibility notice: verify this serial test with /payload-job periodic-ci-openshift-release-master-nightly-4.22-e2e-aws-ovn-single-node-serial, or add a SNO skip guard.
✅ Passed checks (13 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely identifies the main change: removal of the VSphereMultiDisk feature gate.
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.
Stable And Deterministic Test Names ✅ Passed All changed Ginkgo titles in test/e2e/vsphere/machines.go are static string literals; the PR only removes a static feature-gate label from Describe.
Microshift Test Compatibility ✅ Passed The PR adds no Ginkgo tests; it only removes a feature-gate label from an existing Describe. Its existing It test has [apigroup:machine.openshift.io].
Topology-Aware Scheduling Compatibility ✅ Passed The patch only removes the VSphereMultiDisk gate and updates validation/tests; the diff adds no affinity, topology spread, replica, node selector, toleration, or PDB constraints.
Ote Binary Stdout Contract ✅ Passed cmd/machine-api-tests-ext/main.go has no process-level stdout write; fmt.Printf calls are in vSphere helpers invoked from It bodies, which the check excludes.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR adds no new Ginkgo tests. It only removes the VSphereMultiDisk label from an existing Describe block, with no new IPv4 assumptions or external connectivity.
No-Weak-Crypto ✅ Passed The patch only changes feature-gate and vSphere disk validation logic; added lines and all changed files contain no MD5, SHA1, DES, RC4, Blowfish, ECB, or secret-comparison code.
Container-Privileges ✅ Passed The PR changes only Go files and adds no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings in container/Kubernetes manifests.
No-Sensitive-Data-In-Logs ✅ Passed The PR adds no logging calls or sensitive log fields. The diff removes the VSphereMultiDisk status log, and added code contains no password, token, API key, PII, or hostname logging.
✨ 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

openshift-ci Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign radekmanak for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

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

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants