fix edge case: make sure port retry allocate after clb scaling

Signed-off-by: roc <roc@imroc.cc>

Author: imroc

internal/controller/clbbinding.go

@@ -64,6 +64,9 @@ func (r *CLBBindingReconciler[T]) sync(ctx context.Context, bd T) (result ctrl.R
 	if err := r.ensureCLBBinding(ctx, bd); err != nil {
 		errCause := errors.Cause(err)
 		switch errCause {
+		case ErrLBNotFoundInPool: // lb 不存在于端口池中，通常是 lb 扩容了但还未将 lb 信息写入端口池的 status 中，重新入队重试
+			result.RequeueAfter = 20 * time.Microsecond
+			return result, nil
 		case portpool.ErrPortPoolNotAllocatable: // 端口池不可用
 			if err := r.ensureState(ctx, bd, networkingv1alpha1.CLBBindingStatePortPoolNotAllocatable); err != nil {
 				return result, errors.WithStack(err)
@@ -437,6 +440,8 @@ func NewLBStatusGetter(client client.Client) *LBStatusGetter {
 	}
 }
 
+var ErrLBNotFoundInPool = errors.New("loadbalancer not found in port pool")
+
 func (g *LBStatusGetter) Get(ctx context.Context, poolName, lbId string) (*networkingv1alpha1.LoadBalancerStatus, error) {
 	key := lbStatusKey(poolName, lbId)
 	status, exists := g.cache[key]
@@ -455,7 +460,7 @@ func (g *LBStatusGetter) Get(ctx context.Context, poolName, lbId string) (*netwo
 	if exists {
 		return status, nil
 	}
-	return nil, errors.Errorf("loadbalancer %s not found in pool %s", lbId, poolName)
+	return nil, errors.Wrapf(ErrLBNotFoundInPool, "loadbalancer %s not found in port pool %s", lbId, poolName)
 }
 
 // 确保映射的结果写到 backend 资源的注解上

internal/controller/clbportpool_controller.go

@@ -203,6 +203,11 @@ func (r *CLBPortPoolReconciler) ensureLbStatus(ctx context.Context, pool *networ
 		lbStatuses = append(lbStatuses, lbStatus)
 	}
 
+	// 确保所有可分配的 lb 在分配器缓存中
+	if err := portpool.Allocator.EnsureLbIds(pool.Name, allocatableLBs); err != nil {
+		return errors.WithStack(err)
+	}
+
 	// 如果 status 有变更就更新下
 	if quota != pool.Status.Quota || !reflect.DeepEqual(lbStatuses, pool.Status.LoadbalancerStatuses) {
 		pool.Status.LoadbalancerStatuses = lbStatuses
@@ -212,11 +217,6 @@ func (r *CLBPortPoolReconciler) ensureLbStatus(ctx context.Context, pool *networ
 		}
 	}
 
-	// 确保所有可分配的 lb 在分配器缓存中
-	if err := portpool.Allocator.EnsureLbIds(pool.Name, allocatableLBs); err != nil {
-		return errors.WithStack(err)
-	}
-
 	if insufficientPorts { // 可分配端口不足，尝试扩容 clb
 		if pool.Spec.AutoCreate != nil && pool.Spec.AutoCreate.Enabled { // 必须启用了 clb 自动创建
 			if pool.Spec.AutoCreate.MaxLoadBalancers == nil || autoCreatedLbNum < *pool.Spec.AutoCreate.MaxLoadBalancers { // 满足可以自动创建clb的条件：没有限制自动创建的 clb 数量，或者自动创建的 clb 数量未达到限制

internal/controller/pod_controller.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -87,6 +88,10 @@ func (r *PodReconciler) sync(ctx context.Context, pod *corev1.Pod) (result ctrl.
 		}
 		result, err = r.syncCLBHostPortMapping(ctx, pod)
 		if err != nil {
+			if errors.Is(err, ErrLBNotFoundInPool) { // lb 不存在于端口池中，通常是 lb 扩容了但还未将 lb 信息写入端口池的 status 中，重新入队重试
+				result.RequeueAfter = 20 * time.Microsecond
+				return result, nil
+			}
 			return result, errors.WithStack(err)
 		}
 	}