1908 (#2007)

* fixes issue #1908 Co-authored-by: Jiazhen Xu <[email protected]>
openyurtio · Apr 10, 2024 · 839a52a · 839a52a
1 parent 682fd01
commit 839a52a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cmd/yurt-manager/app/options/nodepoolcontroller.go b/cmd/yurt-manager/app/options/nodepoolcontroller.go
@@ -30,6 +30,7 @@ func NewNodePoolControllerOptions() *NodePoolControllerOptions {
 	return &NodePoolControllerOptions{
 		&config.NodePoolControllerConfiguration{
 			EnableSyncNodePoolConfigurations: true,
+			ConcurrentNodepools:              3,
 		},
 	}
 }
@@ -40,7 +41,7 @@ func (n *NodePoolControllerOptions) AddFlags(fs *pflag.FlagSet) {
 		return
 	}
 
-	fs.BoolVar(&n.EnableSyncNodePoolConfigurations, "enable-sync-nodepool-configurations", n.EnableSyncNodePoolConfigurations, "enable to sync nodepool configurations(including labels, annotations, taints in spec) to nodes in the nodepool.")
+	fs.Int32Var(&n.ConcurrentNodepools, "concurrent-nodepools", n.ConcurrentNodepools, "The number of node pools that are allowed to reconcile concurrently.")
 }
 
 // ApplyTo fills up nodePool config with options.
@@ -49,6 +50,7 @@ func (o *NodePoolControllerOptions) ApplyTo(cfg *config.NodePoolControllerConfig
 		return nil
 	}
 	cfg.EnableSyncNodePoolConfigurations = o.EnableSyncNodePoolConfigurations
+	cfg.ConcurrentNodepools = o.ConcurrentNodepools
 
 	return nil
 }

diff --git a/pkg/yurtmanager/controller/nodepool/config/types.go b/pkg/yurtmanager/controller/nodepool/config/types.go
@@ -19,4 +19,5 @@ package config
 // NodePoolControllerConfiguration contains elements describing NodePoolController.
 type NodePoolControllerConfiguration struct {
 	EnableSyncNodePoolConfigurations bool
+	ConcurrentNodepools              int32
 }
diff --git a/pkg/yurtmanager/controller/nodepool/nodepool_controller.go b/pkg/yurtmanager/controller/nodepool/nodepool_controller.go
@@ -40,8 +40,7 @@ import (
 )
 
 var (
-	concurrentReconciles = 3
-	controllerResource   = appsv1beta1.SchemeGroupVersion.WithResource("nodepools")
+	controllerResource = appsv1beta1.SchemeGroupVersion.WithResource("nodepools")
 )
 
 func Format(format string, args ...interface{}) string {
@@ -80,7 +79,7 @@ func Add(ctx context.Context, c *config.CompletedConfig, mgr manager.Manager) er
 
 	// Create a new controller
 	ctrl, err := controller.New(names.NodePoolController, mgr, controller.Options{
-		Reconciler: r, MaxConcurrentReconciles: concurrentReconciles,
+		Reconciler: r, MaxConcurrentReconciles: int(c.ComponentConfig.NodePoolController.ConcurrentNodepools),
 	})
 	if err != nil {
 		return err