refactor: AddPoolIfNotExists --> EnsurePool

Signed-off-by: roc <[email protected]>

Author: imroc

cmd/app/setup_manager.go

@@ -64,7 +64,7 @@ func (i *initCache) Start(ctx context.Context) error {
 	}
 	for index := range ppl.Items {
 		pp := &ppl.Items[index]
-		portpool.Allocator.AddPoolIfNotExists(pp)
+		portpool.Allocator.EnsurePool(pp)
 
 		lbKeys := []portpool.LBKey{}
 		for _, lbStatus := range pp.Status.LoadbalancerStatuses {

internal/controller/clbportpool_controller.go

@@ -318,7 +318,7 @@ func (r *CLBPortPoolReconciler) ensureQuota(ctx context.Context, pool *networkin
 // 同步端口池
 func (r *CLBPortPoolReconciler) sync(ctx context.Context, pool *networkingv1alpha1.CLBPortPool) (result ctrl.Result, err error) {
 	// 确保分配器缓存中存在该 port pool，放在最开头，避免同时创建 CLBPortPool 和 CLBBinding 导致分配端口时找不到 pool
-	portpool.Allocator.AddPoolIfNotExists(pool)
+	portpool.Allocator.EnsurePool(pool)
 
 	// 初始化状态
 	if pool.Status.State == "" {

internal/portpool/allocator.go

@@ -59,27 +59,33 @@ func (pa *PortAllocator) EnsureLbIds(name string, lbKeys []LBKey) error {
 	return nil
 }
 
-// AddPoolIfNotExists 添加新的端口池
-func (pa *PortAllocator) AddPoolIfNotExists(pool *networkingv1alpha1.CLBPortPool) bool {
+// EnsurePool 添加新的端口池
+func (pa *PortAllocator) EnsurePool(pool *networkingv1alpha1.CLBPortPool) (added bool) {
 	pa.mu.Lock()
 	defer pa.mu.Unlock()
 
-	if _, exists := pa.pools[pool.Name]; exists {
-		return false
-	}
+	p, exists := pa.pools[pool.Name]
 
 	lbPolicy := constant.LbPolicyRandom
 	if pool.Spec.LbPolicy != nil {
 		lbPolicy = *pool.Spec.LbPolicy
 	}
 
-	p := &PortPool{
-		Name:     pool.Name,
-		LbPolicy: lbPolicy,
-		cache:    make(map[LBKey]map[ProtocolPort]struct{}),
+	if !exists {
+		p = &PortPool{
+			Name:     pool.Name,
+			LbPolicy: lbPolicy,
+			cache:    make(map[LBKey]map[ProtocolPort]struct{}),
+		}
+		pa.pools[pool.Name] = p
+		added = true
+	} else {
+		if p.LbPolicy != lbPolicy {
+			p.LbPolicy = lbPolicy
+		}
 	}
-	pa.pools[pool.Name] = p
-	return true
+
+	return
 }
 
 // RemovePool 移除端口池