From 021b996285dcfd67d15043e5ce25ae89fe806d1a Mon Sep 17 00:00:00 2001 From: bobz965 Date: Wed, 17 Apr 2024 13:34:57 +0800 Subject: [PATCH] fix backport (#3924) Signed-off-by: bobz965 --- pkg/controller/subnet.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go index cb5e000243a..6391deacc70 100644 --- a/pkg/controller/subnet.go +++ b/pkg/controller/subnet.go @@ -2075,7 +2075,7 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { if err := c.checkSubnetUsingIPs(subnet); err != nil { klog.Errorf("inconsistency detected in status of subnet %s : %v", subnet.Name, err) - return nil, err + return err } bytes, err := subnet.Status.Bytes() @@ -2190,7 +2190,7 @@ func calcSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { if err := c.checkSubnetUsingIPs(subnet); err != nil { klog.Errorf("inconsistency detected in status of subnet %s : %v", subnet.Name, err) - return nil, err + return err } bytes, err := subnet.Status.Bytes()