Cleanup.

Author: Joshua Reed

controllers/cloudstackcluster_controller.go

@@ -87,11 +87,10 @@ func (reconciler *CloudStackClusterReconciler) Reconcile(ctx context.Context, re
 // Reconcile actually reconciles the CloudStackCluster.
 func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, reterr error) {
 	return r.RunReconciliationStages(
+		r.SetFailureDomainsStatusMap,
 		r.CreateFailureDomains(r.ReconciliationSubject.Spec.FailureDomains),
-		r.CheckOwnedCRDsForReadiness(infrav1.GroupVersion.WithKind("CloudStackFailureDomain")),
 		r.GetFailureDomains(r.FailureDomains),
 		r.VerifyFailureDomainCRDs,
-		r.SetFailureDomains,
 		r.SetReady)
 }
 
@@ -117,10 +116,10 @@ func (r *CloudStackClusterReconciliationRunner) VerifyFailureDomainCRDs() (ctrl.
 	return ctrl.Result{}, nil
 }
 
-// SetFailureDomains sets failure domains to be used for CAPI machine placement.
-func (r *CloudStackClusterReconciliationRunner) SetFailureDomains() (ctrl.Result, error) {
+// SetFailureDomainsStatusMap sets failure domains in CloudStackCluster status to be used for CAPI machine placement.
+func (r *CloudStackClusterReconciliationRunner) SetFailureDomainsStatusMap() (ctrl.Result, error) {
 	r.ReconciliationSubject.Status.FailureDomains = clusterv1.FailureDomains{}
-	for _, fdSpec := range r.FailureDomains.Items {
+	for _, fdSpec := range r.ReconciliationSubject.Spec.FailureDomains {
 		if !strings.HasSuffix(fdSpec.Name, "-"+r.CAPICluster.Name) { // Add cluster name suffix if missing.
 			fdSpec.Name = fdSpec.Name + "-" + r.CAPICluster.Name
 		}

controllers/cloudstackfailuredomain_controller.go

@@ -19,7 +19,6 @@ package controllers
 import (
 	"context"
 
-
 	"github.com/pkg/errors"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -105,7 +104,7 @@ func (r *CloudStackFailureDomainReconciliationRunner) Reconcile() (retRes ctrl.R
 	return ctrl.Result{}, nil
 }
 
-// ReconcileDelete on the ReconciliationRunner actually attempts to delete the reconciliation subject.
+// ReconcileDelete on the ReconciliationRunner attempts to delete the reconciliation subject.
 func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (retRes ctrl.Result, retErr error) {
 	r.Log.Info("Deleting CloudStackFailureDomain")
 	// Address Isolated Networks.

controllers/cloudstackisolatednetwork_controller.go

@@ -96,13 +96,6 @@ func (r *CloudStackIsoNetReconciliationRunner) ReconcileDelete() (retRes ctrl.Re
 	if res, err := r.GetParent(r.ReconciliationSubject, r.FailureDomain)(); r.ShouldReturn(res, err) {
 		return res, err
 	}
-	if r.FailureDomain.Spec.Name == "" {
-		return ctrl.Result{}, errors.New("couldn't get parent Failure Domain for placement")
-	}
-	res, err := r.AsFailureDomainUser(&r.FailureDomain.Spec)()
-	if r.ShouldReturn(res, err) {
-		return res, err
-	}
 	r.Log.Info("Deleting IsolatedNetwork.")
 	if err := r.CSUser.DisposeIsoNetResources(r.FailureDomain, r.ReconciliationSubject, r.CSCluster); err != nil {
 		if !strings.Contains(strings.ToLower(err.Error()), "no match found") {