do not calculate subnet.spec.excludeIPs as availableIPs (#3550)

Signed-off-by: 马洪贞 <hzma@alauda.io>

pkg/controller/subnet.go

@@ -699,16 +699,6 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
-	if subnet.Spec.Protocol == kubeovnv1.ProtocolDual {
-		err = calcDualSubnetStatusIP(subnet, c)
-	} else {
-		err = calcSubnetStatusIP(subnet, c)
-	}
-	if err != nil {
-		klog.Errorf("calculate subnet %s used ip failed, %v", subnet.Name, err)
-		return err
-	}
-
 	deleted, err := c.handleSubnetFinalizer(subnet)
 	if err != nil {
 		klog.Errorf("handle subnet finalizer failed %v", err)
@@ -729,6 +719,17 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
+	// availableIPStr valued from ipam, so leave update subnet.status after ipam process
+	if subnet.Spec.Protocol == kubeovnv1.ProtocolDual {
+		err = calcDualSubnetStatusIP(subnet, c)
+	} else {
+		err = calcSubnetStatusIP(subnet, c)
+	}
+	if err != nil {
+		klog.Errorf("calculate subnet %s used ip failed, %v", subnet.Name, err)
+		return err
+	}
+
 	if !isOvnSubnet(subnet) {
 		// subnet provider is not ovn, and vpc is empty, should not reconcile
 		c.patchSubnetStatus(subnet, "SetNonOvnSubnetSuccess", "")
@@ -1976,6 +1977,17 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error {
 		return err
 	}
 
+	usingIPNums := len(podUsedIPs)
+	for _, podUsedIP := range podUsedIPs {
+		for _, excludeIP := range subnet.Spec.ExcludeIps {
+			if util.ContainsIPs(excludeIP, podUsedIP.Spec.V4IPAddress) || util.ContainsIPs(excludeIP, podUsedIP.Spec.V6IPAddress) {
+				// This ip cr is allocated from subnet.spec.excludeIPs, do not count it as usingIPNums
+				usingIPNums--
+				break
+			}
+		}
+	}
+
 	// subnet.Spec.ExcludeIps contains both v4 and v6 addresses
 	v4ExcludeIPs, v6ExcludeIPs := util.SplitIpsByProtocol(subnet.Spec.ExcludeIps)
 	// gateway always in excludeIPs
@@ -1987,7 +1999,7 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error {
 	v4availableIPs := util.AddressCount(v4CIDR) - util.CountIPNums(v4toSubIPs)
 	v6availableIPs := util.AddressCount(v6CIDR) - util.CountIPNums(v6toSubIPs)
 
-	usingIPs := float64(len(podUsedIPs))
+	usingIPs := float64(usingIPNums)
 
 	vips, err := c.virtualIpsLister.List(labels.SelectorFromSet(labels.Set{
 		util.SubnetNameLabel: subnet.Name,
@@ -2059,10 +2071,21 @@ func calcSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error {
 		klog.Error(err)
 		return err
 	}
+	usingIPNums := len(podUsedIPs)
+	for _, podUsedIP := range podUsedIPs {
+		for _, excludeIP := range subnet.Spec.ExcludeIps {
+			if util.ContainsIPs(excludeIP, podUsedIP.Spec.V4IPAddress) || util.ContainsIPs(excludeIP, podUsedIP.Spec.V6IPAddress) {
+				// This ip cr is allocated from subnet.spec.excludeIPs, do not count it as usingIPNums
+				usingIPNums--
+				break
+			}
+		}
+	}
+
 	// gateway always in excludeIPs
 	toSubIPs := util.ExpandExcludeIPs(subnet.Spec.ExcludeIps, subnet.Spec.CIDRBlock)
 	availableIPs := util.AddressCount(cidr) - util.CountIPNums(toSubIPs)
-	usingIPs := float64(len(podUsedIPs))
+	usingIPs := float64(usingIPNums)
 	vips, err := c.virtualIpsLister.List(labels.SelectorFromSet(labels.Set{
 		util.SubnetNameLabel: subnet.Name,
 		util.IPReservedLabel: "",