Drop pkg/util/ipcmd, port to vishvananda/netlink (mostly)

Author: danwinship

pkg/sdn/plugin/node.go

@@ -18,7 +18,6 @@ import (
 	osclient "github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/sdn"
 	osapi "github.com/openshift/origin/pkg/sdn/apis/network"
-	"github.com/openshift/origin/pkg/util/ipcmd"
 	"github.com/openshift/origin/pkg/util/netutils"
 	"github.com/openshift/origin/pkg/util/ovs"
 
@@ -39,6 +38,8 @@ import (
 	knetwork "k8s.io/kubernetes/pkg/kubelet/network"
 	ktypes "k8s.io/kubernetes/pkg/kubelet/types"
 	kexec "k8s.io/kubernetes/pkg/util/exec"
+
+	"github.com/vishvananda/netlink"
 )
 
 const (
@@ -203,13 +204,12 @@ func NewNodePlugin(c *OsdnNodeConfig) (sdn.NodeInterface, error) {
 // Detect whether we are upgrading from a pre-CNI openshift and clean up
 // interfaces and iptables rules that are no longer required
 func (node *OsdnNode) dockerPreCNICleanup() error {
-	exec := kexec.New()
-	itx := ipcmd.NewTransaction(exec, "lbr0")
-	itx.SetLink("down")
-	if err := itx.EndTransaction(); err != nil {
+	l, err := netlink.LinkByName("lbr0")
+	if err != nil {
 		// no cleanup required
 		return nil
 	}
+	_ = netlink.LinkSetDown(l)
 
 	node.clearLbr0IptablesRule = true
 
@@ -226,10 +226,10 @@ func (node *OsdnNode) dockerPreCNICleanup() error {
 
 	// Delete pre-CNI interfaces
 	for _, intf := range []string{"lbr0", "vovsbr", "vlinuxbr"} {
-		itx := ipcmd.NewTransaction(exec, intf)
-		itx.DeleteLink()
-		itx.IgnoreError()
-		itx.EndTransaction()
+		l, err = netlink.LinkByName(intf)
+		if err != nil {
+			_ = netlink.LinkDel(l)
+		}
 	}
 
 	// Wait until docker has restarted since kubelet will exit if docker isn't running

pkg/sdn/plugin/pod.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"os/exec"
 	"strconv"
 	"sync"
 	"syscall"
 
 	sdnapi "github.com/openshift/origin/pkg/sdn/apis/network"
 	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
-	"github.com/openshift/origin/pkg/util/ipcmd"
 	"github.com/openshift/origin/pkg/util/netutils"
 
 	"github.com/golang/glog"
@@ -24,7 +24,6 @@ import (
 	knetwork "k8s.io/kubernetes/pkg/kubelet/network"
 	kubehostport "k8s.io/kubernetes/pkg/kubelet/network/hostport"
 	kbandwidth "k8s.io/kubernetes/pkg/util/bandwidth"
-	kexec "k8s.io/kubernetes/pkg/util/exec"
 
 	"github.com/containernetworking/cni/pkg/invoke"
 	"github.com/containernetworking/cni/pkg/ip"
@@ -454,12 +453,10 @@ func setupPodBandwidth(ovs *ovsController, pod *kapi.Pod, hostVeth string) error
 	if ingressVal != nil {
 		ingressBPS = ingressVal.Value()
 
-		// FIXME: doesn't seem possible to do this with the netlink library?
-		itx := ipcmd.NewTransaction(kexec.New(), hostVeth)
-		itx.SetLink("qlen", "1000")
-		err = itx.EndTransaction()
+		// FIXME: rebase netlink after https://github.com/vishvananda/netlink/pull/257 merges
+		out, err := exec.Command("ip", "link", "set", hostVeth, "qlen", "1000").CombinedOutput()
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to set host veth txqlen: %s", out)
 		}
 	}
 	if egressVal != nil {

pkg/sdn/plugin/sdn_controller.go

@@ -3,13 +3,12 @@ package plugin
 import (
 	"fmt"
 	"net"
-	"strings"
+	"syscall"
 	"time"
 
 	"github.com/golang/glog"
 
 	osapi "github.com/openshift/origin/pkg/sdn/apis/network"
-	"github.com/openshift/origin/pkg/util/ipcmd"
 	"github.com/openshift/origin/pkg/util/netutils"
 
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -20,6 +19,8 @@ import (
 	kexec "k8s.io/kubernetes/pkg/util/exec"
 	"k8s.io/kubernetes/pkg/util/iptables"
 	"k8s.io/kubernetes/pkg/util/sysctl"
+
+	"github.com/vishvananda/netlink"
 )
 
 func (plugin *OsdnNode) getLocalSubnet() (string, error) {
@@ -61,16 +62,18 @@ func (plugin *OsdnNode) getLocalSubnet() (string, error) {
 func (plugin *OsdnNode) alreadySetUp(localSubnetGatewayCIDR, clusterNetworkCIDR string) bool {
 	var found bool
 
-	exec := kexec.New()
-	itx := ipcmd.NewTransaction(exec, Tun0)
-	addrs, err := itx.GetAddresses()
-	itx.EndTransaction()
+	l, err := netlink.LinkByName(Tun0)
+	if err != nil {
+		return false
+	}
+
+	addrs, err := netlink.AddrList(l, syscall.AF_INET)
 	if err != nil {
 		return false
 	}
 	found = false
 	for _, addr := range addrs {
-		if strings.Contains(addr, localSubnetGatewayCIDR) {
+		if addr.IPNet.String() == localSubnetGatewayCIDR {
 			found = true
 			break
 		}
@@ -79,15 +82,13 @@ func (plugin *OsdnNode) alreadySetUp(localSubnetGatewayCIDR, clusterNetworkCIDR
 		return false
 	}
 
-	itx = ipcmd.NewTransaction(exec, Tun0)
-	routes, err := itx.GetRoutes()
-	itx.EndTransaction()
+	routes, err := netlink.RouteList(l, syscall.AF_INET)
 	if err != nil {
 		return false
 	}
 	found = false
 	for _, route := range routes {
-		if strings.Contains(route, clusterNetworkCIDR+" ") {
+		if route.Dst != nil && route.Dst.String() == clusterNetworkCIDR {
 			found = true
 			break
 		}
@@ -110,15 +111,17 @@ func deleteLocalSubnetRoute(device, localSubnetCIDR string) {
 		Steps:    6,
 	}
 	err := utilwait.ExponentialBackoff(backoff, func() (bool, error) {
-		itx := ipcmd.NewTransaction(kexec.New(), device)
-		routes, err := itx.GetRoutes()
+		l, err := netlink.LinkByName(device)
+		if err != nil {
+			return false, fmt.Errorf("could not get interface %s: %v", device, err)
+		}
+		routes, err := netlink.RouteList(l, syscall.AF_INET)
 		if err != nil {
 			return false, fmt.Errorf("could not get routes: %v", err)
 		}
 		for _, route := range routes {
-			if strings.Contains(route, localSubnetCIDR) {
-				itx.DeleteRoute(localSubnetCIDR)
-				err = itx.EndTransaction()
+			if route.Dst != nil && route.Dst.String() == localSubnetCIDR {
+				err = netlink.RouteDel(&route)
 				if err != nil {
 					return false, fmt.Errorf("could not delete route: %v", err)
 				}
@@ -166,14 +169,35 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
 		return false, err
 	}
 
-	itx := ipcmd.NewTransaction(exec, Tun0)
-	itx.AddAddress(gwCIDR)
-	defer deleteLocalSubnetRoute(Tun0, localSubnetCIDR)
-	itx.SetLink("mtu", fmt.Sprint(plugin.mtu))
-	itx.SetLink("up")
-	itx.AddRoute(clusterNetworkCIDR, "proto", "kernel", "scope", "link")
-	itx.AddRoute(serviceNetworkCIDR)
-	err = itx.EndTransaction()
+	l, err := netlink.LinkByName(Tun0)
+	if err == nil {
+		gwIP, _ := netlink.ParseIPNet(gwCIDR)
+		err = netlink.AddrAdd(l, &netlink.Addr{IPNet: gwIP})
+		if err == nil {
+			defer deleteLocalSubnetRoute(Tun0, localSubnetCIDR)
+		}
+	}
+	if err == nil {
+		err = netlink.LinkSetMTU(l, int(plugin.mtu))
+	}
+	if err == nil {
+		err = netlink.LinkSetUp(l)
+	}
+	if err == nil {
+		route := &netlink.Route{
+			LinkIndex: l.Attrs().Index,
+			Scope:     netlink.SCOPE_LINK,
+			Dst:       plugin.networkInfo.ClusterNetwork,
+		}
+		err = netlink.RouteAdd(route)
+	}
+	if err == nil {
+		route := &netlink.Route{
+			LinkIndex: l.Attrs().Index,
+			Dst:       plugin.networkInfo.ServiceNetwork,
+		}
+		err = netlink.RouteAdd(route)
+	}
 	if err != nil {
 		return false, err
 	}