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

Author: tamihiro

pkg/controllers/routing/bgp_peers.go

@@ -89,14 +89,19 @@ 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 := &config.Neighbor{
 			Config: config.NeighborConfig{
 				NeighborAddress: nodeIP.String(),
 				PeerAs:          nrc.nodeAsnNumber,
 			},
 			Transport: config.Transport{
 				Config: config.TransportConfig{
-					RemotePort: nrc.bgpPort,
+					LocalAddress: nrc.nodeIP.String(),
+					RemotePort:   nrc.bgpPort,
 				},
 			},
 		}
@@ -259,7 +264,7 @@ func connectToExternalBGPPeers(server *gobgp.BgpServer, peerNeighbors []*config.
 }
 
 // Does validation and returns neighbor configs
-func newGlobalPeers(ips []net.IP, ports []uint16, asns []uint32, passwords []string) (
+func newGlobalPeers(ips []net.IP, ports []uint16, asns []uint32, passwords []string, localAddress string) (
 	[]*config.Neighbor, error) {
 	peers := make([]*config.Neighbor, 0)
 
@@ -294,14 +299,19 @@ func newGlobalPeers(ips []net.IP, ports []uint16, 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 := &config.Neighbor{
 			Config: config.NeighborConfig{
 				NeighborAddress: ips[i].String(),
 				PeerAs:          asns[i],
 			},
 			Transport: config.Transport{
 				Config: config.TransportConfig{
-					RemotePort: options.DEFAULT_BGP_PORT,
+					LocalAddress: localAddress,
+					RemotePort:   options.DEFAULT_BGP_PORT,
 				},
 			},
 		}

pkg/controllers/routing/network_routes_controller.go

@@ -812,7 +812,7 @@ func (nrc *NetworkRoutingController) startBgpServer() error {
 		}
 
 		// Create and set Global Peer Router complete configs
-		nrc.globalPeerRouters, err = newGlobalPeers(peerIPs, peerPorts, peerASNs, peerPasswords)
+		nrc.globalPeerRouters, err = newGlobalPeers(peerIPs, peerPorts, peerASNs, peerPasswords, nrc.nodeIP.String())
 		if err != nil {
 			nrc.bgpServer.Stop()
 			return fmt.Errorf("Failed to process Global Peer Router configs: %s", err)
@@ -969,7 +969,7 @@ func NewNetworkRoutingController(clientset kubernetes.Interface,
 	}
 
 	nrc.globalPeerRouters, err = newGlobalPeers(kubeRouterConfig.PeerRouters, peerPorts,
-		peerASNs, peerPasswords)
+		peerASNs, peerPasswords, nrc.nodeIP.String())
 	if err != nil {
 		return nil, fmt.Errorf("Error processing Global Peer Router configs: %s", err)
 	}