feature: support exchange link names of OVS bridge and provider nic i…

…n underlay networks (#1736)

dist/images/install.sh

@@ -702,6 +702,8 @@ spec:
                         type: array
                         items:
                           type: string
+                exchangeLinkName:
+                  type: boolean
                 excludeNodes:
                   type: array
                   items:

dist/images/start-ovs.sh

@@ -63,6 +63,77 @@ else
   ovs-vsctl --no-wait set open_vswitch . other_config:hw-offload=false
 fi
 
+function exchange_link_names() {
+  mappings=($(ovs-vsctl --if-exists get open . external-ids:ovn-bridge-mappings | tr -d '"' | tr ',' ' '))
+  bridges=($(ovs-vsctl --no-heading --columns=name find bridge external-ids:vendor=kube-ovn external-ids:exchange-link-name=true))
+  for br in ${bridges[@]}; do
+    provider=""
+    for m in ${mappings[*]}; do
+      if echo $m | grep -q ":$br"'$'; then
+        provider=${m%:$br}
+        break
+      fi
+    done
+    if [ "x$provider" = "x" ]; then
+      echo "error: failed to get provider name for bridge $br"
+      continue
+    fi
+
+    port="br-$provider"
+    if ip link show $port 2>/dev/null; then
+      echo "link $port already exists"
+      continue
+    fi
+    if ! ip link show $br 2>/dev/null; then
+      echo "link $br does not exists"
+      continue
+    fi
+
+    echo "change link name from $br to $port"
+    ipv4_routes=($(ip -4 route show dev $br | tr ' ' '#'))
+    ipv6_routes=($(ip -6 route show dev $br | tr ' ' '#'))
+    ip link set $br down
+    ip link set $br name $port
+    ip link set $port up
+
+    # transfer IPv4 routes
+    default_ipv4_routes=()
+    for route in ${ipv4_routes[@]}; do
+      r=$(echo $route | tr '#' ' ')
+      if echo $r | grep -q -w 'scope link'; then
+        printf "add/replace IPv4 route $r to $port\n"
+        ip -4 route replace $r dev $port
+      else
+        default_ipv4_routes=(${default_ipv4_routes[@]} $route)
+      fi
+    done
+    for route in ${default_ipv4_routes[@]}; do
+      r=$(echo $route | tr '#' ' ')
+      printf "add/replace IPv4 route $r to $port\n"
+      ip -4 route replace $r dev $port
+    done
+
+    # transfer IPv6 routes
+    default_ipv6_routes=()
+    for route in ${ipv6_routes[@]}; do
+      r=$(echo $route | tr '#' ' ')
+      if echo $r | grep -q -w 'scope link'; then
+        printf "add/replace IPv6 route $r to $port\n"
+        ip -6 route replace $r dev $port
+      else
+        default_ipv6_routes=(${default_ipv6_routes[@]} $route)
+      fi
+    done
+    for route in ${default_ipv6_routes[@]}; do
+      r=$(echo $route | tr '#' ' ')
+      printf "add/replace IPv6 route $r to $port\n"
+      ip -6 route replace $r dev $port
+    done
+  done
+}
+
+exchange_link_names
+
 # Start vswitchd. restart will automatically set/unset flow-restore-wait which is not what we want
 /usr/share/openvswitch/scripts/ovs-ctl start --no-ovsdb-server --system-id=random
 /usr/share/openvswitch/scripts/ovs-ctl --protocol=udp --dport=6081 enable-protocol

go.mod

@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	github.com/Mellanox/sriovnet v1.0.3
+	github.com/Wifx/gonetworkmanager v0.4.0
 	github.com/alauda/felix v3.6.6-0.20201207121355-187332daf314+incompatible
 	github.com/cenkalti/backoff/v4 v4.1.3
 	github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08
@@ -59,6 +60,7 @@ require (
 	github.com/go-kit/kit v0.9.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/godbus/dbus/v5 v5.0.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect

go.sum

@@ -114,6 +114,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/Wifx/gonetworkmanager v0.4.0 h1:iZ7o3z3YIqEEAa+bBOCwQkLLUQuxG02CdiE7NCe5y6A=
+github.com/Wifx/gonetworkmanager v0.4.0/go.mod h1:EdhHf2O00IZXfMv9LC6CS6SgTwcMTg/ZSDhGvch0cs8=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28 h1:FW5M3SAwSGBdtTboeV5sI7kEY6zraApSZQxTUfZ7LQY=
 github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28/go.mod h1:dXpg+IAC2yp2IZQlEVmnmEc1rqEmSZzgNfu6+ai38J4=
@@ -460,8 +462,11 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
 github.com/gobuffalo/flect v0.2.2/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc=
+github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c h1:RBUpb2b14UnmRHNd2uHz20ZHLDK+SW5Us/vWF5IHRaY=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/godbus/dbus/v5 v5.0.2/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

pkg/apis/kubeovn/v1/types.go

@@ -260,6 +260,7 @@ type ProviderNetworkSpec struct {
 	DefaultInterface string            `json:"defaultInterface,omitempty"`
 	CustomInterfaces []CustomInterface `json:"customInterfaces,omitempty"`
 	ExcludeNodes     []string          `json:"excludeNodes,omitempty"`
+	ExchangeLinkName bool              `json:"exchangeLinkName,omitempty"`
 }
 
 type ProviderNetworkStatus struct {

pkg/controller/config.go

@@ -64,11 +64,12 @@ type Configuration struct {
 	EnablePprof     bool
 	NodePgProbeTime int
 
-	NetworkType          string
-	DefaultProviderName  string
-	DefaultHostInterface string
-	DefaultVlanName      string
-	DefaultVlanID        int
+	NetworkType             string
+	DefaultProviderName     string
+	DefaultHostInterface    string
+	DefaultExchangeLinkName bool
+	DefaultVlanName         string
+	DefaultVlanID           int
 
 	EnableLb          bool
 	EnableNP          bool
@@ -115,18 +116,19 @@ func ParseFlags() (*Configuration, error) {
 		argPprofPort       = pflag.Int("pprof-port", 10660, "The port to get profiling data")
 		argNodePgProbeTime = pflag.Int("nodepg-probe-time", 1, "The probe interval for node port-group, the unit is minute")
 
-		argNetworkType          = pflag.String("network-type", util.NetworkTypeGeneve, "The ovn network type")
-		argDefaultProviderName  = pflag.String("default-provider-name", "provider", "The vlan or vxlan type default provider interface name")
-		argDefaultInterfaceName = pflag.String("default-interface-name", "", "The default host interface name in the vlan/vxlan type")
-		argDefaultVlanName      = pflag.String("default-vlan-name", "ovn-vlan", "The default vlan name")
-		argDefaultVlanID        = pflag.Int("default-vlan-id", 1, "The default vlan id")
-		argPodNicType           = pflag.String("pod-nic-type", "veth-pair", "The default pod network nic implementation type")
-		argEnableLb             = pflag.Bool("enable-lb", true, "Enable load balancer")
-		argEnableNP             = pflag.Bool("enable-np", true, "Enable network policy support")
-		argEnableEipSnat        = pflag.Bool("enable-eip-snat", true, "Enable EIP and SNAT")
-		argEnableExternalVpc    = pflag.Bool("enable-external-vpc", true, "Enable external vpc support")
-		argEnableEcmp           = pflag.Bool("enable-ecmp", false, "Enable ecmp route for centralized subnet")
-		argKeepVmIP             = pflag.Bool("keep-vm-ip", false, "Whether to keep ip for kubevirt pod when pod is rebuild")
+		argNetworkType             = pflag.String("network-type", util.NetworkTypeGeneve, "The ovn network type")
+		argDefaultProviderName     = pflag.String("default-provider-name", "provider", "The vlan or vxlan type default provider interface name")
+		argDefaultInterfaceName    = pflag.String("default-interface-name", "", "The default host interface name in the vlan/vxlan type")
+		argDefaultExchangeLinkName = pflag.Bool("default-exchange-link-name", false, "exchange link names of OVS bridge and the provider nic in the default provider-network")
+		argDefaultVlanName         = pflag.String("default-vlan-name", "ovn-vlan", "The default vlan name")
+		argDefaultVlanID           = pflag.Int("default-vlan-id", 1, "The default vlan id")
+		argPodNicType              = pflag.String("pod-nic-type", "veth-pair", "The default pod network nic implementation type")
+		argEnableLb                = pflag.Bool("enable-lb", true, "Enable load balancer")
+		argEnableNP                = pflag.Bool("enable-np", true, "Enable network policy support")
+		argEnableEipSnat           = pflag.Bool("enable-eip-snat", true, "Enable EIP and SNAT")
+		argEnableExternalVpc       = pflag.Bool("enable-external-vpc", true, "Enable external vpc support")
+		argEnableEcmp              = pflag.Bool("enable-ecmp", false, "Enable ecmp route for centralized subnet")
+		argKeepVmIP                = pflag.Bool("keep-vm-ip", false, "Whether to keep ip for kubevirt pod when pod is rebuild")
 
 		argExternalGatewayConfigNS = pflag.String("external-gateway-config-ns", "kube-system", "The namespace of configmap external-gateway-config, default: kube-system")
 		argExternalGatewayNet      = pflag.String("external-gateway-net", "external", "The namespace of configmap external-gateway-config, default: external")
@@ -178,6 +180,7 @@ func ParseFlags() (*Configuration, error) {
 		DefaultVlanID:                 *argDefaultVlanID,
 		DefaultProviderName:           *argDefaultProviderName,
 		DefaultHostInterface:          *argDefaultInterfaceName,
+		DefaultExchangeLinkName:       *argDefaultExchangeLinkName,
 		DefaultVlanName:               *argDefaultVlanName,
 		PodName:                       os.Getenv("POD_NAME"),
 		PodNamespace:                  os.Getenv("KUBE_NAMESPACE"),

pkg/controller/init.go

@@ -435,6 +435,7 @@ func (c *Controller) initDefaultProviderNetwork() error {
 		},
 		Spec: kubeovnv1.ProviderNetworkSpec{
 			DefaultInterface: c.config.DefaultHostInterface,
+			ExchangeLinkName: c.config.DefaultExchangeLinkName,
 		},
 	}
 

pkg/daemon/controller.go

@@ -291,7 +291,7 @@ func (c *Controller) initProviderNetwork(pn *kubeovnv1.ProviderNetwork, node *v1
 
 	var mtu int
 	var err error
-	if mtu, err = ovsInitProviderNetwork(pn.Name, nic); err != nil {
+	if mtu, err = ovsInitProviderNetwork(pn.Name, nic, pn.Spec.ExchangeLinkName); err != nil {
 		if oldLen := len(node.Labels); oldLen != 0 {
 			delete(node.Labels, fmt.Sprintf(util.ProviderNetworkReadyTemplate, pn.Name))
 			delete(node.Labels, fmt.Sprintf(util.ProviderNetworkInterfaceTemplate, pn.Name))