Ensure running machines always contain hook annoation

Signed-off-by: Danil-Grigorev <[email protected]>

controlplane/internal/controllers/rke2controlplane_controller.go

@@ -550,21 +550,6 @@ func (r *RKE2ControlPlaneReconciler) reconcileNormal(
 	desiredReplicas := int(*rcp.Spec.Replicas)
 
 	switch {
-	case numMachines == desiredReplicas:
-		nonDeleteingMachines := controlPlane.Machines.Filter(collections.Not(collections.HasDeletionTimestamp))
-		for _, machine := range nonDeleteingMachines {
-			annotaions := machine.GetAnnotations()
-
-			if _, found := annotaions[controlplanev1.PreTerminateHookCleanupAnnotation]; !found {
-				annotaions[controlplanev1.PreTerminateHookCleanupAnnotation] = ""
-				machine.SetAnnotations(annotaions)
-			}
-		}
-
-		// Patch machine annoations
-		if err := controlPlane.PatchMachines(ctx); err != nil {
-			return ctrl.Result{}, err
-		}
 	// We are creating the first replica
 	case numMachines < desiredReplicas && numMachines == 0:
 		// Create new Machine w/ init
@@ -951,6 +936,22 @@ func (r *RKE2ControlPlaneReconciler) ClusterToRKE2ControlPlane(ctx context.Conte
 }
 
 func (r *RKE2ControlPlaneReconciler) reconcilePreTerminateHook(ctx context.Context, controlPlane *rke2.ControlPlane) (ctrl.Result, error) {
+	// Ensure that every active machine has the drain hook set
+	patchHookAnnotation := false
+	for _, machine := range controlPlane.Machines.Filter(collections.ActiveMachines) {
+		if _, exists := machine.Annotations[controlplanev1.PreTerminateHookCleanupAnnotation]; !exists {
+			machine.Annotations[controlplanev1.PreTerminateHookCleanupAnnotation] = ""
+			patchHookAnnotation = true
+		}
+	}
+
+	if patchHookAnnotation {
+		// Patch machine annoations
+		if err := controlPlane.PatchMachines(ctx); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	if !controlPlane.HasDeletingMachine() {
 		return ctrl.Result{}, nil
 	}