Skip to content

SPLAT-2802: Port vSphere hybrid OTE to release-4.22#349

Open
vr4manta wants to merge 3 commits into
openshift:release-4.22from
vr4manta:SPLAT-2802
Open

SPLAT-2802: Port vSphere hybrid OTE to release-4.22#349
vr4manta wants to merge 3 commits into
openshift:release-4.22from
vr4manta:SPLAT-2802

Conversation

@vr4manta

@vr4manta vr4manta commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

SPLAT-2802

Changes

  • Created OTE extension
  • Converted project to use go workspaces for separation of OTE binary
  • Added e2e for vSphere hybrid node environment

Summary by CodeRabbit

  • Tests

    • Added end-to-end test suite for mixed vSphere node environments
    • Expanded test infrastructure with new extension framework integration
  • Chores

    • Improved build process with artifact compression and optimization
    • Enhanced build system for improved development workflow

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 22, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

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

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

SPLAT-2802

Changes

  • Created OTE extension
  • Converted project to use go workspaces for separation of OTE binary
  • Added e2e for vSphere hybrid node environment

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 added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 22, 2026
@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Jun 22, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 6063aba6-3ce3-4379-b7b8-4eff4254ccc0

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Walkthrough

Introduces an openshift-tests Go sub-module containing Ginkgo e2e tests for the VSphereMixedNodeEnv feature gate and a Cobra-based vmware-vsphere-csi-driver-operator-tests-ext entrypoint binary. The Makefile gains build-tests-ext and vendor targets; the Dockerfile compresses the tests-ext artifact and includes it in the final image.

Changes

OpenShift Tests Extension

Layer / File(s) Summary
openshift-tests sub-module declaration
openshift-tests/go.mod
Declares the openshift-tests module at Go 1.25.0, pinning direct dependencies on Ginkgo/Gomega, OpenShift test extension, OpenShift API/client/library-go, Cobra, and Kubernetes libraries; adds replace directive for the OpenShift ginkgo fork.
Makefile targets and Dockerfile packaging
Makefile, Dockerfile.openshift
Extends all target to depend on build-tests-ext; adds build-tests-ext and vendor phony targets; extends clean; Dockerfile builder stage gzips the tests-ext artifact and the final image copies both the operator binary and the .gz file.
E2E test helper functions
openshift-tests/e2e/doc.go, openshift-tests/e2e/hybrid_environment.go
Adds package doc, timeout/interval constants, and five helper functions: categorizeNodesByPlatform, isHybridEnvironment, verifyClusterCSIDriverState, updateClusterCSIDriverState, and waitForOperatorHealth.
VSphereMixedNodeEnv Ginkgo test specs
openshift-tests/e2e/hybrid_environment.go
Adds the Describe block with BeforeEach/AfterEach client wiring; one It validates ClusterCSIDriver management state for all-vSphere vs hybrid clusters; one serial It forces Managed state in a hybrid cluster, asserts degradation/non-upgradeable conditions, then restores state via defer.
Tests-ext entrypoint and extension registry
openshift-tests/cmd/vmware-vsphere-csi-driver-operator-tests-ext/main.go
Wires logging, flag normalization, extension registry with parallel and serial suites, builds Ginkgo specs, scans spec names for [platform:X] markers to add PlatformEquals includes, registers specs, and executes the Cobra root command.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

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

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

@vr4manta vr4manta changed the base branch from main to release-4.22 June 22, 2026 14:51
@openshift-ci-robot

openshift-ci-robot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

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

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

SPLAT-2802

Changes

  • Created OTE extension
  • Converted project to use go workspaces for separation of OTE binary
  • Added e2e for vSphere hybrid node environment

Summary by CodeRabbit

  • Tests

  • Added end-to-end test suite for mixed vSphere node environments

  • Expanded test infrastructure with new extension framework integration

  • Chores

  • Improved build process with artifact compression and optimization

  • Enhanced build system for improved development workflow

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.

@vr4manta

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-techpreview openshift/origin#31321

@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@vr4manta: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ad1229c0-6e4a-11f1-8690-86f89e57dbbf-0

@vr4manta

Copy link
Copy Markdown
Contributor Author

/test all

@vr4manta vr4manta marked this pull request as ready for review June 22, 2026 18:40
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 22, 2026
@openshift-ci openshift-ci Bot requested review from RomanBednar and dobsonj June 22, 2026 18:41
@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@vr4manta: all tests passed!

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

Payload-job ran and succeeded above. In there we can see the new parallel e2e ran and completed successfully.

started: 0/62/529 "[sig-storage][OCPFeatureGate:VSphereMixedNodeEnv][platform:vsphere] vSphere Hybrid Environment when VSphereMixedNodeEnv feature gate is enabled should validate node labels and verify appropriate operator state [Suite:openshift/conformance/parallel]"

passed: (100ms) 2026-06-22T17:14:57 "[sig-storage][OCPFeatureGate:VSphereMixedNodeEnv][platform:vsphere] vSphere Hybrid Environment when VSphereMixedNodeEnv feature gate is enabled should validate node labels and verify appropriate operator state [Suite:openshift/conformance/parallel]"

I'll need to run the techpreview serial to validate the serial test.

@vr4manta

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-techpreview-serial openshift/origin#31321

@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@vr4manta: trigger 0 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

@vr4manta

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-serial-techpreview openshift/origin#31321

@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@vr4manta: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-serial-techpreview-1of2
  • periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-hybrid-env-serial-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/3808eff0-6f2c-11f1-8156-301267fcff01-0

@vr4manta

vr4manta commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Serial Payload-job ran and succeeded above. In the 1-of-2 job, we can see the new serial e2e ran and completed successfully.

started: 0/2/48 "[sig-storage][OCPFeatureGate:VSphereMixedNodeEnv][platform:vsphere] vSphere Hybrid Environment when VSphereMixedNodeEnv feature gate is enabled should degrade when ClusterCSIDriver is set to Managed in hybrid environment [Suite:openshift/conformance/serial]"

passed: (5.1s) 2026-06-23T20:05:18 "[sig-storage][OCPFeatureGate:VSphereMixedNodeEnv][platform:vsphere] vSphere Hybrid Environment when VSphereMixedNodeEnv feature gate is enabled should degrade when ClusterCSIDriver is set to Managed in hybrid environment [Suite:openshift/conformance/serial]"

@gnufied

gnufied commented Jun 26, 2026

Copy link
Copy Markdown
Member

Since this is a straightforward rebase of main PR, I am approving.

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 26, 2026
@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied, 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 Jun 26, 2026
@vr4manta

Copy link
Copy Markdown
Contributor Author

/verified by @vr4manta
Ran payload jobs showing that the new tests were executed as expected.

@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
Ran payload jobs showing that the new tests were executed as expected.

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 verified Signifies that the PR passed pre-merge verification criteria label Jun 26, 2026
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. 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.

4 participants