Skip to content

[release-4.21] OCPBUGS-77577: Fix failure domain matching during vsphere boot image updates #5727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 5, 2026
Merged

[release-4.21] OCPBUGS-77577: Fix failure domain matching during vsphere boot image updates #5727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/controller/bootimage/vsphere_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down