Skip to content

Commit

Permalink
fix: gc lb
Browse files Browse the repository at this point in the history
  • Loading branch information
fanriming committed Sep 16, 2021
1 parent f250602 commit 71fcbf1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
5 changes: 4 additions & 1 deletion pkg/controller/gc.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,10 @@ func (c *Controller) gcLoadBalancer() error {
for _, vpc := range vpcs {
for _, subnetName := range vpc.Status.Subnets {
_, err := c.subnetsLister.Get(subnetName)
if err != nil && !k8serrors.IsNotFound(err) {
if err != nil {
if k8serrors.IsNotFound(err) {
continue
}
return err
}
err = c.ovnClient.RemoveLbFromLogicalSwitch(
Expand Down
8 changes: 7 additions & 1 deletion pkg/controller/vpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,13 @@ func (c *Controller) getVpcSubnets(vpc *kubeovnv1.Vpc) (subnets []string, defaul
}

for _, subnet := range allSubnets {
if subnet.Spec.Vpc == vpc.Name {
deleted, err := c.handleSubnetFinalizer(subnet)
if err != nil {
klog.Errorf("handle subnet finalizer failed %v", err)
return nil, "", err
}

if !deleted && subnet.Spec.Vpc == vpc.Name {
subnets = append(subnets, subnet.Name)
if subnet.Spec.Default {
defaultSubnet = subnet.Name
Expand Down
8 changes: 4 additions & 4 deletions pkg/ovs/ovn-nbctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -328,22 +328,22 @@ func (c Client) AddLbToLogicalSwitch(tcpLb, tcpSessLb, udpLb, udpSessLb, ls stri

func (c Client) RemoveLbFromLogicalSwitch(tcpLb, tcpSessLb, udpLb, udpSessLb, ls string) error {
if err := c.removeLoadBalancerFromLogicalSwitch(tcpLb, ls); err != nil {
klog.Errorf("failed to add tcp lb to %s, %v", ls, err)
klog.Errorf("failed to remove tcp lb from %s, %v", ls, err)
return err
}

if err := c.removeLoadBalancerFromLogicalSwitch(udpLb, ls); err != nil {
klog.Errorf("failed to add udp lb to %s, %v", ls, err)
klog.Errorf("failed to remove udp lb from %s, %v", ls, err)
return err
}

if err := c.removeLoadBalancerFromLogicalSwitch(tcpSessLb, ls); err != nil {
klog.Errorf("failed to add tcp session lb to %s, %v", ls, err)
klog.Errorf("failed to remove tcp session lb from %s, %v", ls, err)
return err
}

if err := c.removeLoadBalancerFromLogicalSwitch(udpSessLb, ls); err != nil {
klog.Errorf("failed to add udp session lb to %s, %v", ls, err)
klog.Errorf("failed to remove udp session lb from %s, %v", ls, err)
return err
}

Expand Down

0 comments on commit 71fcbf1

Please sign in to comment.