Implement paused condition for machine set controller

This change updates the machine set controller to set the paused condition
based on if the cluster or machine set resource is paused.

Author: theobarberbany

internal/controllers/machineset/machineset_controller.go

@@ -105,14 +105,14 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			handler.EnqueueRequestsFromMapFunc(r.MachineToMachineSets),
 		).
 		WithOptions(options).
-		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
+		WithEventFilter(predicates.ResourceHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
 		Watches(
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(clusterToMachineSets),
 			builder.WithPredicates(
 				// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
 				predicates.All(ctrl.LoggerFrom(ctx),
-					predicates.ClusterUnpaused(ctrl.LoggerFrom(ctx)),
+					predicates.ClusterCreateUpdateEvent(ctrl.LoggerFrom(ctx)),
 					predicates.ResourceHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 				),
 			),
@@ -153,12 +153,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 		return ctrl.Result{}, err
 	}
 
-	// Return early if the object or Cluster is paused.
-	if annotations.IsPaused(cluster, machineSet) {
-		log.Info("Reconciliation is paused for this object")
-		return ctrl.Result{}, nil
-	}
-
 	// Initialize the patch helper
 	patchHelper, err := patch.NewHelper(machineSet, r.Client)
 	if err != nil {
@@ -172,6 +166,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 		}
 	}()
 
+	// Return early if the object or Cluster is paused.
+	if annotations.IsPaused(cluster, machineSet) {
+		log.Info("Reconciliation is paused for this object")
+		conditions.MarkTrue(machineSet, clusterv1.PausedCondition)
+		return ctrl.Result{}, nil
+	}
+	conditions.MarkFalse(machineSet, clusterv1.PausedCondition, clusterv1.ResourceNotPausedReason, clusterv1.ConditionSeverityInfo, "Resource is operating as expected")
+
 	// Ignore deleted MachineSets, this can happen when foregroundDeletion
 	// is enabled
 	if !machineSet.DeletionTimestamp.IsZero() {

internal/controllers/machineset/machineset_controller_test.go

@@ -400,6 +400,36 @@ func TestMachineSetReconciler(t *testing.T) {
 			return conditions.IsTrue(instance, clusterv1.MachinesReadyCondition)
 		}, timeout).Should(BeTrue())
 
+		t.Log("Verifying MachineSet has PausedCondition")
+		// Start with Paused == False
+		g.Eventually(func() bool {
+			key := client.ObjectKey{Name: instance.Name, Namespace: instance.Namespace}
+			if err := env.Get(ctx, key, instance); err != nil {
+				return false
+			}
+			// Checks the condition is set
+			if !conditions.Has(instance, clusterv1.PausedCondition) {
+				return false
+			}
+
+			// The condition is set to false
+			return conditions.IsFalse(instance, clusterv1.PausedCondition)
+		}, timeout).Should(BeTrue())
+
+		// Pause the cluster
+		testCluster.Spec.Paused = true
+		g.Expect(env.Update(ctx, testCluster)).To(Succeed())
+
+		// The paused condition should eventually be true
+		g.Eventually(func() bool {
+			key := client.ObjectKey{Name: instance.Name, Namespace: instance.Namespace}
+			if err := env.Get(ctx, key, instance); err != nil {
+				return false
+			}
+
+			// The condition is set to false
+			return conditions.IsTrue(instance, clusterv1.PausedCondition)
+		}, timeout).Should(BeTrue())
 		// Validate that the controller set the cluster name label in selector.
 		g.Expect(instance.Status.Selector).To(ContainSubstring(testCluster.Name))
 	})