Skip to content

CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift - #2993

Open
jparrill wants to merge 1 commit into
openshift:masterfrom
jparrill:CNTRLPLANE-3871-graduation
Open

CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift#2993
jparrill wants to merge 1 commit into
openshift:masterfrom
jparrill:CNTRLPLANE-3871-graduation

Conversation

@jparrill

Copy link
Copy Markdown
Contributor

Summary

Context

The previous submission (#2950) was reverted because MCC bootstrap performed network-based image inspection through the guest cluster's proxy, which is unreachable from the management cluster. The MCO fix (openshift/machine-config-operator#6420) skips network discovery in ExternalTopologyMode and builds OSImageStream status from the ControllerConfig's already-resolved OS images.

Dependencies

Test plan

  • Verify hypershift-e2e-aws passes (specifically TestCreateClusterProxy)
  • Verify standalone cluster tests are unaffected
  • Verify feature gate tables in generated YAMLs are correct

🤖 Generated with Claude Code

…Hypershift

With the MCO ExternalTopologyMode guard removed
(openshift/machine-config-operator#6308), HyperShift clusters can now
process OSImageStream during bootstrap. This graduates the OSStreams
feature gate from TechPreviewNoUpgrade to Default for the Hypershift
cluster profile, enabling RHEL 9/10 dual-stream support for hosted
control planes by default.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.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 19, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 19, 2026

Copy link
Copy Markdown

@jparrill: This pull request references CNTRLPLANE-3871 which is a valid jira issue.

Details

In response to this:

Summary

Context

The previous submission (#2950) was reverted because MCC bootstrap performed network-based image inspection through the guest cluster's proxy, which is unreachable from the management cluster. The MCO fix (openshift/machine-config-operator#6420) skips network discovery in ExternalTopologyMode and builds OSImageStream status from the ControllerConfig's already-resolved OS images.

Dependencies

Test plan

  • Verify hypershift-e2e-aws passes (specifically TestCreateClusterProxy)
  • Verify standalone cluster tests are unaffected
  • Verify feature gate tables in generated YAMLs are correct

🤖 Generated with Claude Code

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

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

openshift-ci Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

Hello @jparrill! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@jparrill jparrill changed the title feat: CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift Aug 19, 2026
@openshift-ci openshift-ci Bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 19, 2026
@coderabbitai

coderabbitai Bot commented Aug 19, 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: d3d985ed-44eb-49fd-ae0f-f465402e31f3

📥 Commits

Reviewing files that changed from the base of the PR and between af5c920 and ef49c15.

⛔ Files ignored due to path filters (10)
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Hypershift-CustomNoUpgrade.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Hypershift-Default.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Hypershift-DevPreviewNoUpgrade.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Hypershift-OKD.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Hypershift-TechPreviewNoUpgrade.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_osimagestreams-Hypershift.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_osimagestreams.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_osimagestreams-Hypershift.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
  • machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_osimagestreams.crd.yaml is excluded by !**/zz_generated.crd-manifests/*
📒 Files selected for processing (12)
  • features.md
  • features/features.go
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-CustomNoUpgrade.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-Default.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-DevPreviewNoUpgrade.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-OKD.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-TechPreviewNoUpgrade.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_osimagestreams-Hypershift.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_osimagestreams.crd.yaml
  • payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
  • payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
💤 Files with no reviewable changes (6)
  • payload-manifests/crds/0000_80_machine-config_01_osimagestreams-Hypershift.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-OKD.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-TechPreviewNoUpgrade.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-CustomNoUpgrade.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-DevPreviewNoUpgrade.crd.yaml
  • payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-Hypershift-Default.crd.yaml

Included review availability: Your plan provides up to 12 included reviews per hour; 10 remain after this review.


📝 Walkthrough

Walkthrough

OSStreams enablement now covers development preview, technology preview, default, and OKD configurations. Hypershift Default and OKD payload feature gates enable OSStreams. Hypershift-specific MachineConfigPool and OSImageStream CRD manifests were removed. The remaining MachineConfigPool and OSImageStream CRDs now include IBM Cloud managed release annotations. The feature table reflects enabled status across the listed platform and release profiles.

Possibly related PRs

  • openshift/api#2989: Directly reverses related OSStreams changes by removing Hypershift CRDs and re-enabling OSStreams for Hypershift Default and OKD.

Suggested reviewers: everettraven, joelspeed

Merge Risk: 🔵 Low · up to ef49c

This change enables OSStreams by default for Hypershift and depends on the corresponding bootstrap fix being included in the tested release. The PR is mergeable with owner awareness, but that dependency and the Hypershift bootstrap test should be confirmed before merging.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the promotion of the OSStreams feature gate to Default for Hypershift.
Description check ✅ Passed The description explains the feature promotion, implementation changes, dependency, context, and planned tests.
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 The commit changes feature metadata and manifests only; it adds no *_test.go files or Ginkgo title calls, so it introduces no unstable test names.
Test Structure And Quality ✅ Passed The PR changes feature metadata and generated YAML manifests only; the verified diff contains no Ginkgo or test implementation changes to assess against these requirements.
Microshift Test Compatibility ✅ Passed The PR adds no Ginkgo e2e tests. The diff contains only feature declarations and manifests, so MicroShift test compatibility is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The diff adds no Ginkgo tests or test files; it changes feature declarations and CRD/feature-gate manifests only, so SNO test compatibility is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed The diff changes feature-gate declarations and CRD/feature-gate YAML only. It adds no deployments, controllers, or topology-related scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The diff changes one feature-gate initializer and manifests only; it adds no main/init/TestMain/Ginkgo setup or stdout write.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The pull request changes feature gates and CRD manifests only; the diff adds no *_test.go files or Ginkgo It/Describe/Context/When tests to assess.
No-Weak-Crypto ✅ Passed The PR changes feature-gate and CRD metadata only; the exact added-line scan found no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret-comparison code.
Container-Privileges ✅ Passed The PR diff only changes feature gates and CRD manifests; added-line and final-file scans found no privileged:true, hostPID, hostNetwork, hostIPC, SYS_ADMIN, or allowPrivilegeEscalation:true.
No-Sensitive-Data-In-Logs ✅ Passed The HEAD diff changes feature declarations, tables, and CRD/feature-gate YAML only; added-line and AST searches found no logging calls or sensitive values.
✨ 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: build linters: unable to load custom analyzer "kubeapilinter": tools/_output/bin/kube-api-linter.so, plugin: not implemented
The command is terminated due to an error: build linters: unable to load custom analyzer "kubeapilinter": tools/_output/bin/kube-api-linter.so, plugin: not implemented


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

@jparrill

Copy link
Copy Markdown
Contributor Author

/test integration

1 similar comment
@jparrill

Copy link
Copy Markdown
Contributor Author

/test integration

@openshift-ci

openshift-ci Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

@jparrill: 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/verify-feature-promotion ef49c15 link true /test verify-feature-promotion

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.

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d2cc0b10-9c6a-11f1-9e16-c29538052fc4-0

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0b11fd60-9c6e-11f1-8bd3-f3b4a24734fa-0

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b1e11590-9c6e-11f1-8eb7-f3481aeef226-0

@jparrill

jparrill commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance openshift/machine-config-operator#6420

Above one failed on deprovision (flaky)

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

@jparrill: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

@jparrill: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a78c0a10-9c77-11f1-9ed0-8a7dbe3458df-0

@jparrill

jparrill commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Payload Job Verification

TestCreateClusterProxy — the test that previously failed and caused the OSStreams revert — is now 🟢 with the MCO proxy fix included (openshift/machine-config-operator#6420).

cc @JoelSpeed for API approval.

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/40fff0c0-9c83-11f1-9701-add96e9020e1-0

@JoelSpeed

Copy link
Copy Markdown
Contributor

/lgtm

Please mark this as verified only once the ovn-proxy-conformance is green

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 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-aws-ovn
/test e2e-aws-ovn-hypershift
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-techpreview
/test e2e-aws-serial-1of2
/test e2e-aws-serial-2of2
/test e2e-aws-serial-techpreview-1of2
/test e2e-aws-serial-techpreview-2of2
/test e2e-azure
/test e2e-gcp
/test e2e-upgrade
/test e2e-upgrade-out-of-change
/test minor-e2e-upgrade-minor

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 20, 2026
@jparrill

Copy link
Copy Markdown
Contributor Author

Please mark this as verified only once the ovn-proxy-conformance is green

Yep, I think it happened some infra issues in the previous tries

@jparrill

Copy link
Copy Markdown
Contributor Author

/payload-job-with-prs periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance openshift/machine-config-operator#6420

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b4dbce40-9c8a-11f1-9456-88c13657433d-0

@jparrill

Copy link
Copy Markdown
Contributor Author

/retest-required

@jparrill

Copy link
Copy Markdown
Contributor Author

Looks like the job periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn-proxy-conformance need some adjustments in order to work properly, it's failing on MGMT infra deployment. It was never executed before.

FWIW the test that cause the failure in the past revert it's passing in green as I mentioned here, so I think we are covered

@jparrill

Copy link
Copy Markdown
Contributor Author

/verified by Passing E2E Periodics

Payload Job Verification

TestCreateClusterProxy — the test that previously failed and caused the OSStreams revert — is now 🟢 with the MCO proxy fix included (openshift/machine-config-operator#6420).

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

Copy link
Copy Markdown

@jparrill: This PR has been marked as verified by Passing E2E Periodics.

Details

In response to this:

/verified by Passing E2E Periodics

Payload Job Verification

TestCreateClusterProxy — the test that previously failed and caused the OSStreams revert — is now 🟢 with the MCO proxy fix included (openshift/machine-config-operator#6420).

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

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD af5c920 and 2 for PR HEAD ef49c15 in total

@jparrill

Copy link
Copy Markdown
Contributor Author

/retest-required

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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. 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