Merge pull request #25 from loxilb-io/bgp1

PR - bgp custom listen port support
loxilb-io · Jul 30, 2023 · 3a18515 · 3a18515
2 parents 74ad6d4 + 8b69733
commit 3a18515
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/cmd/loxilb-agent/agent.go b/cmd/loxilb-agent/agent.go
@@ -73,6 +73,7 @@ func run(o *Options) error {
 	klog.Infof("LB Class: %s", o.config.LoxilbLoadBalancerClass)
 	klog.Infof("CIDR: %s", o.config.ExternalCIDR)
 	klog.Infof("SetBGP: %v", o.config.SetBGP)
+	klog.Infof("ListenBGPPort: %v", o.config.ListenBGPPort)
 	klog.Infof("SetLBMode: %v", o.config.SetLBMode)
 	klog.Infof("ExclIPAM: %v", o.config.ExclIPAM)
 	klog.Infof("Monitor: %v", o.config.Monitor)
@@ -86,6 +87,7 @@ func run(o *Options) error {
 		ExternalCIDR:            o.config.ExternalCIDR,
 		ExternalCIDR6:           o.config.ExternalCIDR6,
 		SetBGP:                  o.config.SetBGP,
+		ListenBGPPort:           o.config.ListenBGPPort,
 		SetRoles:                o.config.SetRoles,
 		ExtBGPPeers:             o.config.ExtBGPPeers,
 		SetLBMode:               o.config.SetLBMode,

diff --git a/cmd/loxilb-agent/config.go b/cmd/loxilb-agent/config.go
@@ -50,6 +50,8 @@ type AgentConfig struct {
 	ExtBGPPeers []string `yaml:"extBGPPeers,omitempty"`
 	// support BGP protocol
 	SetBGP uint16 `yaml:"setBGP,omitempty,default=0"`
+	// Custom BGP Port
+	ListenBGPPort uint16 `yaml:"listenBGPPort,omitempty,default=179"`
 	// loxilb loadbalancer mode
 	SetLBMode uint16 `yaml:"setLBMode,omitempty"`
 	// Shared or exclusive IPAM

diff --git a/cmd/loxilb-agent/options.go b/cmd/loxilb-agent/options.go
@@ -60,6 +60,7 @@ func (o *Options) addFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&secondaryCIDRs6, "externalSecondaryCIDRs6", secondaryCIDRs6, "External Secondary CIDR6 Range(s)")
 	fs.StringVar(&o.config.LoxilbLoadBalancerClass, "loxilbLoadBalancerClass", o.config.LoxilbLoadBalancerClass, "Load-Balancer Class Name")
 	fs.Uint16Var(&o.config.SetBGP, "setBGP", o.config.SetBGP, "Use BGP routing")
+	fs.Uint16Var(&o.config.ListenBGPPort, "listenBGPPort", o.config.ListenBGPPort, "Custom BGP listen port")
 	fs.StringVar(&extBGPPeers, "extBGPPeers", extBGPPeers, "External BGP Peer(s)")
 	fs.BoolVar(&o.config.ExclIPAM, "setUniqueIP", o.config.ExclIPAM, "Use unique IPAM per service")
 	fs.Uint16Var(&o.config.SetLBMode, "setLBMode", o.config.SetLBMode, "LB mode to use")

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 {