Skip to content

OCPSTRAT-2728: Rebase 1.35#2055

Merged
openshift-merge-bot[bot] merged 5 commits intoopenshift:masterfrom
jacobsee:rebase-1.35
Mar 3, 2026
Merged

OCPSTRAT-2728: Rebase 1.35#2055
openshift-merge-bot[bot] merged 5 commits intoopenshift:masterfrom
jacobsee:rebase-1.35

Conversation

@jacobsee
Copy link
Copy Markdown
Member

@jacobsee jacobsee commented Nov 19, 2025

No description provided.

@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 Nov 19, 2025
@openshift-ci openshift-ci Bot requested review from bertinatto and deads2k November 19, 2025 22:09
@jacobsee jacobsee force-pushed the rebase-1.35 branch 3 times, most recently from abe97a4 to b5b32f8 Compare December 4, 2025 20:22
@jacobsee
Copy link
Copy Markdown
Member Author

jacobsee commented Dec 12, 2025

/retest

This was referenced Jan 7, 2026
Merged
Closed
p0lyn0mial
p0lyn0mial reviewed Jan 28, 2026
View reviewed changes
Comment thread go.mod Outdated
@jacobsee
openshift/api has added a version dimension to the map returned by fe…
4a8e7e3 
…atures.AllFeatureSets()

It was changed from returning map[ClusterProfileName]map[FeatureSet]*FeatureGateEnabledDisabled to
  map[uint64]map[ClusterProfileName]map[FeatureSet]*FeatureGateEnabledDisabled. Adjusted accordingly. This has downstream impacts to NewFeatureGateOptions() and InitializeFeatureGates().
@jacobsee
Copy link
Copy Markdown
Member Author

jacobsee commented Mar 2, 2026 •
edited by openshift-ci Bot
Loading

/retitle OCPSTRAT-2728: Rebase 1.35

@openshift-ci openshift-ci Bot changed the title WIP: Rebase 1.35 OCPSTRAT-2728: Rebase 1.35 Mar 2, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 2, 2026 •
edited by openshift-ci Bot
Loading

@jacobsee: This pull request references OCPSTRAT-2728 which is a valid jira issue.

Details

In response to this:

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 removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 2, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 2, 2026

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

@bertinatto
Copy link
Copy Markdown
Member

bertinatto commented Mar 2, 2026

/lgtm

Adding a hold to give us time to test if the changes introduced in the last commit will break the operators. @jacobsee feel free to remove the hold if your testing goes well.

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 2, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 2, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 2, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, jacobsee

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 Mar 2, 2026
@jacobsee
Copy link
Copy Markdown
Member Author

jacobsee commented Mar 3, 2026

/unhold

@jacobsee
Copy link
Copy Markdown
Member Author

jacobsee commented Mar 3, 2026

/tide refresh

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 3, 2026
@jacobsee
Copy link
Copy Markdown
Member Author

jacobsee commented Mar 3, 2026

/tide refresh

@openshift-merge-bot openshift-merge-bot Bot merged commit 5d9eb62 into openshift:master Mar 3, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@p0lyn0mial p0lyn0mial p0lyn0mial left review comments

@bertinatto bertinatto Awaiting requested review from bertinatto

@deads2k deads2k Awaiting requested review from deads2k

Assignees

@bertinatto bertinatto

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jacobsee @openshift-ci-robot @bertinatto @p0lyn0mial