Modified vSphere config provider to not lose AddressesFromPools when …

…applying Failure Domains
openshift · Feb 5, 2024 · 5b80ec6 · 5b80ec6
1 parent f6986c7
commit 5b80ec6
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go b/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go
@@ -92,12 +92,13 @@ func (v VSphereProviderConfig) InjectFailureDomain(fd machinev1.VSphereFailureDo
 	newVSphereProviderConfig.providerConfig.Workspace = newVSphereProviderConfig.getWorkspaceFromFailureDomain(failureDomain)
 	topology := failureDomain.Topology
 
-	logNetworkInfo(newVSphereProviderConfig.providerConfig.Network, "CPMS Network before FD: %v", v.logger)
+	logNetworkInfo(newVSphereProviderConfig.providerConfig.Network, "control plane machine set network before failure domain: %v", v.logger)
 
 	if len(topology.Networks) > 0 {
+		networkSpec := machinev1beta1.NetworkSpec{}
 		// If original has AddressesFromPools, that means static IP is desired for the CPMS.  Keep that and just add the FD info.
-		networkSpec := machinev1beta1.NetworkSpec{
-			Devices: newVSphereProviderConfig.providerConfig.Network.Devices,
+		if len(newVSphereProviderConfig.providerConfig.Network.Devices[0].AddressesFromPools) > 0 {
+			networkSpec.Devices = newVSphereProviderConfig.providerConfig.Network.Devices
 		}
 
 		// Set the network name for the device from FD.
@@ -110,7 +111,7 @@ func (v VSphereProviderConfig) InjectFailureDomain(fd machinev1.VSphereFailureDo
 		}
 	}
 
-	logNetworkInfo(newVSphereProviderConfig.providerConfig.Network, "CPMS Network after FD: %v", v.logger)
+	logNetworkInfo(newVSphereProviderConfig.providerConfig.Network, "control plane machine set network after failure domain: %v", v.logger)
 
 	if len(topology.Template) > 0 {
 		newVSphereProviderConfig.providerConfig.Template = topology.Template[strings.LastIndex(topology.Template, "/")+1:]