Don't return the error if pooled machines were deleted (#1187)

Signed-off-by: Alexey Makhov <[email protected]>
Signed-off-by: makhov <[email protected]>

Author: makhov

internal/controller/infrastructure/cluster_controller.go

@@ -51,10 +51,12 @@ func (r *ClusterController) Reconcile(ctx context.Context, req ctrl.Request) (re
 	}
 
 	// Nothing really to do, except put the cluster in a ready state
-	c.Status.Ready = true
-	if err := r.Status().Update(ctx, c); err != nil {
-		log.Error(err, "Failed to update RemoteCluster status")
-		return ctrl.Result{}, err
+	if c.ObjectMeta.DeletionTimestamp.IsZero() {
+		c.Status.Ready = true
+		if err := r.Status().Update(ctx, c); err != nil {
+			log.Error(err, "Failed to update RemoteCluster status")
+			return ctrl.Result{}, err
+		}
 	}
 
 	return ctrl.Result{}, nil

internal/controller/infrastructure/remote_machine_controller.go

@@ -357,6 +357,9 @@ func (r *RemoteMachineController) returnMachineToPool(ctx context.Context, rm *i
 		return fmt.Errorf("failed to list pooled machines: %w", err)
 	}
 	if len(pooledMachines.Items) == 0 {
+		if !rm.DeletionTimestamp.IsZero() {
+			return nil
+		}
 		return fmt.Errorf("no pooled machines found for pool %s", pool)
 	}