More watchers missing filter label

fiunchinho · fiunchinho · commit 17fecefc533c · 2021-08-19T12:05:22.000+02:00
diff --git a/controllers/azurecluster_controller.go b/controllers/azurecluster_controller.go
@@ -93,6 +93,7 @@ func (r *AzureClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1.GroupVersion.WithKind("AzureCluster"))),
 		predicates.ClusterUnpaused(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}
diff --git a/controllers/azureidentity_controller.go b/controllers/azureidentity_controller.go
@@ -84,6 +84,7 @@ func (r *AzureIdentityReconciler) SetupWithManager(ctx context.Context, mgr ctrl
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1.GroupVersion.WithKind("AzureCluster"))),
 		predicates.ClusterUnpaused(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}
diff --git a/controllers/azuremachine_controller.go b/controllers/azuremachine_controller.go
@@ -113,6 +113,7 @@ func (r *AzureMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(azureMachineMapper),
 		predicates.ClusterUnpausedAndInfrastructureReady(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}
diff --git a/exp/controllers/azuremachinepool_controller.go b/exp/controllers/azuremachinepool_controller.go
@@ -126,6 +126,7 @@ func (ampr *AzureMachinePoolReconciler) SetupWithManager(ctx context.Context, mg
 		&source.Kind{Type: &infrav1exp.AzureMachinePoolMachine{}},
 		handler.EnqueueRequestsFromMapFunc(AzureMachinePoolMachineMapper(mgr.GetScheme(), log)),
 		MachinePoolMachineHasStateOrVersionChange(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), ampr.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for AzureMachinePoolMachine")
 	}
@@ -140,6 +141,7 @@ func (ampr *AzureMachinePoolReconciler) SetupWithManager(ctx context.Context, mg
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(azureMachinePoolMapper),
 		predicates.ClusterUnpausedAndInfrastructureReady(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), ampr.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}
diff --git a/exp/controllers/azuremachinepoolmachine_controller.go b/exp/controllers/azuremachinepoolmachine_controller.go
@@ -109,6 +109,7 @@ func (ampmr *AzureMachinePoolMachineController) SetupWithManager(ctx context.Con
 		&source.Kind{Type: &infrav1exp.AzureMachinePool{}},
 		handler.EnqueueRequestsFromMapFunc(AzureMachinePoolToAzureMachinePoolMachines(ctx, mgr.GetClient(), log)),
 		MachinePoolModelHasChanged(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), ampmr.WatchFilterValue),
 	); err != nil {
 		return errors.Wrapf(err, "failed adding a watch for AzureMachinePool model changes")
 	}
diff --git a/exp/controllers/azuremanagedcluster_controller.go b/exp/controllers/azuremanagedcluster_controller.go
@@ -83,6 +83,7 @@ func (r *AzureManagedClusterReconciler) SetupWithManager(ctx context.Context, mg
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1exp.GroupVersion.WithKind("AzureManagedCluster"))),
 		predicates.ClusterUnpaused(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}
diff --git a/exp/controllers/azuremanagedcontrolplane_controller.go b/exp/controllers/azuremanagedcontrolplane_controller.go
@@ -95,6 +95,7 @@ func (r *AzureManagedControlPlaneReconciler) SetupWithManager(ctx context.Contex
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1exp.GroupVersion.WithKind("AzureManagedControlPlane"))),
 		predicates.ClusterUnpausedAndInfrastructureReady(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}
diff --git a/exp/controllers/azuremanagedmachinepool_controller.go b/exp/controllers/azuremanagedmachinepool_controller.go
@@ -108,6 +108,7 @@ func (r *AzureManagedMachinePoolReconciler) SetupWithManager(ctx context.Context
 		&source.Kind{Type: &clusterv1.Cluster{}},
 		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1exp.GroupVersion.WithKind("AzureManagedMachinePool"))),
 		predicates.ClusterUnpausedAndInfrastructureReady(log),
+		predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),
 	); err != nil {
 		return errors.Wrap(err, "failed adding a watch for ready clusters")
 	}

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ func (r *AzureClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.`
`93`	`93`	`&source.Kind{Type: &clusterv1.Cluster{}},`
`94`	`94`	`handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1.GroupVersion.WithKind("AzureCluster"))),`
`95`	`95`	`predicates.ClusterUnpaused(log),`
	`96`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),`
`96`	`97`	`); err != nil {`
`97`	`98`	`return errors.Wrap(err, "failed adding a watch for ready clusters")`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ func (r *AzureIdentityReconciler) SetupWithManager(ctx context.Context, mgr ctrl`
`84`	`84`	`&source.Kind{Type: &clusterv1.Cluster{}},`
`85`	`85`	`handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1.GroupVersion.WithKind("AzureCluster"))),`
`86`	`86`	`predicates.ClusterUnpaused(log),`
	`87`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),`
`87`	`88`	`); err != nil {`
`88`	`89`	`return errors.Wrap(err, "failed adding a watch for ready clusters")`
`89`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ func (r *AzureMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl.`
`113`	`113`	`&source.Kind{Type: &clusterv1.Cluster{}},`
`114`	`114`	`handler.EnqueueRequestsFromMapFunc(azureMachineMapper),`
`115`	`115`	`predicates.ClusterUnpausedAndInfrastructureReady(log),`
	`116`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),`
`116`	`117`	`); err != nil {`
`117`	`118`	`return errors.Wrap(err, "failed adding a watch for ready clusters")`
`118`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ func (ampmr *AzureMachinePoolMachineController) SetupWithManager(ctx context.Con`
`109`	`109`	`&source.Kind{Type: &infrav1exp.AzureMachinePool{}},`
`110`	`110`	`handler.EnqueueRequestsFromMapFunc(AzureMachinePoolToAzureMachinePoolMachines(ctx, mgr.GetClient(), log)),`
`111`	`111`	`MachinePoolModelHasChanged(log),`
	`112`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), ampmr.WatchFilterValue),`
`112`	`113`	`); err != nil {`
`113`	`114`	`return errors.Wrapf(err, "failed adding a watch for AzureMachinePool model changes")`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ func (r *AzureManagedClusterReconciler) SetupWithManager(ctx context.Context, mg`
`83`	`83`	`&source.Kind{Type: &clusterv1.Cluster{}},`
`84`	`84`	`handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1exp.GroupVersion.WithKind("AzureManagedCluster"))),`
`85`	`85`	`predicates.ClusterUnpaused(log),`
	`86`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),`
`86`	`87`	`); err != nil {`
`87`	`88`	`return errors.Wrap(err, "failed adding a watch for ready clusters")`
`88`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ func (r *AzureManagedControlPlaneReconciler) SetupWithManager(ctx context.Contex`
`95`	`95`	`&source.Kind{Type: &clusterv1.Cluster{}},`
`96`	`96`	`handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1exp.GroupVersion.WithKind("AzureManagedControlPlane"))),`
`97`	`97`	`predicates.ClusterUnpausedAndInfrastructureReady(log),`
	`98`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),`
`98`	`99`	`); err != nil {`
`99`	`100`	`return errors.Wrap(err, "failed adding a watch for ready clusters")`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ func (r *AzureManagedMachinePoolReconciler) SetupWithManager(ctx context.Context`
`108`	`108`	`&source.Kind{Type: &clusterv1.Cluster{}},`
`109`	`109`	`handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(infrav1exp.GroupVersion.WithKind("AzureManagedMachinePool"))),`
`110`	`110`	`predicates.ClusterUnpausedAndInfrastructureReady(log),`
	`111`	`+ predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue),`
`111`	`112`	`); err != nil {`
`112`	`113`	`return errors.Wrap(err, "failed adding a watch for ready clusters")`
`113`	`114`	`}`