MERGE CONFLICT! NO-JIRA: Branch Sync master to release-4.22 [04-15-2026]

[openshift-pr-manager]

Automated branch sync: master to release-4.22.

[openshift-pr-manager]

/hold
needs conflict resolution

[openshift-ci-robot]

@openshift-pr-manager[bot]: This pull request explicitly references no jira issue.

Details

In response to this:

Automated branch sync: master to release-4.22.

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]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-pr-manager[bot]
Once this PR has been reviewed and has the lgtm label, please assign martinkennelly 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

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all