Skip to content

Commit d0a1776

Browse files
committed
ignore delete listener if not exists
Signed-off-by: roc <[email protected]>
1 parent fbb5614 commit d0a1776

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

internal/controller/clbbinding.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,17 @@ func (r *CLBBindingReconciler[T]) cleanup(ctx context.Context, bd T) (result ctr
674674
log.V(3).Info("release allocated port", "port", binding.LoadbalancerPort, "protocol", binding.Protocol, "pool", binding.Pool, "lb", binding.LoadbalancerId)
675675
portpool.Allocator.Release(binding.Pool, binding.LoadbalancerId, portFromPortBindingStatus(&binding))
676676
}
677+
if lis, err := clb.GetListenerByIdOrPort(ctx, binding.Region, binding.LoadbalancerId, binding.ListenerId, int64(binding.LoadbalancerPort), binding.Protocol); err != nil {
678+
if errors.Is(err, clb.ErrListenerNotFound) { // 监听器已删除,忽略
679+
releasePort()
680+
continue
681+
}
682+
} else {
683+
if lis == nil { // 监听器已删除,忽略
684+
releasePort()
685+
continue
686+
}
687+
}
677688
// 解绑 lb
678689
if err := clb.DeleteListenerByIdOrPort(ctx, binding.Region, binding.LoadbalancerId, binding.ListenerId, int64(binding.LoadbalancerPort), binding.Protocol); err != nil {
679690
e := errors.Cause(err)

0 commit comments

Comments
 (0)