fix subnet finalizer (#3004)

zhangzujian · zhangzujian · commit 66d0e439d6bb · 2023-07-03T11:12:22.000+08:00
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -404,7 +404,7 @@ func (c *Controller) handleSubnetFinalizer(subnet *kubeovnv1.Subnet) (bool, erro
 	}
 
 	u2oInterconnIP := subnet.Status.U2OInterconnectionIP
-	if !subnet.DeletionTimestamp.IsZero() && usingIps == 0 || (usingIps == 1 && u2oInterconnIP != "") {
+	if !subnet.DeletionTimestamp.IsZero() && (usingIps == 0 || (usingIps == 1 && u2oInterconnIP != "")) {
 		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)

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ func (c Controller) handleSubnetFinalizer(subnet kubeovnv1.Subnet) (bool, erro`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`u2oInterconnIP := subnet.Status.U2OInterconnectionIP`
`407`		`- if !subnet.DeletionTimestamp.IsZero() && usingIps == 0 \|\| (usingIps == 1 && u2oInterconnIP != "") {`
	`407`	`+ if !subnet.DeletionTimestamp.IsZero() && (usingIps == 0 \|\| (usingIps == 1 && u2oInterconnIP != "")) {`
`408`	`408`	`subnet.Finalizers = util.RemoveString(subnet.Finalizers, util.ControllerName)`
`409`	`409`	`if _, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Update(context.Background(), subnet, metav1.UpdateOptions{}); err != nil {`
`410`	`410`	`klog.Errorf("failed to remove finalizer from subnet %s, %v", subnet.Name, err)`