Log object kind in Any and Or Predicates

Karthik-K-N · Karthik-K-N · commit 3df14955d481 · 2024-10-07T14:02:24.000+05:30
diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
@@ -130,7 +130,7 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
 		&clusterv1.Cluster{},
 		handler.EnqueueRequestsFromMapFunc(r.ClusterToKubeadmConfigs),
 		builder.WithPredicates(
-			predicates.All(predicateLog,
+			predicates.All(mgr.GetScheme(), predicateLog,
 				predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
 				predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
 			),
diff --git a/controlplane/kubeadm/internal/controllers/controller.go b/controlplane/kubeadm/internal/controllers/controller.go
@@ -103,7 +103,7 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(r.ClusterToKubeadmControlPlane),
 			builder.WithPredicates(
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
 					predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
 				),
diff --git a/exp/internal/controllers/machinepool_controller.go b/exp/internal/controllers/machinepool_controller.go
@@ -114,7 +114,7 @@ func (r *MachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M
 			handler.EnqueueRequestsFromMapFunc(clusterToMachinePools),
 			// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
 			builder.WithPredicates(
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 					predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
 				),
diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go
@@ -125,8 +125,8 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			handler.EnqueueRequestsFromMapFunc(clusterToMachines),
 			builder.WithPredicates(
 				// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
-				predicates.All(predicateLog,
-					predicates.Any(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
+					predicates.Any(mgr.GetScheme(), predicateLog,
 						predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 						predicates.ClusterControlPlaneInitialized(mgr.GetScheme(), predicateLog),
 					),
diff --git a/internal/controllers/machinedeployment/machinedeployment_controller.go b/internal/controllers/machinedeployment/machinedeployment_controller.go
@@ -99,7 +99,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			handler.EnqueueRequestsFromMapFunc(clusterToMachineDeployments),
 			builder.WithPredicates(
 				// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 				),
 			),
diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
@@ -99,7 +99,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			handler.EnqueueRequestsFromMapFunc(r.clusterToMachineHealthCheck),
 			builder.WithPredicates(
 				// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 					predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
 				),
diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go
@@ -122,7 +122,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			handler.EnqueueRequestsFromMapFunc(clusterToMachineSets),
 			builder.WithPredicates(
 				// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 					predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
 				),
diff --git a/internal/controllers/topology/machinedeployment/machinedeployment_controller.go b/internal/controllers/topology/machinedeployment/machinedeployment_controller.go
@@ -67,7 +67,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 	err = ctrl.NewControllerManagedBy(mgr).
 		For(&clusterv1.MachineDeployment{},
 			builder.WithPredicates(
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ResourceIsTopologyOwned(mgr.GetScheme(), predicateLog),
 					predicates.ResourceNotPaused(mgr.GetScheme(), predicateLog)),
 			),
@@ -79,7 +79,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(clusterToMachineDeployments),
 			builder.WithPredicates(
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 					predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
 				),
diff --git a/internal/controllers/topology/machineset/machineset_controller.go b/internal/controllers/topology/machineset/machineset_controller.go
@@ -69,7 +69,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 	err = ctrl.NewControllerManagedBy(mgr).
 		For(&clusterv1.MachineSet{},
 			builder.WithPredicates(
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ResourceIsTopologyOwned(mgr.GetScheme(), predicateLog),
 					predicates.ResourceNotPaused(mgr.GetScheme(), predicateLog)),
 			),
@@ -81,7 +81,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(clusterToMachineSets),
 			builder.WithPredicates(
-				predicates.All(predicateLog,
+				predicates.All(mgr.GetScheme(), predicateLog,
 					predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
 					predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
 				),
diff --git a/util/predicates/cluster_predicates.go b/util/predicates/cluster_predicates.go
@@ -175,7 +175,7 @@ func ClusterUnpaused(scheme *runtime.Scheme, logger logr.Logger) predicate.Funcs
 	log := logger.WithValues("predicate", "ClusterUnpaused")
 
 	// Use any to ensure we process either create or update events we care about
-	return Any(log, ClusterCreateNotPaused(scheme, log), ClusterUpdateUnpaused(scheme, log))
+	return Any(scheme, log, ClusterCreateNotPaused(scheme, log), ClusterUpdateUnpaused(scheme, log))
 }
 
 // ClusterControlPlaneInitialized returns a Predicate that returns true on Update events
@@ -234,13 +234,13 @@ func ClusterUnpausedAndInfrastructureReady(scheme *runtime.Scheme, logger logr.L
 	log := logger.WithValues("predicate", "ClusterUnpausedAndInfrastructureReady")
 
 	// Only continue processing create events if both not paused and infrastructure is ready
-	createPredicates := All(log, ClusterCreateNotPaused(scheme, log), ClusterCreateInfraReady(scheme, log))
+	createPredicates := All(scheme, log, ClusterCreateNotPaused(scheme, log), ClusterCreateInfraReady(scheme, log))
 
 	// Process update events if either Cluster is unpaused or infrastructure becomes ready
-	updatePredicates := Any(log, ClusterUpdateUnpaused(scheme, log), ClusterUpdateInfraReady(scheme, log))
+	updatePredicates := Any(scheme, log, ClusterUpdateUnpaused(scheme, log), ClusterUpdateInfraReady(scheme, log))
 
 	// Use any to ensure we process either create or update events we care about
-	return Any(log, createPredicates, updatePredicates)
+	return Any(scheme, log, createPredicates, updatePredicates)
 }
 
 // ClusterHasTopology returns a Predicate that returns true when cluster.Spec.Topology
diff --git a/util/predicates/generic_predicates.go b/util/predicates/generic_predicates.go
@@ -30,10 +30,13 @@ import (
 )
 
 // All returns a predicate that returns true only if all given predicates return true.
-func All(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
+func All(scheme *runtime.Scheme, logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			log := logger.WithValues("predicateAggregation", "All")
+			if gvk, err := apiutil.GVKForObject(e.ObjectNew, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.ObjectNew))
+			}
 			for _, p := range predicates {
 				if !p.UpdateFunc(e) {
 					log.V(6).Info("One of the provided predicates returned false, blocking further processing")
@@ -45,6 +48,9 @@ func All(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 		},
 		CreateFunc: func(e event.CreateEvent) bool {
 			log := logger.WithValues("predicateAggregation", "All")
+			if gvk, err := apiutil.GVKForObject(e.Object, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.Object))
+			}
 			for _, p := range predicates {
 				if !p.CreateFunc(e) {
 					log.V(6).Info("One of the provided predicates returned false, blocking further processing")
@@ -56,6 +62,9 @@ func All(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 		},
 		DeleteFunc: func(e event.DeleteEvent) bool {
 			log := logger.WithValues("predicateAggregation", "All")
+			if gvk, err := apiutil.GVKForObject(e.Object, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.Object))
+			}
 			for _, p := range predicates {
 				if !p.DeleteFunc(e) {
 					log.V(6).Info("One of the provided predicates returned false, blocking further processing")
@@ -67,6 +76,9 @@ func All(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 		},
 		GenericFunc: func(e event.GenericEvent) bool {
 			log := logger.WithValues("predicateAggregation", "All")
+			if gvk, err := apiutil.GVKForObject(e.Object, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.Object))
+			}
 			for _, p := range predicates {
 				if !p.GenericFunc(e) {
 					log.V(6).Info("One of the provided predicates returned false, blocking further processing")
@@ -80,10 +92,13 @@ func All(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 }
 
 // Any returns a predicate that returns true only if any given predicate returns true.
-func Any(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
+func Any(scheme *runtime.Scheme, logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			log := logger.WithValues("predicateAggregation", "Any")
+			if gvk, err := apiutil.GVKForObject(e.ObjectNew, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.ObjectNew))
+			}
 			for _, p := range predicates {
 				if p.UpdateFunc(e) {
 					log.V(6).Info("One of the provided predicates returned true, allowing further processing")
@@ -95,6 +110,9 @@ func Any(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 		},
 		CreateFunc: func(e event.CreateEvent) bool {
 			log := logger.WithValues("predicateAggregation", "Any")
+			if gvk, err := apiutil.GVKForObject(e.Object, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.Object))
+			}
 			for _, p := range predicates {
 				if p.CreateFunc(e) {
 					log.V(6).Info("One of the provided predicates returned true, allowing further processing")
@@ -106,6 +124,9 @@ func Any(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 		},
 		DeleteFunc: func(e event.DeleteEvent) bool {
 			log := logger.WithValues("predicateAggregation", "Any")
+			if gvk, err := apiutil.GVKForObject(e.Object, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.Object))
+			}
 			for _, p := range predicates {
 				if p.DeleteFunc(e) {
 					log.V(6).Info("One of the provided predicates returned true, allowing further processing")
@@ -117,6 +138,9 @@ func Any(logger logr.Logger, predicates ...predicate.Funcs) predicate.Funcs {
 		},
 		GenericFunc: func(e event.GenericEvent) bool {
 			log := logger.WithValues("predicateAggregation", "Any")
+			if gvk, err := apiutil.GVKForObject(e.Object, scheme); err == nil {
+				log = log.WithValues(gvk.Kind, klog.KObj(e.Object))
+			}
 			for _, p := range predicates {
 				if p.GenericFunc(e) {
 					log.V(6).Info("One of the provided predicates returned true, allowing further processing")
@@ -182,7 +206,7 @@ func ResourceNotPaused(scheme *runtime.Scheme, logger logr.Logger) predicate.Fun
 // ResourceNotPausedAndHasFilterLabel returns a predicate that returns true only if the
 // ResourceNotPaused and ResourceHasFilterLabel predicates return true.
 func ResourceNotPausedAndHasFilterLabel(scheme *runtime.Scheme, logger logr.Logger, labelValue string) predicate.Funcs {
-	return All(logger, ResourceNotPaused(scheme, logger), ResourceHasFilterLabel(scheme, logger, labelValue))
+	return All(scheme, logger, ResourceNotPaused(scheme, logger), ResourceHasFilterLabel(scheme, logger, labelValue))
 }
 
 func processIfNotPaused(scheme *runtime.Scheme, logger logr.Logger, obj client.Object) bool {
