allow different provider use same vlan (#5471)

Signed-off-by: zbb88888 <[email protected]>

Author: zbb88888

pkg/controller/vlan.go

@@ -118,8 +118,9 @@ func (c *Controller) checkVlanConflict(vlan *kubeovnv1.Vlan) error {
 	var conflict bool
 	var conflictErr error
 	for _, v := range vlans {
-		if vlan.Spec.ID == v.Spec.ID && vlan.Name != v.Name {
-			conflictErr = fmt.Errorf("new vlan %s conflict with old vlan %s", vlan.Name, v.Name)
+		// different provider allow to have same vlan
+		if vlan.Spec.Provider == v.Spec.Provider && vlan.Spec.ID == v.Spec.ID && vlan.Name != v.Name {
+			conflictErr = fmt.Errorf("provider %s new vlan %s conflict with old vlan %s", vlan.Spec.Provider, vlan.Name, v.Name)
 			klog.Error(conflictErr)
 			conflict = true
 		}