start peering connection to neighbors from node's advertise-ip

Author: tamihiro

pkg/controllers/routing/bgp_peers.go

@@ -91,13 +91,18 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 
 		currentNodes = append(currentNodes, nodeIP.String())
 		nrc.activeNodes[nodeIP.String()] = true
+		// explicitly set neighbors.transport.config.local-address with nodeIP which is configured
+		// as their neighbor address at the remote peers.
+		// this prevents the controller from initiating connection to its peers with a different IP address
+		// when multiple L3 interfaces are active.
 		n := &gobgpapi.Peer{
 			Conf: &gobgpapi.PeerConf{
 				NeighborAddress: nodeIP.String(),
 				PeerAs:          nrc.nodeAsnNumber,
 			},
 			Transport: &gobgpapi.Transport{
-				RemotePort: nrc.bgpPort,
+				LocalAddress: nrc.nodeIP.String(),
+				RemotePort:   nrc.bgpPort,
 			},
 		}
 
@@ -182,7 +187,7 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 	}
 }
 
-// connectToExternalBGPPeers adds all the configured eBGP peers (global or node specific) as neighbours// connectToExternalBGPPeers adds all the configured eBGP peers (global or node specific) as neighbours
+// connectToExternalBGPPeers adds all the configured eBGP peers (global or node specific) as neighbours
 func connectToExternalBGPPeers(server *gobgp.BgpServer, peerNeighbors []*gobgpapi.Peer, bgpGracefulRestart bool, bgpGracefulRestartDeferralTime time.Duration,
 	bgpGracefulRestartTime time.Duration, peerMultihopTTL uint8) error {
 	for _, n := range peerNeighbors {
@@ -238,7 +243,7 @@ func connectToExternalBGPPeers(server *gobgp.BgpServer, peerNeighbors []*gobgpap
 }
 
 // Does validation and returns neighbor configs
-func newGlobalPeers(ips []net.IP, ports []uint32, asns []uint32, passwords []string, holdtime float64) (
+func newGlobalPeers(ips []net.IP, ports []uint32, asns []uint32, passwords []string, holdtime float64, localAddress string) (
 	[]*gobgpapi.Peer, error) {
 	peers := make([]*gobgpapi.Peer, 0)
 
@@ -272,14 +277,19 @@ func newGlobalPeers(ips []net.IP, ports []uint32, asns []uint32, passwords []str
 				asns[i])
 		}
 
+		// explicitly set neighbors.transport.config.local-address with nodeIP which is configured
+		// as their neighbor address at the remote peers.
+		// this prevents the controller from initiating connection to its peers with a different IP address
+		// when multiple L3 interfaces are active.
 		peer := &gobgpapi.Peer{
 			Conf: &gobgpapi.PeerConf{
 				NeighborAddress: ips[i].String(),
 				PeerAs:          asns[i],
 			},
 			Timers: &gobgpapi.Timers{Config: &gobgpapi.TimersConfig{HoldTime: uint64(holdtime)}},
 			Transport: &gobgpapi.Transport{
-				RemotePort: options.DefaultBgpPort,
+				LocalAddress: localAddress,
+				RemotePort:   options.DefaultBgpPort,
 			},
 		}
 

pkg/controllers/routing/network_routes_controller.go

@@ -996,7 +996,7 @@ func (nrc *NetworkRoutingController) startBgpServer(grpcServer bool) error {
 		}
 
 		// Create and set Global Peer Router complete configs
-		nrc.globalPeerRouters, err = newGlobalPeers(peerIPs, peerPorts, peerASNs, peerPasswords, nrc.bgpHoldtime)
+		nrc.globalPeerRouters, err = newGlobalPeers(peerIPs, peerPorts, peerASNs, peerPasswords, nrc.bgpHoldtime, nrc.nodeIP.String())
 		if err != nil {
 			err2 := nrc.bgpServer.StopBgp(context.Background(), &gobgpapi.StopBgpRequest{})
 			if err2 != nil {
@@ -1187,7 +1187,8 @@ func NewNetworkRoutingController(clientset kubernetes.Interface,
 		}
 	}
 
-	nrc.globalPeerRouters, err = newGlobalPeers(kubeRouterConfig.PeerRouters, peerPorts, peerASNs, peerPasswords, nrc.bgpHoldtime)
+	nrc.globalPeerRouters, err = newGlobalPeers(kubeRouterConfig.PeerRouters, peerPorts,
+		peerASNs, peerPasswords, nrc.bgpHoldtime, nrc.nodeIP.String())
 	if err != nil {
 		return nil, fmt.Errorf("error processing Global Peer Router configs: %s", err)
 	}