fix cluster deletion

controller/internal/controller/cluster_controller.go

@@ -89,7 +89,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req reconcile.Request
 
 	// Get Provider ID from the reference if it is set and ensure that controller reference is set properly.
 	providerId, result, err := r.getProviderIdAndSetControllerRef(ctx, cluster)
-	if result != nil {
+	if result != nil || err != nil {
 		utils.MarkCondition(cluster.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, "")
 		return *result, err
 	}
@@ -191,6 +191,11 @@ func (r *ClusterReconciler) addOrRemoveFinalizer(cluster *v1alpha1.Cluster) *ctr
 
 	// If object is being deleted cleanup and remove the finalizer.
 	if !cluster.ObjectMeta.DeletionTimestamp.IsZero() {
+		if cluster.Status.ID == nil {
+			controllerutil.RemoveFinalizer(cluster, ClusterFinalizer)
+			return &ctrl.Result{}
+		}
+
 		// If object is already being deleted from Console API requeue.
 		if r.ConsoleClient.IsClusterDeleting(cluster.Status.ID) {
 			return &requeue