Skip to content

Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift" - #2989

Open
redhat-chai-bot wants to merge 1 commit into
openshift:masterfrom
redhat-chai-bot:revert-2950-osstreams-featuregate
Open

Revert "CNTRLPLANE-3871: promote OSStreams feature gate to Default for Hypershift"#2989
redhat-chai-bot wants to merge 1 commit into
openshift:masterfrom
redhat-chai-bot:revert-2950-osstreams-featuregate

Conversation

@redhat-chai-bot

@redhat-chai-botredhat-chai-bot commented Aug 18, 2026

Copy link
Copy Markdown

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

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 commented Aug 18, 2026

Copy link
Copy Markdown

@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-robotopenshift-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

Copy link
Copy Markdown
Contributor

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

coderabbitaiBot commented Aug 18, 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: 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.

Merge Risk:⚪ Minimal · up to 8978a

The change restores the prior Hypershift OSStreams feature-gate behavior and generated manifests; no actionable merge-blocking risk remains after normal checks.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies that the pull request reverts the Hypershift OSStreams feature-gate promotion.
Description check✅ PassedThe description explains the revert and its purpose of investigating the Hypershift proxy regression.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe diff changes feature-gate metadata, documentation, and generated CRDs; added-line scans found no logging calls or sensitive-data fields.
✨ 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


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.

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

sosiouxme commented Aug 18, 2026

Copy link
Copy Markdown
Member

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

Copy link
Copy Markdown
Member

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

@openshift-ci

Copy link
Copy Markdown
Contributor

@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

Copy link
Copy Markdown
Author

/retest verify


AI-generated. Review for accuracy.

@sosiouxme

Copy link
Copy Markdown
Member

/test verify

@openshift-ci

Copy link
Copy Markdown
Contributor

@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.

@neisw

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 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

Copy link
Copy Markdown
Contributor

[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:

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-referenceIndicates that this PR references a valid Jira ticket of any type.lgtmIndicates that a PR is ready to be merged.size/XXLDenotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@redhat-chai-bot@openshift-ci-robot@sosiouxme@neisw