machine: set v1beta2 Paused condition

Author: chrischdi

internal/controllers/machine/machine_controller.go

@@ -55,6 +55,7 @@ import (
 	"sigs.k8s.io/cluster-api/util/finalizers"
 	clog "sigs.k8s.io/cluster-api/util/log"
 	"sigs.k8s.io/cluster-api/util/patch"
+	"sigs.k8s.io/cluster-api/util/paused"
 	"sigs.k8s.io/cluster-api/util/predicates"
 )
 
@@ -121,15 +122,13 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 	c, err := ctrl.NewControllerManagedBy(mgr).
 		For(&clusterv1.Machine{}).
 		WithOptions(options).
-		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
 		Watches(
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(clusterToMachines),
 			builder.WithPredicates(
 				// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
 				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.Any(mgr.GetScheme(), predicateLog,
-						predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 						predicates.ClusterControlPlaneInitialized(mgr.GetScheme(), predicateLog),
 					),
 					predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
@@ -195,17 +194,15 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 			m.Spec.ClusterName, m.Name, m.Namespace)
 	}
 
+	if isPaused, conditionChanged, err := paused.EnsurePausedCondition(ctx, r.Client, cluster, m); err != nil || isPaused || conditionChanged {
+		return ctrl.Result{}, err
+	}
+
 	s := &scope{
 		cluster: cluster,
 		machine: m,
 	}
 
-	// Return early if the object or Cluster is paused.
-	if annotations.IsPaused(cluster, m) {
-		log.Info("Reconciliation is paused for this object")
-		return ctrl.Result{}, setPausedCondition(ctx, r.Client, s)
-	}
-
 	// Initialize the patch helper
 	patchHelper, err := patch.NewHelper(m, r.Client)
 	if err != nil {
@@ -304,7 +301,6 @@ func patchMachine(ctx context.Context, patchHelper *patch.Helper, machine *clust
 			clusterv1.MachineNodeReadyV1Beta2Condition,
 			clusterv1.MachineNodeHealthyV1Beta2Condition,
 			clusterv1.MachineDeletingV1Beta2Condition,
-			clusterv1.MachinePausedV1Beta2Condition,
 		}},
 	)
 

internal/controllers/machine/machine_controller_status.go

@@ -27,13 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/internal/contract"
-	"sigs.k8s.io/cluster-api/util/annotations"
 	v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
-	"sigs.k8s.io/cluster-api/util/patch"
 )
 
 // reconcileStatus reconciles Machine's status during the entire lifecycle of the machine.
@@ -72,8 +69,6 @@ func (r *Reconciler) reconcileStatus(ctx context.Context, s *scope) {
 
 	// TODO: Update the Deleting condition.
 
-	unsetPausedCondition(s)
-
 	setMachinePhaseAndLastUpdated(ctx, s.machine)
 }
 
@@ -539,40 +534,6 @@ func setAvailableCondition(_ context.Context, machine *clusterv1.Machine) {
 	})
 }
 
-func setPausedCondition(ctx context.Context, c client.Client, s *scope) error {
-	patchHelper, err := patch.NewHelper(s.machine, c)
-	if err != nil {
-		return err
-	}
-
-	var messages []string
-	if s.cluster.Spec.Paused {
-		messages = append(messages, "Cluster spec.paused is set to true")
-	}
-	if annotations.HasPaused(s.machine) {
-		messages = append(messages, "Machine has the cluster.x-k8s.io/paused annotation")
-	}
-	v1beta2conditions.Set(s.machine, metav1.Condition{
-		Type:    clusterv1.MachinePausedV1Beta2Condition,
-		Status:  metav1.ConditionTrue,
-		Reason:  clusterv1.PausedV1Beta2Reason,
-		Message: strings.Join(messages, ", "),
-	})
-
-	return patchHelper.Patch(ctx, s.machine, patch.WithOwnedV1Beta2Conditions{Conditions: []string{
-		clusterv1.MachinePausedV1Beta2Condition,
-	}})
-}
-
-func unsetPausedCondition(s *scope) {
-	// Note: If we hit this code, the controller is reconciling and this Paused condition must be set to false.
-	v1beta2conditions.Set(s.machine, metav1.Condition{
-		Type:   clusterv1.MachinePausedV1Beta2Condition,
-		Status: metav1.ConditionFalse,
-		Reason: clusterv1.NotPausedV1Beta2Reason,
-	})
-}
-
 func setMachinePhaseAndLastUpdated(_ context.Context, m *clusterv1.Machine) {
 	originalPhase := m.Status.Phase