re-add predicate for paused

chrischdi · chrischdi · commit d0edb962d391 · 2025-03-17T12:15:28.000+01:00
diff --git a/controllers/vmware/serviceaccount_controller.go b/controllers/vmware/serviceaccount_controller.go
@@ -97,7 +97,7 @@ func AddServiceAccountProviderControllerToManager(ctx context.Context, controlle
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(clusterToSupervisorVSphereClusterFunc(r.Client)),
 		).
-		WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).
+		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).
 		WatchesRawSource(r.clusterCache.GetClusterSource("providerserviceaccount", clusterToSupervisorVSphereClusterFunc(r.Client))).
 		Complete(r)
 }
diff --git a/controllers/vmware/servicediscovery_controller.go b/controllers/vmware/servicediscovery_controller.go
@@ -116,7 +116,7 @@ func AddServiceDiscoveryControllerToManager(ctx context.Context, controllerManag
 			&clusterv1.Cluster{},
 			handler.EnqueueRequestsFromMapFunc(clusterToSupervisorVSphereClusterFunc(r.Client)),
 		).
-		WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).
+		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).
 		WatchesRawSource(r.clusterCache.GetClusterSource("servicediscovery/vspherecluster", clusterToSupervisorVSphereClusterFunc(r.Client))).
 		Complete(r)
 }
diff --git a/controllers/vmware/vspheremachinetemplate_controller.go b/controllers/vmware/vspheremachinetemplate_controller.go
@@ -56,7 +56,7 @@ func AddVSphereMachineTemplateControllerToManager(ctx context.Context, controlle
 			&vmoprv1.VirtualMachineClass{},
 			handler.EnqueueRequestsFromMapFunc(r.enqueueVirtualMachineClassToVSphereMachineTemplateRequests),
 		).
-		WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerContext.WatchFilterValue)).
+		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerContext.WatchFilterValue)).
 		Complete(r)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func AddServiceAccountProviderControllerToManager(ctx context.Context, controlle`
`97`	`97`	`&clusterv1.Cluster{},`
`98`	`98`	`handler.EnqueueRequestsFromMapFunc(clusterToSupervisorVSphereClusterFunc(r.Client)),`
`99`	`99`	`).`
`100`		`- WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).`
	`100`	`+ WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).`
`101`	`101`	`WatchesRawSource(r.clusterCache.GetClusterSource("providerserviceaccount", clusterToSupervisorVSphereClusterFunc(r.Client))).`
`102`	`102`	`Complete(r)`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func AddServiceDiscoveryControllerToManager(ctx context.Context, controllerManag`
`116`	`116`	`&clusterv1.Cluster{},`
`117`	`117`	`handler.EnqueueRequestsFromMapFunc(clusterToSupervisorVSphereClusterFunc(r.Client)),`
`118`	`118`	`).`
`119`		`- WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).`
	`119`	`+ WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerCtx.WatchFilterValue)).`
`120`	`120`	`WatchesRawSource(r.clusterCache.GetClusterSource("servicediscovery/vspherecluster", clusterToSupervisorVSphereClusterFunc(r.Client))).`
`121`	`121`	`Complete(r)`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func AddVSphereMachineTemplateControllerToManager(ctx context.Context, controlle`
`56`	`56`	`&vmoprv1.VirtualMachineClass{},`
`57`	`57`	`handler.EnqueueRequestsFromMapFunc(r.enqueueVirtualMachineClassToVSphereMachineTemplateRequests),`
`58`	`58`	`).`
`59`		`- WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerContext.WatchFilterValue)).`
	`59`	`+ WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, controllerManagerContext.WatchFilterValue)).`
`60`	`60`	`Complete(r)`
`61`	`61`	`}`
`62`	`62`