[release-4.6] Bug 1932967: Allow baremetal-runtimecfg to function when the node isn't attached to the VIP network

cmd/runtimecfg/node-ip.go

@@ -31,7 +31,7 @@ var nodeIPCmd = &cobra.Command{
 var nodeIPShowCmd = &cobra.Command{
 	Use:                   "show [Virtual IP...]",
 	DisableFlagsInUseLine: true,
-	Short:                 "Show a configured IP address that directly routes to the given Virtual IPs. If no Virtual IPs are provided it will pick an IP associated with the default route.",
+	Short:                 "Show a configured IP address that directly routes to the given Virtual IPs. If no Virtual IPs are provided or if the node isn't attached to the VIP subnet, it will pick an IP associated with the default route.",
 	Args:                  cobra.MinimumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		err := show(cmd, args)
@@ -44,7 +44,7 @@ var nodeIPShowCmd = &cobra.Command{
 var nodeIPSetCmd = &cobra.Command{
 	Use:                   "set [Virtual IP...]",
 	DisableFlagsInUseLine: true,
-	Short:                 "Sets container runtime services to bind to a configured IP address that directly routes to the given virtual IPs. If no Virtual IPs are provided it will pick an IP associated with the default route.",
+	Short:                 "Sets container runtime services to bind to a configured IP address that directly routes to the given virtual IPs. If no Virtual IPs are provided or if the node isn't attached to the VIP subnet, it will pick an IP associated with the default route.",
 	Args:                  cobra.MinimumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		err := set(cmd, args)
@@ -139,13 +139,16 @@ func getSuitableIP(retry bool, vips []net.IP) (chosen net.IP, err error) {
 
 		if len(vips) > 0 {
 			nodeAddrs, err = utils.AddressesRouting(vips, utils.ValidNodeAddress)
-		} else {
-			nodeAddrs, err = utils.AddressesDefault(utils.ValidNodeAddress)
+			if err != nil {
+				return nil, err
+			}
 		}
-		if err != nil {
-			return nil, err
+		if len(nodeAddrs) == 0 {
+			nodeAddrs, err = utils.AddressesDefault(utils.ValidNodeAddress)
+			if err != nil {
+				return nil, err
+			}
 		}
-
 		if len(nodeAddrs) > 0 {
 			chosen = nodeAddrs[0]
 			break

pkg/config/net.go

@@ -4,9 +4,11 @@ import (
 	"fmt"
 	"net"
 	"strings"
+
+	"github.com/openshift/baremetal-runtimecfg/pkg/utils"
 )
 
-func GetInterfaceAndNonVIPAddr(vips []net.IP) (vipIface net.Interface, nonVipAddr *net.IPNet, err error) {
+func getInterfaceAndNonVIPAddr(vips []net.IP) (vipIface net.Interface, nonVipAddr *net.IPNet, err error) {
 	if len(vips) < 1 {
 		return vipIface, nonVipAddr, fmt.Errorf("At least one VIP needs to be fed to this function")
 	}
@@ -22,6 +24,9 @@ func GetInterfaceAndNonVIPAddr(vips []net.IP) (vipIface net.Interface, nonVipAdd
 
 	for _, iface := range ifaces {
 		addrs, err := iface.Addrs()
+		if err != nil {
+			return vipIface, nonVipAddr, err
+		}
 		for _, addr := range addrs {
 			switch n := addr.(type) {
 			case *net.IPNet:
@@ -34,13 +39,36 @@ func GetInterfaceAndNonVIPAddr(vips []net.IP) (vipIface net.Interface, nonVipAdd
 				_, nn, _ := net.ParseCIDR(strings.Replace(addr.String(), "/128", "/64", 1))
 
 				if nn.Contains(vips[0]) {
-					return iface, n, err
+					return iface, n, nil
 				}
 			default:
 				fmt.Println("not supported addr")
 			}
 		}
 	}
 
-	return vipIface, nonVipAddr, fmt.Errorf("No interface nor address found for the given VIPs")
+	nodeAddrs, err := utils.AddressesDefault(utils.ValidNodeAddress)
+	if err != nil {
+		return vipIface, nonVipAddr, err
+	}
+	if len(nodeAddrs) == 0 {
+		return vipIface, nonVipAddr, fmt.Errorf("No interface nor address found")
+	}
+	for _, iface := range ifaces {
+		addrs, err := iface.Addrs()
+		if err != nil {
+			return vipIface, nonVipAddr, err
+		}
+		for _, addr := range addrs {
+			switch n := addr.(type) {
+			case *net.IPNet:
+				if n.IP.String() == nodeAddrs[0].String() {
+					return iface, n, nil
+				}
+			default:
+				fmt.Println("not supported addr")
+			}
+		}
+	}
+	return vipIface, nonVipAddr, fmt.Errorf("No interface nor address found")
 }

pkg/config/node.go

@@ -213,7 +213,7 @@ func GetVRRPConfig(apiVip, ingressVip, dnsVip net.IP) (vipIface net.Interface, n
 	if dnsVip != nil {
 		vips = append(vips, dnsVip)
 	}
-	return GetInterfaceAndNonVIPAddr(vips)
+	return getInterfaceAndNonVIPAddr(vips)
 }
 
 func IsUpgradeStillRunning(kubeconfigPath string) (error, bool) {