Skip to content

Commit 11b05dc

Browse files
committed
fix slbr missing vip when svc is deleted
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
1 parent 8413ae0 commit 11b05dc

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

pkg/controller/endpoint_slice.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@ func (c *Controller) handleUpdateEndpointSlice(key string) error {
202202
} else {
203203
vip = util.JoinHostPort(lbVip, port.Port)
204204
klog.V(3).Infof("delete vip endpoint %s from LB %s", vip, lb)
205-
if err = c.OVNNbClient.LoadBalancerDeleteVip(lb, vip, ignoreHealthCheck); err != nil {
205+
if err = c.OVNNbClient.LoadBalancerDeleteVip(lb, vip, true); err != nil {
206206
klog.Errorf("failed to delete vip endpoint %s from LB %s: %v", vip, lb, err)
207207
return err
208208
}
209209

210210
klog.V(3).Infof("delete vip endpoint %s from old LB %s", vip, oldLb)
211-
if err = c.OVNNbClient.LoadBalancerDeleteVip(oldLb, vip, ignoreHealthCheck); err != nil {
211+
if err = c.OVNNbClient.LoadBalancerDeleteVip(oldLb, vip, true); err != nil {
212212
klog.Errorf("failed to delete vip %s from LB %s: %v", vip, oldLb, err)
213213
return err
214214
}

pkg/controller/switch_lb_rule.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,10 @@ func (c *Controller) handleDelSwitchLBRule(info *SlrInfo) error {
195195

196196
name = generateSvcName(info.Name)
197197
if err = c.config.KubeClient.CoreV1().Services(info.Namespace).Delete(context.Background(), name, metav1.DeleteOptions{}); err != nil {
198-
if k8serrors.IsNotFound(err) {
199-
return nil
198+
if !k8serrors.IsNotFound(err) {
199+
klog.Errorf("failed to delete service %s, err: %v", name, err)
200+
return err
200201
}
201-
klog.Errorf("failed to delete service %s, err: %v", name, err)
202-
return err
203202
}
204203

205204
if lbhcs, err = c.OVNNbClient.ListLoadBalancerHealthChecks(

0 commit comments

Comments
 (0)