Remove netlink package dependency from the ip package,

so that common code no longer needs to be Linux specific.

Signed-off-by: Nate Sweet <nathanjsweet@pm.me>

pkg/datapath/linux/node_addressing.go

@@ -30,7 +30,7 @@ import (
 // code should really move into this package.
 
 func listLocalAddresses(family int) ([]net.IP, error) {
-	ipsToExclude := ip.GetExcludedIPs()
+	ipsToExclude := node.GetExcludedIPs()
 	addrs, err := netlink.AddrList(nil, family)
 	if err != nil {
 		return nil, err

pkg/ip/ip.go

@@ -755,11 +755,8 @@ func initPrivatePrefixes() {
 	}
 }
 
-var excludedIPs []net.IP
-
 func init() {
 	initPrivatePrefixes()
-	initExcludedIPs()
 }
 
 // IsExcluded returns whether a given IP is must be excluded
@@ -784,12 +781,6 @@ func IsPublicAddr(ip net.IP) bool {
 	return true
 }
 
-// GetExcludedIPs returns a list of IPs from netdevices that Cilium
-// needs to exclude to operate
-func GetExcludedIPs() []net.IP {
-	return excludedIPs
-}
-
 // GetCIDRPrefixesFromIPs returns all of the ips as a slice of *net.IPNet.
 func GetCIDRPrefixesFromIPs(ips []net.IP) []*net.IPNet {
 	if len(ips) == 0 {

pkg/ip/ip_darwin.go → pkg/node/ip.go

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 Authors of Cilium
+// Copyright 2017-2020 Authors of Cilium
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ip
+package node
 
-func initExcludedIPs() {}
+import "net"
+
+var excludedIPs []net.IP
+
+// GetExcludedIPs returns a list of IPs from netdevices that Cilium
+// needs to exclude to operate
+func GetExcludedIPs() []net.IP {
+	return excludedIPs
+}

pkg/ip/ip_linux.go → pkg/node/ip_linux.go

@@ -12,14 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ip
+package node
 
 import (
 	"strings"
 
 	"github.com/vishvananda/netlink"
 )
 
+func init() {
+	initExcludedIPs()
+}
+
 func initExcludedIPs() {
 	// We exclude below bad device prefixes from address selection ...
 	prefixes := []string{

pkg/node/node_address_linux.go

@@ -1,4 +1,4 @@
-// Copyright 2016-2018 Authors of Cilium
+// Copyright 2016-2020 Authors of Cilium
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ func firstGlobalAddr(intf string, preferredIP net.IP, family int) (net.IP, error
 	var ipLen int
 	var err error
 
-	ipsToExclude := ip.GetExcludedIPs()
+	ipsToExclude := GetExcludedIPs()
 	linkScopeMax := unix.RT_SCOPE_UNIVERSE
 	if family == netlink.FAMILY_V4 {
 		ipLen = 4