NO-ISSUE: Synchronize From Upstream Repositories

[openshift-bot]

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-04-03 21:09:56	operator-framework/operator-lifecycle-manager@1bf19cc	Francesco Giudici	OPRUN-4519: block upgrades from 4.23 to 5.0 (#3803)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

[openshift-ci-robot]

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-04-03 21:09:56	operator-framework/operator-lifecycle-manager@1bf19cc	Francesco Giudici	OPRUN-4519: block upgrades from 4.23 to 5.0 (#3803)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-04-03 21:09:56	operator-framework/operator-lifecycle-manager@1bf19cc	Francesco Giudici	OPRUN-4519: block upgrades from 4.23 to 5.0 (#3803)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 001effd7-584f-4c64-a262-7de7c33809d6

📥 Commits

Reviewing files that changed from the base of the PR and between 51af595 and 09254b4.

⛔ Files ignored due to path filters (1)

• vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go is excluded by !vendor/**, !**/vendor/**

📒 Files selected for processing (2)

• staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
• staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers_test.go

---

Walkthrough

The pull request modifies OCP version comparison logic in the operator incompatibility checker by introducing a normalizeOCPVersion helper that maps OCP 4.23 to 5.0, then applies this normalization to both the current cluster release and operator maximum versions before determining incompatibility. Tests are extended to validate this normalization behavior across multiple release boundaries.

Changes

Cohort / File(s)	Summary
Core Logic staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go	Added normalizeOCPVersion function that maps OCP 4.23 to 5.0 and preserves major/minor components. Modified incompatibleOperators to normalize both current cluster release and operator olm.maxOpenShiftVersion before comparing against next minor version boundary; now skips entries with missing max values.
Test Coverage staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers_test.go	Extended TestIncompatibleOperators with cases for 4.22.0, 4.23.0, 5.0.0, and 5.1.0 to verify version equivalence across release boundaries. Extended TestOCPVersionNextY with nextY advancement expectations. Added new TestNormalizeOCPVersion to assert normalization behavior including 4.23.x-to-5.0 mapping.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 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.}

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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:

• DOWNSTREAM_OWNERS

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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:

• DOWNSTREAM_OWNERS

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-bot: 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/okd-scos-images	09254b4	link	true	/test okd-scos-images

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.