update usingips check when update finalizer for subnet

kubeovn · Mar 22, 2021 · 24095d7 · 24095d7
1 parent 27fd210
commit 24095d7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -404,7 +404,13 @@ func (c *Controller) handleSubnetFinalizer(subnet *kubeovnv1.Subnet) (bool, erro
 		return false, nil
 	}
 
-	if !subnet.DeletionTimestamp.IsZero() && subnet.Status.UsingIPs == 0 {
+	var usingIps float64
+	if util.CheckProtocol(subnet.Spec.CIDRBlock) == kubeovnv1.ProtocolIPv6 {
+		usingIps = subnet.Status.V6UsingIPs
+	} else {
+		usingIps = subnet.Status.V4UsingIPs
+	}
+	if !subnet.DeletionTimestamp.IsZero() && usingIps == 0 {
 		subnet.Finalizers = util.RemoveString(subnet.Finalizers, util.ControllerName)
 		if _, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Update(context.Background(), subnet, metav1.UpdateOptions{}); err != nil {
 			klog.Errorf("failed to remove finalizer from subnet %s, %v", subnet.Name, err)