Skip to content

Commit

Permalink
fix: load-balancer for dnat cleaned after restarting kube-ovn-control…
Browse files Browse the repository at this point in the history
…ler (#4357)

Signed-off-by: zcq98 <[email protected]>
  • Loading branch information
zhaocongqi authored Aug 2, 2024
1 parent df2d066 commit e4c67ca
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions pkg/controller/gc.go
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,18 @@ func (c *Controller) markAndCleanLSP() error {

func (c *Controller) gcLoadBalancer() error {
klog.Infof("start to gc load balancers")

dnats, err := c.ovnDnatRulesLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list dnats, %v", err)
return err
}

vpcLbs := strset.NewWithSize(len(dnats))
for _, dnat := range dnats {
vpcLbs.Add(dnat.Name)
}

if !c.config.EnableLb {
// remove lb from logical switch
vpcs, err := c.vpcsLister.List(labels.Everything())
Expand Down Expand Up @@ -467,7 +479,9 @@ func (c *Controller) gcLoadBalancer() error {
}
}
// lbs will remove from logical switch automatically when delete lbs
if err = c.OVNNbClient.DeleteLoadBalancers(nil); err != nil {
if err = c.OVNNbClient.DeleteLoadBalancers(func(lb *ovnnb.LoadBalancer) bool {
return !vpcLbs.Has(lb.Name)
}); err != nil {
klog.Errorf("delete all load balancers: %v", err)
return err
}
Expand All @@ -480,12 +494,6 @@ func (c *Controller) gcLoadBalancer() error {
return err
}

dnats, err := c.ovnDnatRulesLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list dnats, %v", err)
return err
}

var (
tcpVips = strset.NewWithSize(len(svcs) * 2)
udpVips = strset.NewWithSize(len(svcs) * 2)
Expand Down Expand Up @@ -531,14 +539,9 @@ func (c *Controller) gcLoadBalancer() error {

var (
removeVip func(lbName string, svcVips *strset.Set) error
vpcLbs []string
ignoreHealthCheck = true
)

for _, dnat := range dnats {
vpcLbs = append(vpcLbs, dnat.Name)
}

removeVip = func(lbName string, svcVips *strset.Set) error {
if lbName == "" {
return nil
Expand Down Expand Up @@ -576,7 +579,7 @@ func (c *Controller) gcLoadBalancer() error {
tcpSessLb, udpSessLb, sctpSessLb = vpc.Status.TCPSessionLoadBalancer, vpc.Status.UDPSessionLoadBalancer, vpc.Status.SctpSessionLoadBalancer
)

vpcLbs = append(vpcLbs, tcpLb, udpLb, sctpLb, tcpSessLb, udpSessLb, sctpSessLb)
vpcLbs.Add(tcpLb, udpLb, sctpLb, tcpSessLb, udpSessLb, sctpSessLb)
if err = removeVip(tcpLb, tcpVips); err != nil {
klog.Error(err)
return err
Expand Down Expand Up @@ -606,7 +609,7 @@ func (c *Controller) gcLoadBalancer() error {
// delete lbs
if err = c.OVNNbClient.DeleteLoadBalancers(
func(lb *ovnnb.LoadBalancer) bool {
return !slices.Contains(vpcLbs, lb.Name)
return !vpcLbs.Has(lb.Name)
},
); err != nil {
klog.Errorf("delete load balancers: %v", err)
Expand Down

0 comments on commit e4c67ca

Please sign in to comment.