[release-4.21] OCPBUGS-74152: Fix PDB blocking node drains during cluster upgrades

[openshift-cherrypick-robot]

This is an automated cherry-pick of #1099

/assign jhadvig

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-72387 has been cloned as Jira Issue OCPBUGS-74152. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-74152: Fix PDB blocking node drains during cluster upgrades

Details

In response to this:

This is an automated cherry-pick of #1099

/assign jhadvig

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-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-74152, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #1099

/assign jhadvig

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.

[jhadvig]

/lgtm
/approve
/label backport-risk-assessed

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, openshift-cherrypick-robot

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:

• OWNERS [jhadvig]

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-cherrypick-robot: 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.

[yanpzhan]

Built an image with the pr code, and launched an 4.20 ipi-on-ibmcloud cluster, installed 4.20 odf operator on the cluster. Upgraded the cluster to the built image, upgrade finished successfully.

# oc get infrastructures.config.openshift.io cluster --kubeconfig 42021-366825.kubeconfig -ojson | jq '.spec.platformSpec'
{
  "type": "IBMCloud"
}
# oc get clusterversions.config.openshift.io version --kubeconfig 42021-366825.kubeconfig
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-01-21-075641-test-ci-ln-w3ymsq2-latest   True        False         178m    Cluster version is 4.21.0-0-2026-01-21-075641-test-ci-ln-w3ymsq2-latest
# oc get clusterversions.config.openshift.io version --kubeconfig 42021-366825.kubeconfig -ojson | jq '.status.history[].version'
"4.21.0-0-2026-01-21-075641-test-ci-ln-w3ymsq2-latest"
"4.20.0-0.nightly-2026-01-20-183352"

/verified by yanpzhan

[openshift-ci-robot]

@yanpzhan: This PR has been marked as verified by yanpzhan.

Details

In response to this:

Built an image with the pr code, and launched an 4.20 ipi-on-ibmcloud cluster, installed 4.20 odf operator on the cluster. Upgraded the cluster to the built image, upgrade finished successfully.

# oc get infrastructures.config.openshift.io cluster --kubeconfig 42021-366825.kubeconfig -ojson | jq '.spec.platformSpec'
{
 "type": "IBMCloud"
}
# oc get clusterversions.config.openshift.io version --kubeconfig 42021-366825.kubeconfig
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-01-21-075641-test-ci-ln-w3ymsq2-latest   True        False         178m    Cluster version is 4.21.0-0-2026-01-21-075641-test-ci-ln-w3ymsq2-latest
# oc get clusterversions.config.openshift.io version --kubeconfig 42021-366825.kubeconfig -ojson | jq '.status.history[].version'
"4.21.0-0-2026-01-21-075641-test-ci-ln-w3ymsq2-latest"
"4.20.0-0.nightly-2026-01-20-183352"

/verified by yanpzhan

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.

[yanpzhan]

/verify cancel
I think this bug is conditionally occurring. Though didn't meet when upgrade with the pr code, but upgrading to 4.22 with the fix code will somehow still meets the issue. So hold the verification for current pr.

[openshift-ci-robot]

@yanpzhan: The /verified command must be used with one of the following actions: by, later, remove, or bypass. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

Details

In response to this:

/verified cancel
I think this bug is conditionally occurring. Though didn't meet when upgrade with the pr code, but upgrading to 4.22 with the fix code will somehow still meets the issue. So hold the verification for current pr.

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]

@yanpzhan: The label(s) /remove-label verified cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/remove-label verified

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.

[yanpzhan]

/verified remove

[openshift-ci-robot]

@yanpzhan: The verified label has been removed.

Details

In response to this:

/verified remove

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.