Reorder VSphereDeploymentZone reconcile to fix deletion

Signed-off-by: killianmuldoon <[email protected]>

controllers/vspheredeploymentzone_controller.go

@@ -109,16 +109,6 @@ func (r vsphereDeploymentZoneReconciler) Reconcile(ctx context.Context, request
 		return reconcile.Result{}, err
 	}
 
-	failureDomain := &infrav1.VSphereFailureDomain{}
-	failureDomainKey := client.ObjectKey{Name: vsphereDeploymentZone.Spec.FailureDomain}
-	if err := r.Client.Get(ctx, failureDomainKey, failureDomain); err != nil {
-		if apierrors.IsNotFound(err) {
-			logr.V(4).Info("Failure Domain not found, won't reconcile", "key", failureDomainKey)
-			return reconcile.Result{}, nil
-		}
-		return reconcile.Result{}, err
-	}
-
 	patchHelper, err := patch.NewHelper(vsphereDeploymentZone, r.Client)
 	if err != nil {
 		return reconcile.Result{}, errors.Wrapf(
@@ -132,7 +122,6 @@ func (r vsphereDeploymentZoneReconciler) Reconcile(ctx context.Context, request
 	vsphereDeploymentZoneContext := &capvcontext.VSphereDeploymentZoneContext{
 		ControllerContext:     r.ControllerContext,
 		VSphereDeploymentZone: vsphereDeploymentZone,
-		VSphereFailureDomain:  failureDomain,
 		Logger:                logr,
 		PatchHelper:           patchHelper,
 	}
@@ -144,11 +133,23 @@ func (r vsphereDeploymentZoneReconciler) Reconcile(ctx context.Context, request
 			logr.Error(err, "patch failed", "vsphereDeploymentZone", vsphereDeploymentZoneContext.String())
 		}
 	}()
-
 	if !vsphereDeploymentZone.DeletionTimestamp.IsZero() {
 		return ctrl.Result{}, r.reconcileDelete(vsphereDeploymentZoneContext)
 	}
 
+	// Fetch the VSphereFailureDomain after checking if this VSphereDeploymentZone is being deleted. Otherwise the
+	// vsphereDeploymentZone can get stuck in deleting state.
+	failureDomain := &infrav1.VSphereFailureDomain{}
+	failureDomainKey := client.ObjectKey{Name: vsphereDeploymentZone.Spec.FailureDomain}
+	if err := r.Client.Get(ctx, failureDomainKey, failureDomain); err != nil {
+		if apierrors.IsNotFound(err) {
+			logr.V(4).Info("Failure Domain not found, won't reconcile", "key", failureDomainKey)
+			return reconcile.Result{}, nil
+		}
+		return reconcile.Result{}, err
+	}
+	vsphereDeploymentZoneContext.VSphereFailureDomain = failureDomain
+
 	// If the VSphereDeploymentZone doesn't have our finalizer, add it.
 	// Requeue immediately after adding finalizer to avoid the race condition between init and delete
 	if !ctrlutil.ContainsFinalizer(vsphereDeploymentZone, infrav1.DeploymentZoneFinalizer) {