TRT-2908: Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift" by redhat-chai-bot · Pull Request #2989 · openshift/api

redhat-chai-bot · 2026-08-18T13:04:12Z

This reverts the merge commit from #2950.

PR #2950 promoted the OSStreams feature gate to Default for Hypershift. It is suspected as a possible contributor to the TestCreateClusterProxy regression observed in recent 5.1.0-0.ci and 5.0 payload rejections, where worker nodes receive HTTP 407 from the squid proxy during Ignition fetch.

Reverting to validate whether this change is the root cause of the hypershift-e2e-aws failures.

/jira CNTRLPLANE-3871

AI-generated. Review for accuracy.

@sosiouxme requested in Slack thread

…r Hypershift" This reverts commit a3f3142, reversing changes made to dffcf50.

openshift-merge-bot · 2026-08-18T13:04:15Z

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 · 2026-08-18T13:04:16Z

@redhat-chai-bot: This pull request references CNTRLPLANE-3871 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 either version "5.1.0." or "openshift-5.1.0.", but it targets "openshift-5.0" instead.

Details

In response to this:

This reverts the merge commit from #2950.

PR #2950 promoted the OSStreams feature gate to Default for Hypershift. It is suspected as a possible contributor to the TestCreateClusterProxy regression observed in recent 5.1.0-0.ci and 5.0 payload rejections, where worker nodes receive HTTP 407 from the squid proxy during Ignition fetch.

Reverting to validate whether this change is the root cause of the hypershift-e2e-aws failures.

/jira CNTRLPLANE-3871

AI-generated. Review for accuracy.

@sosiouxme requested in Slack thread

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 · 2026-08-18T13:04:24Z

Hello @redhat-chai-bot! 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.

coderabbitai · 2026-08-18T13:04:36Z

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: Pro Plus

Run ID: d1a50f44-ea38-44fc-8855-61ca4d56126e

📥 Commits

Reviewing files that changed from the base of the PR and between ff5491f and 8978a02.

⛔ 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-SelfManagedHA.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-SelfManagedHA.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-SelfManagedHA.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-SelfManagedHA.crd.yaml
payload-manifests/crds/0000_80_machine-config_01_osimagestreams-Hypershift.crd.yaml
payload-manifests/crds/0000_80_machine-config_01_osimagestreams-SelfManagedHA.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 (2)

payload-manifests/crds/0000_80_machine-config_01_osimagestreams-SelfManagedHA.crd.yaml
payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-SelfManagedHA.crd.yaml

Included review availability: Your plan includes up to 2 reviews per rolling hour; 1 remains after this review.

📝 Walkthrough

Walkthrough

The change updates OSStreams enablement by cluster profile and feature set. It enables SelfManaged variants and selected Hypershift preview variants while disabling Hypershift default and OKD defaults. It adds MachineConfigPool CRDs for multiple Hypershift profiles with validation and status schemas. It also adds the Hypershift OSImageStream CRD with default-stream and image validation rules.

Possibly related PRs

openshift/api#2950: Both PRs modify OSStreams feature-gate configuration and Hypershift manifests.

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
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 PR changes feature configuration and CRD manifests only; no test files or added/removed Ginkgo It, Describe, Context, or When titles appear in the diff.
Test Structure And Quality	✅ Passed	The PR changes feature configuration and generated CRD YAML only; no Ginkgo test files or test code changed, so the stated test-quality requirements are not applicable.
Microshift Test Compatibility	✅ Passed	The pull request changes only Go feature configuration, Markdown, and YAML manifests; the diff adds no Ginkgo tests or It/Describe/Context/When declarations.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The diff adds no Ginkgo test files or declarations; it changes feature configuration and generated CRD/manifest files only, so SNO test compatibility is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	The diff changes feature-gate data and CRDs only; its nodeSelector/maxUnavailable entries are MachineConfigPool schema properties, with no Pod scheduling, affinity, replicas, tolerations, or PDB ch...
Ote Binary Stdout Contract	✅ Passed	The diff changes feature-gate data and generated YAML only; the new initializer calls set/map helpers, and no added process-level stdout or logging writes exist.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The diff adds no Ginkgo tests and modifies only feature configuration, manifests, and CRD YAML; no changed test contains IPv4-only assumptions or external connectivity.
No-Weak-Crypto	✅ Passed	The diff changes OSStreams gating and generated CRDs only; added-line and changed-file scans found no MD5, SHA-1, DES, RC4, Blowfish, ECB, custom crypto, or secret comparisons.
Container-Privileges	✅ Passed	The diff adds or updates only CRDs, feature-gate data, documentation, and Go feature metadata; no changed manifest contains privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, or allowPrivilegeEs...
No-Sensitive-Data-In-Logs	✅ Passed	The diff changes feature-gate metadata, documentation, and generated CRDs; added-line scans found no logging calls or sensitive-data fields.
Description check	✅ Passed	The description clearly explains that the pull request reverts the OSStreams promotion for Hypershift and states the reason for the revert.
Title check	✅ Passed	The title clearly identifies the pull request as a revert of the OSStreams feature-gate promotion for Hypershift.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

sosiouxme · 2026-08-18T13:14:29Z

To be clear, this is just a suspect at this point; running the payload job to gather evidence.

Also chai is out of line asking whether it's the "root cause". It's certainly not, but perhaps the proximate cause.

sosiouxme · 2026-08-18T13:24:58Z

/payload-job periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn

openshift-ci · 2026-08-18T13:25:02Z

@sosiouxme: 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/35f79e20-9b08-11f1-995f-b8fc12949438-0

redhat-chai-bot · 2026-08-18T19:06:44Z

/retest verify

AI-generated. Review for accuracy.

sosiouxme · 2026-08-18T19:11:53Z

/test verify

neisw · 2026-08-18T21:22:51Z

/lgtm

openshift-merge-bot · 2026-08-18T21:23:27Z

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 · 2026-08-18T21:23:29Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: neisw
Once this PR has been reviewed and has the lgtm label, please assign joelspeed 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:

OWNERS

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

sosiouxme · 2026-08-18T22:03:07Z

/retitle TRT-2908: Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift"

openshift-ci-robot · 2026-08-18T22:03:20Z

@redhat-chai-bot: This pull request references TRT-2908 which is a valid jira issue.

Details

In response to this:

This reverts the merge commit from #2950.

PR #2950 promoted the OSStreams feature gate to Default for Hypershift. It is suspected as a possible contributor to the TestCreateClusterProxy regression observed in recent 5.1.0-0.ci and 5.0 payload rejections, where worker nodes receive HTTP 407 from the squid proxy during Ignition fetch.

Reverting to validate whether this change is the root cause of the hypershift-e2e-aws failures.

/jira CNTRLPLANE-3871

AI-generated. Review for accuracy.

@sosiouxme requested in Slack thread

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.

sosiouxme · 2026-08-19T00:09:30Z

i think there's enough evidence that this revert removes the failure without causing more problems. let's get it in to get payloads flowing.

/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-hypershift-conformance
/override ci/prow/e2e-aws-ovn-techpreview
/override ci/prow/e2e-aws-serial-1of2
/override ci/prow/e2e-aws-serial-2of2
/override ci/prow/e2e-aws-serial-techpreview-1of2
/override ci/prow/e2e-aws-serial-techpreview-2of2
/override ci/prow/e2e-azure
/override ci/prow/e2e-gcp
/override ci/prow/minor-e2e-upgrade-minor

openshift-ci · 2026-08-19T00:09:48Z

@sosiouxme: Overrode contexts on behalf of sosiouxme: ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-hypershift-conformance, ci/prow/e2e-aws-ovn-techpreview, ci/prow/e2e-aws-serial-1of2, ci/prow/e2e-aws-serial-2of2, ci/prow/e2e-aws-serial-techpreview-1of2, ci/prow/e2e-aws-serial-techpreview-2of2, ci/prow/e2e-azure, ci/prow/e2e-gcp, ci/prow/minor-e2e-upgrade-minor

Details

In response to this:

i think there's enough evidence that this revert removes the failure without causing more problems. let's get it in to get payloads flowing.

/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-hypershift-conformance
/override ci/prow/e2e-aws-ovn-techpreview
/override ci/prow/e2e-aws-serial-1of2
/override ci/prow/e2e-aws-serial-2of2
/override ci/prow/e2e-aws-serial-techpreview-1of2
/override ci/prow/e2e-aws-serial-techpreview-2of2
/override ci/prow/e2e-azure
/override ci/prow/e2e-gcp
/override ci/prow/minor-e2e-upgrade-minor

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.

sosiouxme · 2026-08-19T00:11:16Z

/verified by periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn
/label approved

openshift-ci-robot · 2026-08-19T00:11:26Z

@sosiouxme: This PR has been marked as verified by periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn.

Details

In response to this:

/verified by periodic-ci-openshift-hypershift-release-5.1-periodics-e2e-aws-ovn
/label approved

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.

neisw · 2026-08-19T00:46:19Z

/test okd-scos-images

openshift-merge-bot · 2026-08-19T01:01:42Z

/retest-required

Remaining retests: 0 against base HEAD fea75cc and 2 for PR HEAD 8978a02 in total

neisw · 2026-08-19T01:06:04Z

/override ci/prow/e2e-aws-ovn-hypershift-conformance

openshift-ci · 2026-08-19T01:06:10Z

@neisw: Overrode contexts on behalf of neisw: ci/prow/e2e-aws-ovn-hypershift-conformance

Details

In response to this:

/override ci/prow/e2e-aws-ovn-hypershift-conformance

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.

neisw · 2026-08-19T01:08:31Z

/override ci/prow/okd-scos-images

openshift-ci · 2026-08-19T01:08:37Z

@neisw: Overrode contexts on behalf of neisw: ci/prow/okd-scos-images

Details

In response to this:

/override ci/prow/okd-scos-images

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.

openshift-ci · 2026-08-19T01:11:16Z

@redhat-chai-bot: 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.

Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default fo…

8978a02

…r Hypershift" This reverts commit a3f3142, reversing changes made to dffcf50.

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

openshift-ci Bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 18, 2026

openshift-ci Bot requested review from JoelSpeed and yuqi-zhang August 18, 2026 13:06

openshift-ci Bot assigned neisw Aug 18, 2026

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

redhat-chai-bot mentioned this pull request Aug 18, 2026

TRT-2908: Revert openshift/api#2986 #2992

Open

openshift-ci Bot changed the title ~~Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift"~~ TRT-2908: Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift" Aug 18, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2026

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

openshift-merge-bot Bot merged commit af5c920 into openshift:master Aug 19, 2026
29 checks passed

jparrill mentioned this pull request Aug 19, 2026

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

Open

3 tasks

Uh oh!

Conversation

redhat-chai-bot commented Aug 18, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-merge-bot Bot commented Aug 18, 2026

Uh oh!

openshift-ci-robot commented Aug 18, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Aug 18, 2026

Uh oh!

coderabbitai Bot commented Aug 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Uh oh!

sosiouxme commented Aug 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sosiouxme commented Aug 18, 2026

Uh oh!

openshift-ci Bot commented Aug 18, 2026

Uh oh!

redhat-chai-bot commented Aug 18, 2026

Uh oh!

sosiouxme commented Aug 18, 2026

Uh oh!

neisw commented Aug 18, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 18, 2026

Uh oh!

openshift-ci Bot commented Aug 18, 2026

Uh oh!

sosiouxme commented Aug 18, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 18, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sosiouxme commented Aug 19, 2026

Uh oh!

openshift-ci Bot commented Aug 19, 2026

Uh oh!

sosiouxme commented Aug 19, 2026

Uh oh!

openshift-ci-robot commented Aug 19, 2026

Uh oh!

neisw commented Aug 19, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 19, 2026

Uh oh!

neisw commented Aug 19, 2026

Uh oh!

openshift-ci Bot commented Aug 19, 2026

Uh oh!

neisw commented Aug 19, 2026

Uh oh!

openshift-ci Bot commented Aug 19, 2026

Uh oh!

Uh oh!

openshift-ci Bot commented Aug 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

redhat-chai-bot commented Aug 18, 2026 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Aug 18, 2026 •

edited by openshift-ci Bot

Loading

coderabbitai Bot commented Aug 18, 2026 •

edited

Loading

sosiouxme commented Aug 18, 2026 •

edited

Loading

sosiouxme commented Aug 18, 2026 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Aug 18, 2026 •

edited by openshift-ci Bot

Loading