1.Support to specify node nic name

2.Delete extra blank lines

(cherry picked from commit eb38742)

pkg/daemon/config.go

@@ -1,9 +1,11 @@
 package daemon
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"net"
 	"os"
 	"os/exec"
@@ -108,11 +110,11 @@ func ParseFlags() (*Configuration, error) {
 		DefaultInterfaceName:  *argsDefaultInterfaceName,
 	}
 
-	if err := config.initNicConfig(); err != nil {
+	if err := config.initKubeClient(); err != nil {
 		return nil, err
 	}
 
-	if err := config.initKubeClient(); err != nil {
+	if err := config.initNicConfig(); err != nil {
 		return nil, err
 	}
 
@@ -127,6 +129,17 @@ func (config *Configuration) initNicConfig() error {
 		encapIP string
 	)
 
+	//Support to specify node network card separately
+	node, err := config.KubeClient.CoreV1().Nodes().Get(context.Background(), config.NodeName, metav1.GetOptions{})
+	if err != nil {
+		klog.Errorf("Failed to find node info, err: %v", err)
+		return err
+	}
+	if nodeTunnelName := node.GetAnnotations()[util.TunnelInterfaceAnnotation]; nodeTunnelName != "" {
+		config.Iface = nodeTunnelName
+		klog.Infof("Find node tunnel interface name: %v", nodeTunnelName)
+	}
+
 	if config.Iface == "" {
 		podIP, ok := os.LookupEnv("POD_IP")
 		if !ok || podIP == "" {

pkg/util/const.go

@@ -53,6 +53,8 @@ const (
 	PortNameAnnotation      = "ovn.kubernetes.io/port_name"
 	LogicalSwitchAnnotation = "ovn.kubernetes.io/logical_switch"
 
+	TunnelInterfaceAnnotation = "ovn.kubernetes.io/tunnel_interface"
+
 	SubnetNameLabel    = "ovn.kubernetes.io/subnet"
 	ICGatewayLabel     = "ovn.kubernetes.io/ic-gw"
 	ExGatewayLabel     = "ovn.kubernetes.io/external-gw"