Skip to content

Commit 8adfd8f

Browse files
committed
add watch filter value to AzureASO... controllers
1 parent c410f02 commit 8adfd8f

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

exp/controllers/azureasomanagedcluster_controller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,29 @@ import (
2020
"context"
2121

2222
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha1"
23+
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
24+
"sigs.k8s.io/cluster-api/util/predicates"
2325
ctrl "sigs.k8s.io/controller-runtime"
2426
"sigs.k8s.io/controller-runtime/pkg/client"
2527
)
2628

2729
// AzureASOManagedClusterReconciler reconciles a AzureASOManagedCluster object.
2830
type AzureASOManagedClusterReconciler struct {
2931
client.Client
32+
WatchFilterValue string
3033
}
3134

3235
// SetupWithManager sets up the controller with the Manager.
3336
func (r *AzureASOManagedClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
37+
_, log, done := tele.StartSpanWithLogger(ctx,
38+
"controllers.AzureASOManagedClusterReconciler.SetupWithManager",
39+
tele.KVP("controller", infrav1exp.AzureASOManagedClusterKind),
40+
)
41+
defer done()
42+
3443
_, err := ctrl.NewControllerManagedBy(mgr).
3544
For(&infrav1exp.AzureASOManagedCluster{}).
45+
WithEventFilter(predicates.ResourceHasFilterLabel(log, r.WatchFilterValue)).
3646
Build(r)
3747
if err != nil {
3848
return err

exp/controllers/azureasomanagedcontrolplane_controller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,29 @@ import (
2020
"context"
2121

2222
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha1"
23+
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
24+
"sigs.k8s.io/cluster-api/util/predicates"
2325
ctrl "sigs.k8s.io/controller-runtime"
2426
"sigs.k8s.io/controller-runtime/pkg/client"
2527
)
2628

2729
// AzureASOManagedControlPlaneReconciler reconciles a AzureASOManagedControlPlane object.
2830
type AzureASOManagedControlPlaneReconciler struct {
2931
client.Client
32+
WatchFilterValue string
3033
}
3134

3235
// SetupWithManager sets up the controller with the Manager.
3336
func (r *AzureASOManagedControlPlaneReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
37+
_, log, done := tele.StartSpanWithLogger(ctx,
38+
"controllers.AzureASOManagedControlPlaneReconciler.SetupWithManager",
39+
tele.KVP("controller", infrav1exp.AzureASOManagedControlPlaneKind),
40+
)
41+
defer done()
42+
3443
_, err := ctrl.NewControllerManagedBy(mgr).
3544
For(&infrav1exp.AzureASOManagedControlPlane{}).
45+
WithEventFilter(predicates.ResourceHasFilterLabel(log, r.WatchFilterValue)).
3646
Build(r)
3747
if err != nil {
3848
return err

exp/controllers/azureasomanagedmachinepool_controller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,29 @@ import (
2020
"context"
2121

2222
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha1"
23+
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
24+
"sigs.k8s.io/cluster-api/util/predicates"
2325
ctrl "sigs.k8s.io/controller-runtime"
2426
"sigs.k8s.io/controller-runtime/pkg/client"
2527
)
2628

2729
// AzureASOManagedMachinePoolReconciler reconciles a AzureASOManagedMachinePool object.
2830
type AzureASOManagedMachinePoolReconciler struct {
2931
client.Client
32+
WatchFilterValue string
3033
}
3134

3235
// SetupWithManager sets up the controller with the Manager.
3336
func (r *AzureASOManagedMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
37+
_, log, done := tele.StartSpanWithLogger(ctx,
38+
"controllers.AzureASOManagedMachinePoolReconciler.SetupWithManager",
39+
tele.KVP("controller", infrav1exp.AzureASOManagedMachinePoolKind),
40+
)
41+
defer done()
42+
3443
_, err := ctrl.NewControllerManagedBy(mgr).
3544
For(&infrav1exp.AzureASOManagedMachinePool{}).
45+
WithEventFilter(predicates.ResourceHasFilterLabel(log, r.WatchFilterValue)).
3646
Build(r)
3747
if err != nil {
3848
return err

main.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,21 +502,24 @@ func registerControllers(ctx context.Context, mgr manager.Manager) {
502502

503503
if feature.Gates.Enabled(feature.ASOAPI) {
504504
if err := (&infrav1controllersexp.AzureASOManagedClusterReconciler{
505-
Client: mgr.GetClient(),
505+
Client: mgr.GetClient(),
506+
WatchFilterValue: watchFilterValue,
506507
}).SetupWithManager(ctx, mgr); err != nil {
507508
setupLog.Error(err, "unable to create controller", "controller", "AzureASOManagedCluster")
508509
os.Exit(1)
509510
}
510511

511512
if err := (&infrav1controllersexp.AzureASOManagedControlPlaneReconciler{
512-
Client: mgr.GetClient(),
513+
Client: mgr.GetClient(),
514+
WatchFilterValue: watchFilterValue,
513515
}).SetupWithManager(ctx, mgr); err != nil {
514516
setupLog.Error(err, "unable to create controller", "controller", "AzureASOManagedControlPlane")
515517
os.Exit(1)
516518
}
517519

518520
if err := (&infrav1controllersexp.AzureASOManagedMachinePoolReconciler{
519-
Client: mgr.GetClient(),
521+
Client: mgr.GetClient(),
522+
WatchFilterValue: watchFilterValue,
520523
}).SetupWithManager(ctx, mgr); err != nil {
521524
setupLog.Error(err, "unable to create controller", "controller", "AzureASOManagedMachinePool")
522525
os.Exit(1)

0 commit comments

Comments
 (0)