🐛 Fix deletion patch error (#167)

**What is the purpose of this pull request/Why do we need it?**

Cherry pick of #163 for release 0.2.1

Co-authored-by: lubedacht <[email protected]>

Author: jriedel-ionos

internal/controller/ionoscloudmachine_controller.go

@@ -215,7 +215,7 @@ func (r *IonosCloudMachineReconciler) reconcileDelete(
 
 	if requeue {
 		log.Info("Deletion request is still in progress")
-		return ctrl.Result{RequeueAfter: defaultReconcileDuration}, nil
+		return ctrl.Result{RequeueAfter: reducedReconcileDuration}, nil
 	}
 
 	reconcileSequence := []serviceReconcileStep[scope.Machine]{
@@ -237,7 +237,6 @@ func (r *IonosCloudMachineReconciler) reconcileDelete(
 			return ctrl.Result{RequeueAfter: defaultReconcileDuration}, err
 		}
 	}
-
 	controllerutil.RemoveFinalizer(machineScope.IonosMachine, infrav1.MachineFinalizer)
 	return ctrl.Result{}, nil
 }
@@ -286,6 +285,12 @@ func (*IonosCloudMachineReconciler) checkRequestStates(
 					return nil
 				},
 			)
+
+			// We need to patch the machine during the deletion phase to make sure we do
+			// not have a diff in the status during the final patch when the finalizer is removed.
+			if !machineScope.IonosMachine.DeletionTimestamp.IsZero() {
+				requeue, retErr = true, machineScope.PatchObject()
+			}
 		}
 	}
 

internal/controller/util.go

@@ -36,6 +36,7 @@ import (
 
 const (
 	defaultReconcileDuration = time.Second * 20
+	reducedReconcileDuration = time.Second * 10
 )
 
 type serviceReconcileStep[T scope.Cluster | scope.Machine] struct {