Merge pull request #79 from backguynn/main

support external loxilb & in-cluster pod peering
loxilb-io · Dec 4, 2023 · 2937b5d · 2937b5d
2 parents 0b48762 + 43a69f0
commit 2937b5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmd/loxilb-agent/agent.go b/cmd/loxilb-agent/agent.go
@@ -182,6 +182,7 @@ func run(o *Options) error {
 		if len(networkConfig.LoxilbURLs) <= 0 {
 			lbManager.DiscoverLoxiLBServices(loxiLBLiveCh, loxiLBPurgeCh)
 		}
+		lbManager.DiscoverLoxiLBPeerServices(loxiLBLiveCh, loxiLBPurgeCh)
 
 		if networkConfig.SetRoles != "" {
 			lbManager.SelectLoxiLBRoles(true, loxiLBSelMasterEvent)

diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go
@@ -1291,9 +1291,11 @@ func (m *Manager) DiscoverLoxiLBServices(loxiLBAliveCh chan *api.LoxiClient, lox
 		}
 	}
 	m.LoxiClients = tmp
+}
 
+func (m *Manager) DiscoverLoxiLBPeerServices(loxiLBAliveCh chan *api.LoxiClient, loxiLBPurgeCh chan *api.LoxiClient) {
 	var tmploxilbPeerClients []*api.LoxiClient
-	ips, err = k8s.GetServiceEndPoints(m.kubeClient, "loxilb-peer-service", "kube-system")
+	ips, err := k8s.GetServiceEndPoints(m.kubeClient, "loxilb-peer-service", "kube-system")
 	klog.Infof("loxilb-peer-service end-points:  %v", ips)
 	if err != nil {
 		ips = []net.IP{}
@@ -1500,9 +1502,9 @@ loop:
 				}(&bgpGlobalCfg)
 
 				if err == nil {
-					klog.Infof("set-bgp-global success")
+					klog.Infof("loxilb(%s) set-bgp-global success", aliveClient.Host)
 				} else {
-					klog.Infof("set-bgp-global failed(%s)", err)
+					klog.Infof("loxilb(%s) set-bgp-global failed(%s)", aliveClient.Host, err)
 					m.checkHandleBGPCfgErrors(loxiAliveCh, aliveClient, err)
 				}