Skip to content

Commit 07088c2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5089 from nojnhuh/aso-concurrency
honor *-concurrency flags for ASO API controllers
2 parents c016964 + 6b2e3ec commit 07088c2

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

‎controllers/agentpooladopt_controller.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
3232
ctrl "sigs.k8s.io/controller-runtime"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
34+
"sigs.k8s.io/controller-runtime/pkg/controller"
3435
"sigs.k8s.io/controller-runtime/pkg/event"
3536
"sigs.k8s.io/controller-runtime/pkg/predicate"
3637
)
@@ -41,8 +42,9 @@ type AgentPoolAdoptReconciler struct {
4142
}
4243

4344
// SetupWithManager sets up the controller with the Manager.
44-
func (r *AgentPoolAdoptReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
45+
func (r *AgentPoolAdoptReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
4546
_, err := ctrl.NewControllerManagedBy(mgr).
47+
WithOptions(options).
4648
For(&asocontainerservicev1.ManagedClustersAgentPool{}).
4749
WithEventFilter(predicate.Funcs{
4850
UpdateFunc: func(ev event.UpdateEvent) bool {

‎controllers/azureasomanagedcluster_controller.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/builder"
3737
"sigs.k8s.io/controller-runtime/pkg/client"
38+
"sigs.k8s.io/controller-runtime/pkg/controller"
3839
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3940
"sigs.k8s.io/controller-runtime/pkg/event"
4041
"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -66,14 +67,15 @@ type resourceReconciler interface {
6667
}
6768

6869
// SetupWithManager sets up the controller with the Manager.
69-
func (r *AzureASOManagedClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
70+
func (r *AzureASOManagedClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
7071
ctx, log, done := tele.StartSpanWithLogger(ctx,
7172
"controllers.AzureASOManagedClusterReconciler.SetupWithManager",
7273
tele.KVP("controller", infrav1alpha.AzureASOManagedClusterKind),
7374
)
7475
defer done()
7576

7677
c, err := ctrl.NewControllerManagedBy(mgr).
78+
WithOptions(options).
7779
For(&infrav1alpha.AzureASOManagedCluster{}).
7880
WithEventFilter(predicates.ResourceHasFilterLabel(log, r.WatchFilterValue)).
7981
WithEventFilter(predicates.ResourceIsNotExternallyManaged(log)).

‎controllers/azureasomanagedcontrolplane_controller.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
ctrl "sigs.k8s.io/controller-runtime"
4040
"sigs.k8s.io/controller-runtime/pkg/builder"
4141
"sigs.k8s.io/controller-runtime/pkg/client"
42+
"sigs.k8s.io/controller-runtime/pkg/controller"
4243
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4344
"sigs.k8s.io/controller-runtime/pkg/handler"
4445
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -55,14 +56,15 @@ type AzureASOManagedControlPlaneReconciler struct {
5556
}
5657

5758
// SetupWithManager sets up the controller with the Manager.
58-
func (r *AzureASOManagedControlPlaneReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
59+
func (r *AzureASOManagedControlPlaneReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
5960
_, log, done := tele.StartSpanWithLogger(ctx,
6061
"controllers.AzureASOManagedControlPlaneReconciler.SetupWithManager",
6162
tele.KVP("controller", infrav1alpha.AzureASOManagedControlPlaneKind),
6263
)
6364
defer done()
6465

6566
c, err := ctrl.NewControllerManagedBy(mgr).
67+
WithOptions(options).
6668
For(&infrav1alpha.AzureASOManagedControlPlane{}).
6769
WithEventFilter(predicates.ResourceHasFilterLabel(log, r.WatchFilterValue)).
6870
Watches(&clusterv1.Cluster{},

‎controllers/azureasomanagedmachinepool_controller.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
ctrl "sigs.k8s.io/controller-runtime"
4242
"sigs.k8s.io/controller-runtime/pkg/builder"
4343
"sigs.k8s.io/controller-runtime/pkg/client"
44+
"sigs.k8s.io/controller-runtime/pkg/controller"
4445
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4546
"sigs.k8s.io/controller-runtime/pkg/handler"
4647
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -61,7 +62,7 @@ type ClusterTracker interface {
6162
}
6263

6364
// SetupWithManager sets up the controller with the Manager.
64-
func (r *AzureASOManagedMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
65+
func (r *AzureASOManagedMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
6566
_, log, done := tele.StartSpanWithLogger(ctx,
6667
"controllers.AzureASOManagedMachinePoolReconciler.SetupWithManager",
6768
tele.KVP("controller", infrav1alpha.AzureASOManagedMachinePoolKind),
@@ -74,6 +75,7 @@ func (r *AzureASOManagedMachinePoolReconciler) SetupWithManager(ctx context.Cont
7475
}
7576

7677
c, err := ctrl.NewControllerManagedBy(mgr).
78+
WithOptions(options).
7779
For(&infrav1alpha.AzureASOManagedMachinePool{}).
7880
WithEventFilter(predicates.ResourceHasFilterLabel(log, r.WatchFilterValue)).
7981
Watches(

‎controllers/managedclusteradopt_controller.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3131
ctrl "sigs.k8s.io/controller-runtime"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
33+
"sigs.k8s.io/controller-runtime/pkg/controller"
3334
"sigs.k8s.io/controller-runtime/pkg/event"
3435
"sigs.k8s.io/controller-runtime/pkg/predicate"
3536
)
@@ -45,8 +46,9 @@ type ManagedClusterAdoptReconciler struct {
4546
}
4647

4748
// SetupWithManager sets up the controller with the Manager.
48-
func (r *ManagedClusterAdoptReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
49+
func (r *ManagedClusterAdoptReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
4950
_, err := ctrl.NewControllerManagedBy(mgr).
51+
WithOptions(options).
5052
For(&asocontainerservicev1.ManagedCluster{}).
5153
WithEventFilter(predicate.Funcs{
5254
UpdateFunc: func(ev event.UpdateEvent) bool {

‎main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,15 +516,15 @@ func registerControllers(ctx context.Context, mgr manager.Manager) {
516516
if err := (&controllers.AzureASOManagedClusterReconciler{
517517
Client: mgr.GetClient(),
518518
WatchFilterValue: watchFilterValue,
519-
}).SetupWithManager(ctx, mgr); err != nil {
519+
}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureClusterConcurrency}); err != nil {
520520
setupLog.Error(err, "unable to create controller", "controller", "AzureASOManagedCluster")
521521
os.Exit(1)
522522
}
523523

524524
if err := (&controllers.AzureASOManagedControlPlaneReconciler{
525525
Client: mgr.GetClient(),
526526
WatchFilterValue: watchFilterValue,
527-
}).SetupWithManager(ctx, mgr); err != nil {
527+
}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureClusterConcurrency}); err != nil {
528528
setupLog.Error(err, "unable to create controller", "controller", "AzureASOManagedControlPlane")
529529
os.Exit(1)
530530
}
@@ -557,21 +557,21 @@ func registerControllers(ctx context.Context, mgr manager.Manager) {
557557
Client: mgr.GetClient(),
558558
WatchFilterValue: watchFilterValue,
559559
Tracker: tracker,
560-
}).SetupWithManager(ctx, mgr); err != nil {
560+
}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureMachinePoolConcurrency}); err != nil {
561561
setupLog.Error(err, "unable to create controller", "controller", "AzureASOManagedMachinePool")
562562
os.Exit(1)
563563
}
564564

565565
if err := (&controllers.ManagedClusterAdoptReconciler{
566566
Client: mgr.GetClient(),
567-
}).SetupWithManager(ctx, mgr); err != nil {
567+
}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureClusterConcurrency}); err != nil {
568568
setupLog.Error(err, "unable to create controller", "controller", "ManagedCluster")
569569
os.Exit(1)
570570
}
571571

572572
if err := (&controllers.AgentPoolAdoptReconciler{
573573
Client: mgr.GetClient(),
574-
}).SetupWithManager(ctx, mgr); err != nil {
574+
}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureMachinePoolConcurrency}); err != nil {
575575
setupLog.Error(err, "unable to create controller", "controller", "AgentPool")
576576
os.Exit(1)
577577
}

0 commit comments

Comments
 (0)