do not set subnet's vlan empty on failure (#2445)

zhangzujian · zhangzujian · commit b4383543d245 · 2023-03-10T09:37:40.000+08:00
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -312,8 +312,9 @@ func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
 		}
 		if subnet.Spec.Vlan != "" {
 			if _, err := c.vlansLister.Get(subnet.Spec.Vlan); err != nil {
-				klog.Warningf("subnet %s reference a none exist vlan %s", subnet.Name, subnet.Spec.Vlan)
-				subnet.Spec.Vlan = ""
+				err = fmt.Errorf("failed to get vlan %s: %s", subnet.Spec.Vlan, err)
+				klog.Error(err)
+				return err
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,9 @@ func formatSubnet(subnet kubeovnv1.Subnet, c Controller) error {`
`312`	`312`	`}`
`313`	`313`	`if subnet.Spec.Vlan != "" {`
`314`	`314`	`if _, err := c.vlansLister.Get(subnet.Spec.Vlan); err != nil {`
`315`		`- klog.Warningf("subnet %s reference a none exist vlan %s", subnet.Name, subnet.Spec.Vlan)`
`316`		`- subnet.Spec.Vlan = ""`
	`315`	`+ err = fmt.Errorf("failed to get vlan %s: %s", subnet.Spec.Vlan, err)`
	`316`	`+ klog.Error(err)`
	`317`	`+ return err`
`317`	`318`	`}`
`318`	`319`	`}`
`319`	`320`	`}`