Remove finalizer when cloud resource is found absent (#220)

This is to ensure that reconciles can complete even when cloud resources (droplets, LBs) cannot be referenced anymore.
kubernetes-sigs · Dec 10, 2020 · 4fc3ece · 4fc3ece
1 parent 778b783
commit 4fc3ece
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/controllers/docluster_controller.go b/controllers/docluster_controller.go
@@ -166,14 +166,15 @@ func (r *DOClusterReconciler) reconcileDelete(ctx context.Context, clusterScope
 	if loadbalancer == nil {
 		clusterScope.V(2).Info("Unable to locate load balancer")
 		r.Recorder.Eventf(docluster, corev1.EventTypeWarning, "NoLoadBalancerFound", "Unable to find matching load balancer")
+		controllerutil.RemoveFinalizer(docluster, infrav1.ClusterFinalizer)
 		return reconcile.Result{}, nil
 	}
 
 	if err := networkingsvc.DeleteLoadBalancer(loadbalancer.ID); err != nil {
 		return reconcile.Result{}, errors.Wrapf(err, "error deleting load balancer for DOCluster %s/%s", docluster.Namespace, docluster.Name)
 	}
 
-	r.Recorder.Eventf(docluster, corev1.EventTypeNormal, "LoadBalancerDeleted", "Deleted a instance - %s", loadbalancer.Name)
+	r.Recorder.Eventf(docluster, corev1.EventTypeNormal, "LoadBalancerDeleted", "Deleted an LoadBalancer - %s", loadbalancer.Name)
 	// Cluster is deleted so remove the finalizer.
 	controllerutil.RemoveFinalizer(docluster, infrav1.ClusterFinalizer)
 	return reconcile.Result{}, nil

diff --git a/controllers/domachine_controller.go b/controllers/domachine_controller.go
@@ -273,6 +273,7 @@ func (r *DOMachineReconciler) reconcileDelete(ctx context.Context, machineScope
 	if droplet == nil {
 		clusterScope.V(2).Info("Unable to locate droplet instance")
 		r.Recorder.Eventf(domachine, corev1.EventTypeWarning, "NoInstanceFound", "Skip deleting")
+		controllerutil.RemoveFinalizer(domachine, infrav1.MachineFinalizer)
 		return reconcile.Result{}, nil
 	}