From df27cc30eaa58cb31b491c87184aef25d137941a Mon Sep 17 00:00:00 2001 From: backguynn Date: Tue, 18 Jun 2024 15:14:15 +0900 Subject: [PATCH] add privateIP in LoadBalancerModel --- pkg/agent/manager/loadbalancer/loadbalancer.go | 4 +++- pkg/api/lb.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go index 4b6b0b6..f5fecba 100644 --- a/pkg/agent/manager/loadbalancer/loadbalancer.go +++ b/pkg/agent/manager/loadbalancer/loadbalancer.go @@ -791,11 +791,12 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error { klog.Infof("Secondary IP Pairs %v", m.lbCache[cacheKey].SecIPs) } + privateIP, _, _ := net.ParseCIDR(m.networkConfig.PrivateCIDR) for _, ingSvcPair := range ingSvcPairs { var errChList []chan error lbArgs := LbArgs{ externalIP: ingSvcPair.IPString, - privateIP: m.networkConfig.PrivateCIDR, + privateIP: privateIP.String(), livenessCheck: m.lbCache[cacheKey].ActCheck, lbMode: m.lbCache[cacheKey].LbMode, timeout: m.lbCache[cacheKey].Timeout, @@ -1465,6 +1466,7 @@ func (m *Manager) makeLoxiLoadBalancerModel(lbArgs *LbArgs, svc *corev1.Service, return api.LoadBalancerModel{ Service: api.LoadBalancerService{ ExternalIP: lbArgs.externalIP, + PrivateIP: lbArgs.privateIP, Port: uint16(port.Port), Protocol: strings.ToLower(string(port.Protocol)), BGP: bgpMode, diff --git a/pkg/api/lb.go b/pkg/api/lb.go index b6c2bcd..9dd3992 100644 --- a/pkg/api/lb.go +++ b/pkg/api/lb.go @@ -42,6 +42,7 @@ func (lbModel *LoadBalancerModel) GetKeyStruct() LoxiModel { type LoadBalancerService struct { ExternalIP string `json:"externalIP" key:"externalipaddress"` + PrivateIP string `json:"privateIP" key:"privateipaddress"` Port uint16 `json:"port" key:"port"` Protocol string `json:"protocol" key:"protocol"` Sel EpSelect `json:"sel"`