Support for custom bgp listen port

loxilb-io · Jul 30, 2023 · c6014d4 · c6014d4
1 parent e7aab92
commit c6014d4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go
@@ -24,6 +24,7 @@ type NetworkConfig struct {
 	ExternalCIDR6           string
 	ExternalSecondaryCIDRs6 []string
 	SetBGP                  uint16
+	ListenBGPPort           uint16
 	ExtBGPPeers             []string
 	SetLBMode               uint16
 	Monitor                 bool

diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go
@@ -1056,12 +1056,18 @@ func (m *Manager) makeLoxiLBCIStatusModel(instance string, client *api.LoxiClien
 	}, nil
 }
 
-func (m *Manager) makeLoxiLBBGPGlobalModel(localAS int, selfID string, setNHSelf bool) (api.BGPGlobalConfig, error) {
+func (m *Manager) makeLoxiLBBGPGlobalModel(localAS int, selfID string, setNHSelf bool, lPort uint16) (api.BGPGlobalConfig, error) {
+
+	port := lPort
+	if lPort == 0 {
+		port = 179
+	}
 
 	return api.BGPGlobalConfig{
-		LocalAs:   int64(localAS),
-		RouterID:  selfID,
-		SetNHSelf: setNHSelf,
+		LocalAs:    int64(localAS),
+		RouterID:   selfID,
+		SetNHSelf:  setNHSelf,
+		ListenPort: port,
 	}, nil
 }
 
@@ -1274,9 +1280,9 @@ loop:
 				}
 				var bgpGlobalCfg api.BGPGlobalConfig
 				if aliveClient.PeeringOnly {
-					bgpGlobalCfg, _ = m.makeLoxiLBBGPGlobalModel(int(m.networkConfig.SetBGP), aliveClient.Host, false)
+					bgpGlobalCfg, _ = m.makeLoxiLBBGPGlobalModel(int(m.networkConfig.SetBGP), aliveClient.Host, false, m.networkConfig.ListenBGPPort)
 				} else {
-					bgpGlobalCfg, _ = m.makeLoxiLBBGPGlobalModel(int(m.networkConfig.SetBGP), aliveClient.Host, true)
+					bgpGlobalCfg, _ = m.makeLoxiLBBGPGlobalModel(int(m.networkConfig.SetBGP), aliveClient.Host, true, m.networkConfig.ListenBGPPort)
 				}
 				if err := aliveClient.BGP().CreateGlobalConfig(context.Background(), &bgpGlobalCfg); err == nil {
 					klog.Infof("set-bgp-global success")

diff --git a/pkg/api/bgp.go b/pkg/api/bgp.go
@@ -18,6 +18,8 @@ type BGPGlobalConfig struct {
 	RouterID string `json:"routerId,omitempty"`
 	// Set Next hop self option
 	SetNHSelf bool `json:"setNextHopSelf,omitempty"`
+	// Listen Port
+	ListenPort uint16 `json:"listenPort,omitempty"`
 }
 
 type BGPAPI struct {