make sure important info is updated to status

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

Author: imroc

internal/clbbinding/clbbinding.go

@@ -15,6 +15,7 @@ type CLBBinding interface {
 	GetAssociatedObject(context.Context, client.Client) (Backend, error)
 	GetObject() client.Object
 	GetType() string
+	GetNewest(context.Context, client.Client) (CLBBinding, error)
 }
 
 type Backend interface {

internal/clbbinding/clbnodebinding.go

@@ -43,6 +43,15 @@ func (b *CLBNodeBinding) GetType() string {
 	return "CLBNodeBinding"
 }
 
+func (b *CLBNodeBinding) GetNewest(ctx context.Context, c client.Client) (CLBBinding, error) {
+	nbd := &networkingv1alpha1.CLBNodeBinding{}
+	err := c.Get(ctx, client.ObjectKeyFromObject(b), nbd)
+	if err == nil {
+		b.CLBNodeBinding = nbd
+	}
+	return WrapCLBNodeBinding(nbd), err
+}
+
 type nodeBackend struct {
 	*corev1.Node
 }

internal/clbbinding/clbpodbinding.go

@@ -25,7 +25,6 @@ func WrapCLBPodBinding(pb *networkingv1alpha1.CLBPodBinding) *CLBPodBinding {
 
 type CLBPodBinding struct {
 	*networkingv1alpha1.CLBPodBinding
-	client.Client
 }
 
 func (b *CLBPodBinding) GetSpec() *networkingv1alpha1.CLBBindingSpec {
@@ -44,6 +43,15 @@ func (b *CLBPodBinding) GetType() string {
 	return "CLBPodBinding"
 }
 
+func (b *CLBPodBinding) GetNewest(ctx context.Context, c client.Client) (CLBBinding, error) {
+	pb := &networkingv1alpha1.CLBPodBinding{}
+	err := c.Get(ctx, client.ObjectKeyFromObject(b), pb)
+	if err == nil {
+		b.CLBPodBinding = pb
+	}
+	return WrapCLBPodBinding(pb), err
+}
+
 type podBackend struct {
 	*corev1.Pod
 	client.Client

internal/controller/clbbinding.go

@@ -224,7 +224,15 @@ func (r *CLBBindingReconciler[T]) ensureListeners(ctx context.Context, bd clbbin
 	}
 	if needUpdate {
 		status.PortBindings = newBindings
-		if e := r.Status().Update(ctx, bd.GetObject()); e != nil {
+		update := func() error {
+			newBd, err := bd.GetNewest(ctx, r.Client)
+			if err != nil {
+				return err
+			}
+			newBd.GetStatus().PortBindings = newBindings
+			return r.Status().Update(ctx, newBd.GetObject())
+		}
+		if e := util.RetryIfPossible(update); e != nil {
 			err = multierr.Append(err, e)
 		}
 	}
@@ -419,6 +427,7 @@ func (r *CLBBindingReconciler[T]) ensureListener(ctx context.Context, bd clbbind
 			log.FromContext(ctx).V(3).Info("create clb listener success", "port", binding.Port, "protocol", binding.Protocol, "listenerId", lisId, "lbPort", binding.LoadbalancerPort, "lbId", binding.LoadbalancerId)
 		}
 	}
+
 	if binding.ListenerId == "" { // 通常是还未创建监听器，不查询直接尝试创建，以提升扩容场景的速度
 		createListener()
 		return

internal/portpool/util/portpool.go

@@ -79,15 +79,15 @@ func (p *PortPool) TryCreateLB(ctx context.Context) (portpool.CreateLbResult, er
 	addLbIdToStatus := func() error {
 		pp := &networkingv1alpha1.CLBPortPool{}
 		if err := p.Client.Get(ctx, client.ObjectKeyFromObject(p.CLBPortPool), pp); err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		pp.Status.State = networkingv1alpha1.CLBPortPoolStateActive // 创建成功，状态改为 Active，以便再次可分配端口
 		pp.Status.LoadbalancerStatuses = append(pp.Status.LoadbalancerStatuses, networkingv1alpha1.LoadBalancerStatus{
 			LoadbalancerID: lbId,
 			AutoCreated:    util.GetPtr(true),
 		})
 		if err := p.Client.Status().Update(ctx, pp); err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		p.CLBPortPool = pp
 		return nil