Merge pull request #5727 from openshift-cherrypick-robot/cherry-pick-5723-to-release-4.21

openshift-merge-bot[bot] · web-flow · commit ffb69fe70786 · 2026-03-05T17:34:36.000Z
[release-4.21] OCPBUGS-77577: Fix failure domain matching during vsphere boot image updates
diff --git a/pkg/controller/bootimage/vsphere_helpers.go b/pkg/controller/bootimage/vsphere_helpers.go
@@ -456,11 +456,13 @@ func createNewVMTemplate(streamData *stream.Stream, providerSpec *machinev1beta1
 				}
 			}
 
-			// This condition directly follows from https://github.com/openshift/cluster-control-plane-machine-set-operator/blob/main/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go#L194
-			if providerSpec.Workspace.Datastore != failureDomain.Topology.Datastore &&
-				vcenter.Server != failureDomain.Server &&
-				providerSpec.Workspace.VMGroup != vmGroup &&
-				path.Clean(providerSpec.Workspace.ResourcePool) == path.Clean(failureDomain.Topology.ResourcePool) {
+			// Skip failure domains that don't match the providerSpec workspace.
+			// All fields must match — mirroring the logic in https://github.com/openshift/cluster-control-plane-machine-set-operator/blob/main/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go#L194
+			if providerSpec.Workspace.Datacenter != failureDomain.Topology.Datacenter ||
+				providerSpec.Workspace.Datastore != failureDomain.Topology.Datastore ||
+				vcenter.Server != failureDomain.Server ||
+				providerSpec.Workspace.VMGroup != vmGroup ||
+				path.Clean(providerSpec.Workspace.ResourcePool) != path.Clean(failureDomain.Topology.ResourcePool) {
 				continue
 			}
 			infraID := infra.Status.InfrastructureName

Original file line number	Diff line number	Diff line change
`@@ -456,11 +456,13 @@ func createNewVMTemplate(streamData stream.Stream, providerSpec machinev1beta1`
`456`	`456`	`}`
`457`	`457`	`}`
`458`	`458`
`459`		`- // This condition directly follows from https://github.com/openshift/cluster-control-plane-machine-set-operator/blob/main/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go#L194`
`460`		`- if providerSpec.Workspace.Datastore != failureDomain.Topology.Datastore &&`
`461`		`- vcenter.Server != failureDomain.Server &&`
`462`		`- providerSpec.Workspace.VMGroup != vmGroup &&`
`463`		`- path.Clean(providerSpec.Workspace.ResourcePool) == path.Clean(failureDomain.Topology.ResourcePool) {`
	`459`	`+ // Skip failure domains that don't match the providerSpec workspace.`
	`460`	`+ // All fields must match — mirroring the logic in https://github.com/openshift/cluster-control-plane-machine-set-operator/blob/main/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go#L194`
	`461`	`+ if providerSpec.Workspace.Datacenter != failureDomain.Topology.Datacenter \|\|`
	`462`	`+ providerSpec.Workspace.Datastore != failureDomain.Topology.Datastore \|\|`
	`463`	`+ vcenter.Server != failureDomain.Server \|\|`
	`464`	`+ providerSpec.Workspace.VMGroup != vmGroup \|\|`
	`465`	`+ path.Clean(providerSpec.Workspace.ResourcePool) != path.Clean(failureDomain.Topology.ResourcePool) {`
`464`	`466`	`continue`
`465`	`467`	`}`
`466`	`468`	`infraID := infra.Status.InfrastructureName`