Merge pull request #17087 from danwinship/fix-cross-build

Automatic merge from submit-queue.

Fix cross build

#17043 broke the cross build by depending on netlink from pkg/network/common. This fixes that (by just moving the new function since it wasn't needed outside of pkg/network/node anyway).

Author: openshift-merge-robot

hack/import-restrictions.json

@@ -188,6 +188,19 @@
     ]
   },
 
+  {
+    "checkedPackages": [
+      "github.com/openshift/origin/pkg/network/master",
+      "github.com/openshift/origin/pkg/network/common"
+    ],
+    "forbiddenImportPackageRoots": [
+      "vendor/github.com/vishvananda/netlink"
+    ],
+    "allowedImportPackageRoots": [
+      ""
+    ]
+  },
+
   {
     "checkedPackages": [
       "github.com/openshift/origin/pkg/network/apis/network",

pkg/network/common/common.go

@@ -22,8 +22,6 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	kinternalinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
-
-	"github.com/vishvananda/netlink"
 )
 
 func HostSubnetToString(subnet *networkapi.HostSubnet) string {
@@ -280,34 +278,3 @@ func RegisterSharedInformerEventHandlers(kubeInformers kinternalinformers.Shared
 		},
 	})
 }
-
-var (
-	ErrorNetworkInterfaceNotFound = fmt.Errorf("could not find network interface")
-)
-
-func GetLinkDetails(ip string) (netlink.Link, *net.IPNet, error) {
-	links, err := netlink.LinkList()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	for _, link := range links {
-		addrs, err := netlink.AddrList(link, netlink.FAMILY_V4)
-		if err != nil {
-			glog.Warningf("Could not get addresses of interface %q: %v", link.Attrs().Name, err)
-			continue
-		}
-
-		for _, addr := range addrs {
-			if addr.IP.String() == ip {
-				_, ipNet, err := net.ParseCIDR(addr.IPNet.String())
-				if err != nil {
-					return nil, nil, fmt.Errorf("could not parse CIDR network from address %q: %v", ip, err)
-				}
-				return link, ipNet, nil
-			}
-		}
-	}
-
-	return nil, nil, ErrorNetworkInterfaceNotFound
-}

pkg/network/node/egressip.go

@@ -72,7 +72,7 @@ func newEgressIPWatcher(localIP string, oc *ovsController) *egressIPWatcher {
 
 func (eip *egressIPWatcher) Start(networkClient networkclient.Interface, iptables *NodeIPTables) error {
 	var err error
-	if eip.localEgressLink, eip.localEgressNet, err = common.GetLinkDetails(eip.localIP); err != nil {
+	if eip.localEgressLink, eip.localEgressNet, err = GetLinkDetails(eip.localIP); err != nil {
 		// Not expected, should already be caught by node.New()
 		return err
 	}

pkg/network/node/node.go

@@ -222,8 +222,8 @@ func (c *OsdnNodeConfig) setNodeIP() error {
 		}
 	}
 
-	if _, _, err := common.GetLinkDetails(c.SelfIP); err != nil {
-		if err == common.ErrorNetworkInterfaceNotFound {
+	if _, _, err := GetLinkDetails(c.SelfIP); err != nil {
+		if err == ErrorNetworkInterfaceNotFound {
 			return fmt.Errorf("node IP %q is not a local/private address (hostname %q)", c.SelfIP, c.Hostname)
 		} else {
 			return err
@@ -233,6 +233,37 @@ func (c *OsdnNodeConfig) setNodeIP() error {
 	return nil
 }
 
+var (
+	ErrorNetworkInterfaceNotFound = fmt.Errorf("could not find network interface")
+)
+
+func GetLinkDetails(ip string) (netlink.Link, *net.IPNet, error) {
+	links, err := netlink.LinkList()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	for _, link := range links {
+		addrs, err := netlink.AddrList(link, netlink.FAMILY_V4)
+		if err != nil {
+			glog.Warningf("Could not get addresses of interface %q: %v", link.Attrs().Name, err)
+			continue
+		}
+
+		for _, addr := range addrs {
+			if addr.IP.String() == ip {
+				_, ipNet, err := net.ParseCIDR(addr.IPNet.String())
+				if err != nil {
+					return nil, nil, fmt.Errorf("could not parse CIDR network from address %q: %v", ip, err)
+				}
+				return link, ipNet, nil
+			}
+		}
+	}
+
+	return nil, nil, ErrorNetworkInterfaceNotFound
+}
+
 // 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 {