vlan nic support regex

docs/vlan.md

@@ -20,6 +20,8 @@ We are working at combine two networks in one cluster.
 `wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/install.sh`
 
 2. Edit the `install.sh`, modify `NETWORK_TYPE` to `vlan`, `VLAN_INTERFACE_NAME` to related host interface.
+> NOTE: if your nodes have different nic name for vlan device you could use regex for VLAN_INTERFACE_NAME or label those nodes with
+   own `ovn.kubernetes.io/host_interface_name`.
 
 3. Install Kube-OVN
 

pkg/daemon/init.go

@@ -95,17 +95,24 @@ func InitVlan(config *Configuration) error {
 }
 
 //get host nic name
-func (config *Configuration) getInterfaceName() string {
-	var interfaceName string
-
+func (config *Configuration) getInterfaceName() (ifName string) {
+	defer func() {
+		if ifName == "" {
+			return
+		}
+		iface, err := findInterface(ifName)
+		if err != nil {
+			klog.Errorf("failed to find iface %s, %v", ifName, err)
+			ifName = ""
+			return
+		}
+		ifName = iface.Name
+	}()
 	node, err := config.KubeClient.CoreV1().Nodes().Get(context.Background(), config.NodeName, metav1.GetOptions{})
 	if err == nil {
-		labels := node.GetLabels()
-		interfaceName = labels[util.HostInterfaceName]
-	}
-
-	if interfaceName != "" {
-		return interfaceName
+		if interfaceName := node.GetLabels()[util.HostInterfaceName]; interfaceName != "" {
+			return interfaceName
+		}
 	}
 
 	if config.DefaultInterfaceName != "" {