fix: when subnet cidr conflict requeue the subnet

the subnet conflict err is replaced by later err and return nil that will not requeue the conflicted subnet.
kubeovn · Jan 7, 2020 · ff1ff14 · ff1ff14
1 parent 8dbbe6b
commit ff1ff14
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -409,12 +409,14 @@ func (c *Controller) handleAddSubnet(key string) error {
 				subnet.TypeMeta.APIVersion = "kubeovn.io/v1"
 				c.recorder.Eventf(subnet, v1.EventTypeWarning, "ValidateLogicalSwitchFailed", err.Error())
 				subnet.Status.NotValidated("ValidateLogicalSwitchFailed", err.Error())
-				bytes, err := subnet.Status.Bytes()
-				if err != nil {
-					klog.Error(err)
+				bytes, err1 := subnet.Status.Bytes()
+				if err1 != nil {
+					klog.Error(err1)
+					return err1
 				} else {
-					if _, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Patch(subnet.Name, types.MergePatchType, bytes, "status"); err != nil {
-						klog.Error("patch subnet status failed", err)
+					if _, err2 := c.config.KubeOvnClient.KubeovnV1().Subnets().Patch(subnet.Name, types.MergePatchType, bytes, "status"); err2 != nil {
+						klog.Error("patch subnet status failed", err2)
+						return err2
 					}
 				}
 				return err