Skip to content

K
k3s
Commit 15919758 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46138 from pmichali/issue44848b

Automatic merge from submit-queue (batch tested with PRs 48196, 42783, 48507, 47719, 46138) IPv6 support for getting IP from default route This is another part of the effort to update ChoseHostInterface() to support IPv6. In particular, this focuses on the call path, starting from chooseHostInterfaceFromRoute(), which attempts to find the node IP by using default route information. In the original code, routes are collected, and examined to find default routes. For a default route, the IPs for the associated interface are checked to see if there is one that is a V4 address, and is not a loopback, link local, or multicast address. If found, that IP will be used for the node IP. With this PR, there are some slight changes to prepare for allowing IPs from IPv6 default routes. The routes (IPv4 at this time - a subsequent PR will handle IPv6) are collected as before. If the route is a default route AND it's GW address is a global unicast address, then the IPs for the associated interface are checked. This time though, we just pick the IP that is on the same subnet as the gateway IP. This ensures it is not a link local, loopback, or multicast address. It saves time, by nt checking IPs for interfaces that don't have a "global" default route. It also will ensure the right IP is used, when using both IPv4 and IPv6 addresses. For example, if we have eth0 with global IPv4 and IPv6 addresses, and an IPv6 default route, we want to select the IPv6 address, as it is associated with the default route. Another case is that same interface, along with eth1 containing an IPv4 address with a default route. We want to select eth1's IPv4 address, and not the IPv4 on eth0. This change adds more UT coverage to several methods, and removes UTs that are redundantly testing at a higher level. Coverage is slightly improved. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: xref #44848 **Special notes for your reviewer**: This goes along with PR 46044, and will have another PR to the next part. **Release note**: ```release-noteNONE ```
parents b07581e6 78ae9a57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 41 deletions
staging/src/k8s.io/apimachinery/pkg/util/net/interface.go
View file @ 15919758
...@@ -43,6 +43,7 @@ type Route struct { ...@@ -43,6 +43,7 @@ type Route struct {
// TODO: add more fields here if needed // TODO: add more fields here if needed
} }
// getRoutes obtains the IPv4 routes, and filters out non-default routes.
func getRoutes(input io.Reader) ([]Route, error) { func getRoutes(input io.Reader) ([]Route, error) {
routes := []Route{} routes := []Route{}
if input == nil { if input == nil {
...@@ -59,24 +60,30 @@ func getRoutes(input io.Reader) ([]Route, error) { ...@@ -59,24 +60,30 @@ func getRoutes(input io.Reader) ([]Route, error) {
continue continue
} }
fields := strings.Fields(line) fields := strings.Fields(line)
routes = append(routes, Route{}) dest, err := parseHexToIPv4(fields[1])
route := &routes[len(routes)-1]
route.Interface = fields[0]
ip, err := parseIP(fields[1])
if err != nil { if err != nil {
return nil, err return nil, err
} }
route.Destination = ip gw, err := parseHexToIPv4(fields[2])
ip, err = parseIP(fields[2])
if err != nil { if err != nil {
return nil, err return nil, err
} }
route.Gateway = ip if !dest.Equal(net.IPv4zero) {
continue
}
routes = append(routes, Route{
Interface: fields[0],
Destination: dest,
Gateway: gw,
})
} }
return routes, nil return routes, nil
} }
func parseIP(str string) (net.IP, error) { // parseHexToIPv4 takes the hex IP address string from route file and converts it
// from little endian to big endian for creation of a net.IP address.
// a net.IP, using big endian ordering.
func parseHexToIPv4(str string) (net.IP, error) {
if str == "" { if str == "" {
return nil, fmt.Errorf("input is nil") return nil, fmt.Errorf("input is nil")
} }
...@@ -84,12 +91,10 @@ func parseIP(str string) (net.IP, error) { ...@@ -84,12 +91,10 @@ func parseIP(str string) (net.IP, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
//TODO add ipv6 support
if len(bytes) != net.IPv4len { if len(bytes) != net.IPv4len {
return nil, fmt.Errorf("only IPv4 is supported") return nil, fmt.Errorf("invalid IPv4 address in route")
} }
bytes[0], bytes[1], bytes[2], bytes[3] = bytes[3], bytes[2], bytes[1], bytes[0] return net.IP([]byte{bytes[3], bytes[2], bytes[1], bytes[0]}), nil
return net.IP(bytes), nil
} }
func isInterfaceUp(intf *net.Interface) bool { func isInterfaceUp(intf *net.Interface) bool {
...@@ -107,10 +112,18 @@ func isLoopbackOrPointToPoint(intf *net.Interface) bool { ...@@ -107,10 +112,18 @@ func isLoopbackOrPointToPoint(intf *net.Interface) bool {
return intf.Flags&(net.FlagLoopback|net.FlagPointToPoint) != 0 return intf.Flags&(net.FlagLoopback|net.FlagPointToPoint) != 0
} }
//getFinalIP method receives all the IP addrs of a Interface func inFamily(ip net.IP, expectedFamily AddressFamily) bool {
//and returns a nil if the address is Loopback, Ipv6, link-local or nil. ipFamily := familyIPv4
//It returns a valid IPv4 if an Ipv4 address is found in the array. if ip.To4() == nil {
func getFinalIP(addrs []net.Addr) (net.IP, error) { ipFamily = familyIPv6
}
return ipFamily == expectedFamily
}
// getMatchingGlobalIP method checks all the IP addresses of a Interface looking
// for a valid non-loopback/link-local address of the requested family and returns
// it, if found.
func getMatchingGlobalIP(addrs []net.Addr, family AddressFamily) (net.IP, error) {
if len(addrs) > 0 { if len(addrs) > 0 {
for i := range addrs { for i := range addrs {
glog.V(4).Infof("Checking addr %s.", addrs[i].String()) glog.V(4).Infof("Checking addr %s.", addrs[i].String())
...@@ -118,17 +131,15 @@ func getFinalIP(addrs []net.Addr) (net.IP, error) { ...@@ -118,17 +131,15 @@ func getFinalIP(addrs []net.Addr) (net.IP, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
//Only IPv4 if inFamily(ip, family) {
//TODO : add IPv6 support if ip.IsGlobalUnicast() {
if ip.To4() != nil {
if !ip.IsLoopback() && !ip.IsLinkLocalMulticast() && !ip.IsLinkLocalUnicast() {
glog.V(4).Infof("IP found %v", ip) glog.V(4).Infof("IP found %v", ip)
return ip, nil return ip, nil
} else { } else {
glog.V(4).Infof("Loopback/link-local found %v", ip) glog.V(4).Infof("non-global IP found %v", ip)
} }
} else { } else {
glog.V(4).Infof("%v is not a valid IPv4 address", ip) glog.V(4).Infof("%v is not an IPv%d address", ip, int(family))
} }
} }
...@@ -136,7 +147,7 @@ func getFinalIP(addrs []net.Addr) (net.IP, error) { ...@@ -136,7 +147,7 @@ func getFinalIP(addrs []net.Addr) (net.IP, error) {
return nil, nil return nil, nil
} }
func getIPFromInterface(intfName string, nw networkInterfacer) (net.IP, error) { func getIPFromInterface(intfName string, forFamily AddressFamily, nw networkInterfacer) (net.IP, error) {
intf, err := nw.InterfaceByName(intfName) intf, err := nw.InterfaceByName(intfName)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -147,16 +158,15 @@ func getIPFromInterface(intfName string, nw networkInterfacer) (net.IP, error) { ...@@ -147,16 +158,15 @@ func getIPFromInterface(intfName string, nw networkInterfacer) (net.IP, error) {
return nil, err return nil, err
} }
glog.V(4).Infof("Interface %q has %d addresses :%v.", intfName, len(addrs), addrs) glog.V(4).Infof("Interface %q has %d addresses :%v.", intfName, len(addrs), addrs)
finalIP, err := getFinalIP(addrs) matchingIP, err := getMatchingGlobalIP(addrs, forFamily)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if finalIP != nil { if matchingIP != nil {
glog.V(4).Infof("valid IPv4 address for interface %q found as %v.", intfName, finalIP) glog.V(4).Infof("Found valid IPv%d address %v for interface %q.", int(forFamily), matchingIP, intfName)
return finalIP, nil return matchingIP, nil
} }
} }
return nil, nil return nil, nil
} }
...@@ -268,27 +278,30 @@ func chooseHostInterfaceFromRoute(inFile io.Reader, nw networkInterfacer) (net.I ...@@ -268,27 +278,30 @@ func chooseHostInterfaceFromRoute(inFile io.Reader, nw networkInterfacer) (net.I
if err != nil { if err != nil {
return nil, err return nil, err
} }
zero := net.IP{0, 0, 0, 0} if len(routes) == 0 {
var finalIP net.IP return nil, fmt.Errorf("No default routes.")
for i := range routes { }
//find interface with gateway // TODO: append IPv6 routes for processing - currently only have IPv4 routes
if routes[i].Destination.Equal(zero) { for _, family := range []AddressFamily{familyIPv4, familyIPv6} {
glog.V(4).Infof("Default route transits interface %q", routes[i].Interface) glog.V(4).Infof("Looking for default routes with IPv%d addresses", uint(family))
finalIP, err := getIPFromInterface(routes[i].Interface, nw) for _, route := range routes {
// TODO: When have IPv6 routes, filter here to speed up processing
// if route.Family != family {
// continue
// }
glog.V(4).Infof("Default route transits interface %q", route.Interface)
finalIP, err := getIPFromInterface(route.Interface, family, nw)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if finalIP != nil { if finalIP != nil {
glog.V(4).Infof("Choosing IP %v ", finalIP) glog.V(4).Infof("Found active IP %v ", finalIP)
return finalIP, nil return finalIP, nil
} }
} }
} }
glog.V(4).Infof("No valid IP found") glog.V(4).Infof("No active IP found by looking at default routes")
if finalIP == nil { return nil, fmt.Errorf("unable to select an IP from default routes.")
return nil, fmt.Errorf("Unable to select an IP.")
}
return nil, nil
} }
// If bind-address is usable, return it directly // If bind-address is usable, return it directly
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment