[release-4.18] CNTRLPLANE-1662: Migrate OCP-32383 to upstream

[openshift-cherrypick-robot]

This is an automated cherry-pick of #30378

/assign gangwgr

[openshift-ci-robot]

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: CNTRLPLANE-1662

In response to this:

This is an automated cherry-pick of #30378

/assign gangwgr

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-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign bertinatto for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

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

[gangwgr]

Need to update manually
/close

[openshift-ci]

@gangwgr: Closed this PR.

In response to this:

Need to update manually
/close

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]

@openshift-cherrypick-robot: The following tests 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/e2e-aws-ovn-edge-zones	7551a15	link	true	/test e2e-aws-ovn-edge-zones
ci/prow/verify	7551a15	link	true	/test verify

Full PR test history. Your PR dashboard.

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.