Works.

Author: Joshua Reed

api/v1beta2/cloudstackmachine_types.go

@@ -79,9 +79,9 @@ type CloudStackMachineSpec struct {
 	// +optional
 	ProviderID *string `json:"providerID,omitempty"`
 
-	// FailureDomain -- the FailureDomain the machine is placed in.
+	// FailureDomainName -- the name of the FailureDomain the machine is placed in.
 	// +optional
-	FailureDomain CloudStackFailureDomainSpec `json:"failureDomain,omitempty"`
+	FailureDomainName string `json:"failureDomainName,omitempty"`
 
 	// IdentityRef is a reference to a identity to be used when reconciling this cluster
 	// +optional

api/v1beta2/zz_generated.deepcopy.go

@@ -89,7 +89,7 @@ func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, re
 		r.RequeueIfCloudStackClusterNotReady,
 		r.SetFailureDomainOnCSMachine,
 		r.GetObjectByName("placeholder", r.FailureDomain,
-			func() string { return r.ReconciliationSubject.Spec.FailureDomain.Name }),
+			func() string { return r.ReconciliationSubject.Spec.FailureDomainName }),
 		r.CheckPresent(map[string]client.Object{"CloudStackFailureDomain": r.FailureDomain}),
 		r.AsFailureDomainUser(&r.FailureDomain.Spec))
 	return r.RunBaseReconciliationStages()
@@ -133,12 +133,12 @@ func (r *CloudStackMachineReconciliationRunner) ConsiderAffinity() (ctrl.Result,
 
 // SetFailureDomainOnCSMachine sets the failure domain the machine should launch in.
 func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (retRes ctrl.Result, reterr error) {
-	if r.ReconciliationSubject.Spec.FailureDomain.Name == "" { // Needs random FD, but not yet set.
+	if r.ReconciliationSubject.Spec.FailureDomainName == "" { // Needs random FD, but not yet set.
 		if util.IsControlPlaneMachine(r.CAPIMachine) { // Is control plane machine -- CAPI will specify.
-			r.ReconciliationSubject.Spec.FailureDomain.Name = *r.CAPIMachine.Spec.FailureDomain
+			r.ReconciliationSubject.Spec.FailureDomainName = *r.CAPIMachine.Spec.FailureDomain
 		} else { // Not a control plane machine. Place randomly.
 			randNum := (rand.Int() % len(r.CSCluster.Spec.FailureDomains)) // #nosec G404 -- weak crypt rand doesn't matter here.
-			r.ReconciliationSubject.Spec.FailureDomain.Name = r.CSCluster.Spec.FailureDomains[randNum].Name
+			r.ReconciliationSubject.Spec.FailureDomainName = r.CSCluster.Spec.FailureDomains[randNum].Name
 		}
 	}
 	return ctrl.Result{}, nil

controllers/cloudstackmachine_controller.go

@@ -74,9 +74,9 @@ func (r *CloudStackMachineStateCheckerReconciliationRunner) Reconcile() (ctrl.Re
 		r.GetParent(r.ReconciliationSubject, r.CSMachine),
 		r.GetParent(r.CSMachine, r.CAPIMachine),
 		r.CheckPresent(map[string]client.Object{"CloudStackMachine": r.CSMachine, "Machine": r.CAPIMachine}),
-		r.GetObjectByName(r.CSMachine.Spec.FailureDomain.Name, r.FailureDomain),
+		r.GetObjectByName(r.CSMachine.Spec.FailureDomainName, r.FailureDomain),
 		r.GetObjectByName("placeholder", r.FailureDomain,
-			func() string { return r.CSMachine.Spec.FailureDomain.Name }),
+			func() string { return r.CSMachine.Spec.FailureDomainName }),
 		r.CheckPresent(map[string]client.Object{"CloudStackFailureDomain": r.FailureDomain}),
 		r.AsFailureDomainUser(&r.FailureDomain.Spec),
 	); r.ShouldReturn(res, err) {