fix: subnet can not delete even if no ip in using (#3621)

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
kubeovn · Jan 12, 2024 · 7a5c4aa · 7a5c4aa
1 parent 3fec12e
commit 7a5c4aa
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -507,15 +507,6 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
-	deleted, err := c.handleSubnetFinalizer(subnet)
-	if err != nil {
-		klog.Errorf("handle subnet finalizer failed %v", err)
-		return err
-	}
-	if deleted {
-		return nil
-	}
-
 	if subnet.Spec.LogicalGateway && subnet.Spec.U2OInterconnection {
 		err = fmt.Errorf("logicalGateway and u2oInterconnection can't be opened at the same time")
 		klog.Error(err)
@@ -556,6 +547,10 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		}
 	}
 
+	if err := c.ipam.AddOrUpdateSubnet(subnet.Name, subnet.Spec.CIDRBlock, subnet.Spec.Gateway, subnet.Spec.ExcludeIps); err != nil {
+		return err
+	}
+
 	if subnet.Spec.Protocol == kubeovnv1.ProtocolDual {
 		err = calcDualSubnetStatusIP(subnet, c)
 	} else {
@@ -566,9 +561,14 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
-	if err := c.ipam.AddOrUpdateSubnet(subnet.Name, subnet.Spec.CIDRBlock, subnet.Spec.Gateway, subnet.Spec.ExcludeIps); err != nil {
+	deleted, err := c.handleSubnetFinalizer(subnet)
+	if err != nil {
+		klog.Errorf("handle subnet finalizer failed %v", err)
 		return err
 	}
+	if deleted {
+		return nil
+	}
 
 	if subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway {
 		if err := c.reconcileU2OInterconnectionIP(subnet); err != nil {