move finalizer earlier in the execution flow to handle update scenario

Author: jdanieck

api/v1alpha1/intelmachine_types.go

@@ -11,6 +11,8 @@ import (
 const (
 	// FreeInstanceFinalizer allows ReconcileIntelMachine to remove the instance from the Workload in the Inventory
 	FreeInstanceFinalizer = "intelmachine.infrastructure.cluster.x-k8s.io/free-instance"
+	// HostCleanupFinalizer - no longer used, but kept for backward compatibility
+	HostCleanupFinalizer = "intelmachine.infrastructure.cluster.x-k8s.io/host-cleanup"
 	// DeauthHostFinalizer allows ReconcileIntelMachine to deauthorize the host in the Inventory
 	DeauthHostFinalizer = "intelmachine.infrastructure.cluster.x-k8s.io/deauth-host"
 

internal/controller/intelmachine_controller.go

@@ -153,6 +153,19 @@ func (r *IntelMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 	}()
 
+	// Add finalizers to the IntelMachine if they are not already present.
+	if !controllerutil.ContainsFinalizer(rc.intelMachine, infrastructurev1alpha1.FreeInstanceFinalizer) ||
+		!controllerutil.ContainsFinalizer(rc.intelMachine, infrastructurev1alpha1.DeauthHostFinalizer) {
+		rc.log.Info("Adding finalizers to IntelMachine", "finalizers", []string{
+			infrastructurev1alpha1.FreeInstanceFinalizer,
+			infrastructurev1alpha1.DeauthHostFinalizer,
+		})
+		// FreeInstanceFinalizer is used to remove the instance from the Workload in Inventory.
+		controllerutil.AddFinalizer(rc.intelMachine, infrastructurev1alpha1.FreeInstanceFinalizer)
+		// DeauthHostFinalizer is used to deauthorize the host in Inventory.
+		controllerutil.AddFinalizer(rc.intelMachine, infrastructurev1alpha1.DeauthHostFinalizer)
+	}
+
 	// Handle deleted machines
 	if !rc.intelMachine.ObjectMeta.DeletionTimestamp.IsZero() {
 		return ctrl.Result{}, r.reconcileDelete(rc)
@@ -162,6 +175,7 @@ func (r *IntelMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	if requeue := r.reconcileNormal(rc); requeue {
 		return ctrl.Result{RequeueAfter: defaultRequeueAfter}, nil
 	}
+
 	return ctrl.Result{}, nil
 }
 
@@ -203,6 +217,11 @@ func (r *IntelMachineReconciler) reconcileDelete(rc IntelMachineReconcilerContex
 		return errors.Wrap(err, "failed to patch IntelMachine")
 	}
 
+	if controllerutil.ContainsFinalizer(rc.intelMachine, infrastructurev1alpha1.HostCleanupFinalizer) {
+		// upgrade scenario: remove the obsolete HostCleanupFinalizer
+		controllerutil.RemoveFinalizer(rc.intelMachine, infrastructurev1alpha1.HostCleanupFinalizer)
+	}
+
 	if controllerutil.ContainsFinalizer(rc.intelMachine, infrastructurev1alpha1.FreeInstanceFinalizer) {
 		// Remove the instance from the workload in Inventory
 		req := inventory.DeleteInstanceFromWorkloadInput{
@@ -331,12 +350,6 @@ func (r *IntelMachineReconciler) reconcileNormal(rc IntelMachineReconcilerContex
 	rc.intelMachine.Spec.ProviderID = &gmRes.Instance.Id
 	rc.intelMachine.Annotations[infrastructurev1alpha1.HostIdAnnotation] = gmRes.Host.Id
 	conditions.MarkTrue(rc.intelMachine, infrastructurev1alpha1.HostProvisionedCondition)
-
-	// Add finalizers.
-	// The FreeInstanceFinalizer is removed by the IntelMachine Reconciler after the host is freed in Inventory.
-	controllerutil.AddFinalizer(rc.intelMachine, infrastructurev1alpha1.FreeInstanceFinalizer)
-	// The DeauthHostFinalizer is removed by the IntelMachine Reconciler after the host is deauthorized in Inventory.
-	controllerutil.AddFinalizer(rc.intelMachine, infrastructurev1alpha1.DeauthHostFinalizer)
 	return false
 }