Follow new way of cluster pause handling

Author: jichenjc

controllers/helpers.go

@@ -17,32 +17,40 @@ limitations under the License.
 package controllers
 
 import (
+	"strings"
+
+	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
+	"k8s.io/apimachinery/pkg/runtime"
 	clusterutil "sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )
 
-// TODO: Move to Cluster API
-var pausePredicates = predicate.Funcs{
-	UpdateFunc: func(e event.UpdateEvent) bool {
-		return !isPaused(nil, e.MetaNew)
-	},
-	CreateFunc: func(e event.CreateEvent) bool {
-		return !isPaused(nil, e.Meta)
-	},
-	DeleteFunc: func(e event.DeleteEvent) bool {
-		return !isPaused(nil, e.Meta)
-	},
+func pausedPredicates(logger logr.Logger) predicate.Funcs {
+	return predicate.Funcs{
+		UpdateFunc: func(e event.UpdateEvent) bool {
+			return processIfUnpaused(logger.WithValues("predicate", "updateEvent"), e.ObjectNew, e.MetaNew)
+		},
+		CreateFunc: func(e event.CreateEvent) bool {
+			return processIfUnpaused(logger.WithValues("predicate", "createEvent"), e.Object, e.Meta)
+		},
+		DeleteFunc: func(e event.DeleteEvent) bool {
+			return processIfUnpaused(logger.WithValues("predicate", "deleteEvent"), e.Object, e.Meta)
+		},
+		GenericFunc: func(e event.GenericEvent) bool {
+			return processIfUnpaused(logger.WithValues("predicate", "genericEvent"), e.Object, e.Meta)
+		},
+	}
 }
 
-// TODO: Fix up Cluster API's clusterutil.IsPaused function
-func isPaused(cluster *clusterv1.Cluster, v metav1.Object) bool {
-	if cluster == nil {
-		cluster = &clusterv1.Cluster{
-			Spec: clusterv1.ClusterSpec{},
-		}
+func processIfUnpaused(logger logr.Logger, obj runtime.Object, meta metav1.Object) bool {
+	kind := strings.ToLower(obj.GetObjectKind().GroupVersionKind().Kind)
+	log := logger.WithValues("namespace", meta.GetNamespace(), kind, meta.GetName())
+	if clusterutil.HasPausedAnnotation(meta) {
+		log.V(4).Info("Resource is paused, will not attempt to map resource")
+		return false
 	}
-	return clusterutil.IsPaused(cluster, v)
+	log.V(4).Info("Resource is not paused, will attempt to map resource")
+	return true
 }

controllers/openstackcluster_controller.go

@@ -75,11 +75,6 @@ func (r *OpenStackClusterReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result,
 		return reconcile.Result{}, err
 	}
 
-	if isPaused(cluster, openStackCluster) {
-		log.Info("OpenStackCluster or linked Cluster is marked as paused. Won't reconcile")
-		return reconcile.Result{}, nil
-	}
-
 	if cluster == nil {
 		log.Info("Cluster Controller has not yet set OwnerRef")
 		return reconcile.Result{}, nil
@@ -441,6 +436,6 @@ func (r *OpenStackClusterReconciler) SetupWithManager(mgr ctrl.Manager, options
 	return ctrl.NewControllerManagedBy(mgr).
 		WithOptions(options).
 		For(&infrav1.OpenStackCluster{}).
-		WithEventFilter(pausePredicates).
+		WithEventFilter(pausedPredicates(r.Log)).
 		Complete(r)
 }

controllers/openstackmachine_controller.go

@@ -100,11 +100,6 @@ func (r *OpenStackMachineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result,
 		return ctrl.Result{}, nil
 	}
 
-	if isPaused(cluster, openStackMachine) {
-		logger.Info("OpenStackMachine or linked Cluster is marked as paused. Won't reconcile")
-		return ctrl.Result{}, nil
-	}
-
 	logger = logger.WithValues("cluster", cluster.Name)
 
 	openStackCluster := &infrav1.OpenStackCluster{}
@@ -158,7 +153,7 @@ func (r *OpenStackMachineReconciler) SetupWithManager(mgr ctrl.Manager, options
 			&source.Kind{Type: &infrav1.OpenStackCluster{}},
 			&handler.EnqueueRequestsFromMapFunc{ToRequests: handler.ToRequestsFunc(r.OpenStackClusterToOpenStackMachines)},
 		).
-		WithEventFilter(pausePredicates).
+		WithEventFilter(pausedPredicates(r.Log)).
 		Build(r)
 
 	if err != nil {