fix subnet finalizer (#3004)

zhangzujian · zhangzujian · commit 54a0b1a69330 · 2023-07-03T11:11:32.000+08:00
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -444,7 +444,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
`@@ -444,7 +444,7 @@ func (c Controller) handleSubnetFinalizer(subnet kubeovnv1.Subnet) (bool, erro`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`u2oInterconnIP := subnet.Status.U2OInterconnectionIP`
`447`		`- if !subnet.DeletionTimestamp.IsZero() && usingIps == 0 \|\| (usingIps == 1 && u2oInterconnIP != "") {`
	`447`	`+ if !subnet.DeletionTimestamp.IsZero() && (usingIps == 0 \|\| (usingIps == 1 && u2oInterconnIP != "")) {`
`448`	`448`	`subnet.Finalizers = util.RemoveString(subnet.Finalizers, util.ControllerName)`
`449`	`449`	`if _, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Update(context.Background(), subnet, metav1.UpdateOptions{}); err != nil {`
`450`	`450`	`klog.Errorf("failed to remove finalizer from subnet %s, %v", subnet.Name, err)`