account for failure domain API changes

rvanderp3 · rvanderp3 · commit 01f3ef4caccc · 2023-11-02T09:15:36.000-04:00
diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go
@@ -149,7 +149,7 @@ func Machines(clusterID string, region string, subnets map[string]string, pool *
 			Template: machinev1.ControlPlaneMachineSetTemplate{
 				MachineType: machinev1.OpenShiftMachineV1Beta1MachineType,
 				OpenShiftMachineV1Beta1Machine: &machinev1.OpenShiftMachineV1Beta1MachineTemplate{
-					FailureDomains: machinev1.FailureDomains{
+					FailureDomains: &machinev1.FailureDomains{
 						Platform: v1.AWSPlatformType,
 						AWS:      &failureDomains,
 					},
diff --git a/pkg/asset/machines/azure/machines.go b/pkg/asset/machines/azure/machines.go
@@ -142,7 +142,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 	}
 
 	if len(failureDomains) > 0 {
-		controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = machinev1.FailureDomains{
+		controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = &machinev1.FailureDomains{
 			Platform: v1.AzurePlatformType,
 			Azure:    &failureDomains,
 		}
diff --git a/pkg/asset/machines/gcp/machines.go b/pkg/asset/machines/gcp/machines.go
@@ -106,7 +106,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 			Template: machinev1.ControlPlaneMachineSetTemplate{
 				MachineType: machinev1.OpenShiftMachineV1Beta1MachineType,
 				OpenShiftMachineV1Beta1Machine: &machinev1.OpenShiftMachineV1Beta1MachineTemplate{
-					FailureDomains: machinev1.FailureDomains{
+					FailureDomains: &machinev1.FailureDomains{
 						Platform: v1.GCPPlatformType,
 						GCP:      &failureDomains,
 					},
diff --git a/pkg/asset/machines/openstack/machines.go b/pkg/asset/machines/openstack/machines.go
@@ -148,7 +148,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 	}
 
 	if CPMSFailureDomains := pruneFailureDomains(failureDomains); CPMSFailureDomains != nil {
-		controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = machinev1.FailureDomains{
+		controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = &machinev1.FailureDomains{
 			Platform:  v1.OpenStackPlatformType,
 			OpenStack: CPMSFailureDomains,
 		}
diff --git a/pkg/asset/machines/vsphere/machines.go b/pkg/asset/machines/vsphere/machines.go
@@ -168,7 +168,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 			Template: machinev1.ControlPlaneMachineSetTemplate{
 				MachineType: machinev1.OpenShiftMachineV1Beta1MachineType,
 				OpenShiftMachineV1Beta1Machine: &machinev1.OpenShiftMachineV1Beta1MachineTemplate{
-					FailureDomains: machinev1.FailureDomains{
+					FailureDomains: &machinev1.FailureDomains{
 						Platform: v1.VSpherePlatformType,
 						VSphere:  failureDomains,
 					},

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func Machines(clusterID string, config types.InstallConfig, pool types.Machine`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if len(failureDomains) > 0 {`
`145`		`- controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = machinev1.FailureDomains{`
	`145`	`+ controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = &machinev1.FailureDomains{`
`146`	`146`	`Platform: v1.AzurePlatformType,`
`147`	`147`	`Azure: &failureDomains,`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func Machines(clusterID string, config types.InstallConfig, pool types.Machine`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`if CPMSFailureDomains := pruneFailureDomains(failureDomains); CPMSFailureDomains != nil {`
`151`		`- controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = machinev1.FailureDomains{`
	`151`	`+ controlPlaneMachineSet.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains = &machinev1.FailureDomains{`
`152`	`152`	`Platform: v1.OpenStackPlatformType,`
`153`	`153`	`OpenStack: CPMSFailureDomains,`
`154`	`154`	`}`