OCPBUGS-77498: Fix failure domain matching during vsphere boot image updates

[djoshy]

- What I did
The previous condition (originally based on a check in the control plane operator) was not used correctly. The equality check on the last comparison should be != and the whole condition should be ||, not && since we are checking for the negative case. It was also a missing comparison on the Datacenter field.

As a result of the incorrect condition, the matching would fail in multi vCenter clusters, but would work correctly on non-single vCenter cases as there is only one to match to.

- How to verify it
Multi-center vsphere jobs should be enough to verify this fix.

[openshift-ci-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-77498, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

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

Details

In response to this:

- What I did
The previous condition (originally based on a check in the control plane operator) was not used correctly. The equality check on the last comparison should be != and the whole condition should be ||, not && since we are checking for the negative case. It was also a missing comparison on the Datacenter field.

As a result of the incorrect condition, the matching would fail in multi vCenter clusters, but would work correctly on non-single vCenter cases as there is only one to match to.

- How to verify it
Multi-center vsphere jobs should be enough to verify this fix.

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.

[djoshy]

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-multi-vcenter

[openshift-ci]

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-multi-vcenter

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/3871ac70-164e-11f1-9f2e-cd5fe56bc9a1-0

[djoshy]

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-multi-vcenter

[openshift-ci]

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-multi-vcenter

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2d790690-165a-11f1-848e-e7796b5dafcd-0

[djoshy]

Multi vCenter payload run looks good! 🎉

/verified by payloads

[openshift-ci-robot]

@djoshy: This PR has been marked as verified by payloads.

Details

In response to this:

Multi vCenter payload run looks good! 🎉

/verified by payloads

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.

[yuqi-zhang]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, yuqi-zhang

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 [djoshy,yuqi-zhang]

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

[openshift-ci-robot]

@djoshy: Jira Issue Verification Checks: Jira Issue OCPBUGS-77498
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-77498 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

- What I did
The previous condition (originally based on a check in the control plane operator) was not used correctly. The equality check on the last comparison should be != and the whole condition should be ||, not && since we are checking for the negative case. It was also a missing comparison on the Datacenter field.

As a result of the incorrect condition, the matching would fail in multi vCenter clusters, but would work correctly on non-single vCenter cases as there is only one to match to.

- How to verify it
Multi-center vsphere jobs should be enough to verify this fix.

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.

[djoshy]

/cherry-pick release-4.21 release-4.20

[openshift-cherrypick-robot]

@djoshy: new pull request created: #5727

Details

In response to this:

/cherry-pick release-4.21 release-4.20

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

Fix included in accepted release 4.22.0-0.nightly-2026-03-05-070435