Machine controller: drop ClusterUnpaused predicate

This change drops the ClusterUnpaused predicate, in favour of one that
will reconcile both paused and unpaused clusters. This is to enable the
setting of the Paused condition.

Author: theobarberbany

internal/controllers/machine/machine_controller.go

@@ -116,15 +116,15 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 	c, err := ctrl.NewControllerManagedBy(mgr).
 		For(&clusterv1.Machine{}).
 		WithOptions(options).
-		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
+		WithEventFilter(predicates.ResourceHasFilterLabel(ctrl.LoggerFrom(ctx), 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(ctrl.LoggerFrom(ctx),
 					predicates.Any(ctrl.LoggerFrom(ctx),
-						predicates.ClusterUnpaused(ctrl.LoggerFrom(ctx)),
+						predicates.ClusterCreateUpdateEvent(ctrl.LoggerFrom(ctx)),
 						predicates.ClusterControlPlaneInitialized(ctrl.LoggerFrom(ctx)),
 					),
 					predicates.ResourceHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
@@ -206,7 +206,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 	// Return early and set the paused condition to True if the object or Cluster
 	// is paused.
 	if annotations.IsPaused(cluster, m) {
-		log.Info("Reconciliation is paused for this object")
+		log.Info("Reconciliation is paused for this object, setting Paused condition")
 		conditions.MarkTrue(m, clusterv1.PausedCondition)
 		return ctrl.Result{}, nil
 	}

util/predicates/cluster_predicates.go

@@ -168,6 +168,49 @@ func ClusterUnpaused(logger logr.Logger) predicate.Funcs {
 	return Any(log, ClusterCreateNotPaused(log), ClusterUpdateUnpaused(log))
 }
 
+func ClusterCreateUpdateEvent(logger logr.Logger) predicate.Funcs {
+	return predicate.Funcs{
+		UpdateFunc: func(e event.UpdateEvent) bool {
+			log := logger.WithValues("predicate", "ClusterUpdatePauseUnpause", "eventType", "update")
+
+			oldCluster, ok := e.ObjectOld.(*clusterv1.Cluster)
+			if !ok {
+				log.V(4).Info("Expected Cluster", "type", fmt.Sprintf("%T", e.ObjectOld))
+				return false
+			}
+			log = log.WithValues("Cluster", klog.KObj(oldCluster))
+
+			newCluster := e.ObjectNew.(*clusterv1.Cluster)
+
+			if oldCluster.Spec.Paused && !newCluster.Spec.Paused {
+				log.V(4).Info("Cluster was unpaused, allowing further processing")
+				return true
+			}
+
+			if !oldCluster.Spec.Paused && newCluster.Spec.Paused {
+				log.V(4).Info("Cluster was paused, allowing further processing to update condition")
+				return true
+			}
+
+			return false
+		},
+		CreateFunc: func(e event.CreateEvent) bool {
+			log := logger.WithValues("predicate", "ClusterCreate", "eventType", "create")
+
+			c, ok := e.Object.(*clusterv1.Cluster)
+			if !ok {
+				log.V(4).Info("Expected Cluster", "type", fmt.Sprintf("%T", e.Object))
+				return false
+			}
+			log = log.WithValues("Cluster", klog.KObj(c))
+
+			return true
+		},
+		DeleteFunc:  func(event.DeleteEvent) bool { return false },
+		GenericFunc: func(event.GenericEvent) bool { return false },
+	}
+}
+
 // ClusterControlPlaneInitialized returns a Predicate that returns true on Update events
 // when ControlPlaneInitializedCondition on a Cluster changes to true.
 // Example use: