Needs cleanup, but can replace failure domains now.

Author: Joshua Reed

api/v1beta2/cloudstackfailuredomain_types.go

@@ -23,6 +23,7 @@ import (
 
 const (
 	FailureDomainFinalizer = "cloudstackfailuredomain.infrastructure.cluster.x-k8s.io"
+	FailureDomainLabelName = "cloudstackfailuredomain.infrastructure.cluster.x-k8s.io/name"
 	NetworkTypeIsolated    = "Isolated"
 	NetworkTypeShared      = "Shared"
 )

controllers/cloudstackfailuredomain_controller.go

@@ -20,7 +20,9 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
@@ -107,7 +109,9 @@ func (r *CloudStackFailureDomainReconciliationRunner) Reconcile() (retRes ctrl.R
 // ReconcileDelete on the ReconciliationRunner attempts to delete the reconciliation subject.
 func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (ctrl.Result, error) {
 	r.Log.Info("Deleting CloudStackFailureDomain")
+
 	return r.RunReconciliationStages(
+		r.ClearMachines,
 		r.DeleteOwnedObjects(
 			infrav1.GroupVersion.WithKind("CloudStackAffinityGroup"),
 			infrav1.GroupVersion.WithKind("CloudStackIsolatedNetwork")),
@@ -118,6 +122,32 @@ func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (ctrl.Re
 	)
 }
 
+// ClearMachines checks for any machines in failure domain, deletes the CAPI machine for any still in FailureDomain,
+// and requeus until all CloudStack machines are cleared from the FailureDomain.
+func (r *CloudStackFailureDomainReconciliationRunner) ClearMachines() (ctrl.Result, error) {
+	machines := &infrav1.CloudStackMachineList{}
+	if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Name}); err != nil {
+		return ctrl.Result{}, err
+	}
+	// Deleted CAPI machines for CloudStack machines found.
+	for _, machine := range machines.Items {
+		for _, ref := range machine.OwnerReferences {
+			if ref.Kind == "Machine" {
+				machine := &clusterv1.Machine{}
+				machine.Name = ref.Name
+				machine.Namespace = r.ReconciliationSubject.Namespace
+				if err := r.K8sClient.Delete(r.RequestCtx, machine); err != nil {
+					return ctrl.Result{}, err
+				}
+			}
+		}
+	}
+	if len(machines.Items) > 0 {
+		return r.RequeueWithMessage("FailureDomain still has machine in it.")
+	}
+	return ctrl.Result{}, nil
+}
+
 // RemoveFinalizer just removes the finalizer from the failure domain.
 func (r *CloudStackFailureDomainReconciliationRunner) RemoveFinalizer() (ctrl.Result, error) {
 	controllerutil.RemoveFinalizer(r.ReconciliationSubject, infrav1.FailureDomainFinalizer)

controllers/cloudstackmachine_controller.go

@@ -136,7 +136,7 @@ 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.FailureDomainName == "" { // Needs random FD, but not yet set.
+	if r.ReconciliationSubject.Spec.FailureDomainName == "" {
 
 		if r.CAPIMachine.Spec.FailureDomain != nil &&
 			(util.IsControlPlaneMachine(r.CAPIMachine) || // Is control plane machine -- CAPI will specify.
@@ -150,6 +150,7 @@ func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (r
 			}
 			r.ReconciliationSubject.Spec.FailureDomainName = name
 		}
+		r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = r.ReconciliationSubject.Spec.FailureDomainName
 	}
 	return ctrl.Result{}, nil
 }