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

zhangzujian · zhangzujian · commit f790d5a12680 · 2023-03-10T09:36:59.000+08:00
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -306,8 +306,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
`@@ -306,8 +306,9 @@ func formatSubnet(subnet kubeovnv1.Subnet, c Controller) error {`
`306`	`306`	`}`
`307`	`307`	`if subnet.Spec.Vlan != "" {`
`308`	`308`	`if _, err := c.vlansLister.Get(subnet.Spec.Vlan); err != nil {`
`309`		`- klog.Warningf("subnet %s reference a none exist vlan %s", subnet.Name, subnet.Spec.Vlan)`
`310`		`- subnet.Spec.Vlan = ""`
	`309`	`+ err = fmt.Errorf("failed to get vlan %s: %s", subnet.Spec.Vlan, err)`
	`310`	`+ klog.Error(err)`
	`311`	`+ return err`
`311`	`312`	`}`
`312`	`313`	`}`
`313`	`314`	`}`