Skip to content

Commit

Permalink
Merge pull request #214 from loxilb-io/gh-212
Browse files Browse the repository at this point in the history
gh-212 Minor fixes for dual-stack NAT64 support
  • Loading branch information
TrekkieCoder authored Dec 7, 2024
2 parents e8a6441 + e72def6 commit 892b82a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkg/agent/manager/loadbalancer/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error {
livenessCheck := false
lbMode := -1
addrType := "ipv4"
epAddrType := "ipv4"
timeout := 30 * 60
probeType := ""
probePort := 0
Expand Down Expand Up @@ -438,6 +439,9 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error {
ipPool := m.ipPoolTbl[defaultPoolName]
if addrType == "ipv6" || addrType == "ipv6to4" {
ipPool = m.ip6PoolTbl[defaultPoolName]
if addrType == "ipv6" {
epAddrType = addrType
}
}

// Check for loxilb specific annotations - poolName
Expand Down Expand Up @@ -664,7 +668,7 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error {
cacheKey := GenKey(svc.Namespace, svc.Name)
lbCacheEntry, added := m.lbCache[cacheKey]

endpointIPs, err := m.getEndpoints(svc, usePodNet, needMultusEP, addrType, matchNodeLabel)
endpointIPs, err := m.getEndpoints(svc, usePodNet, needMultusEP, epAddrType, matchNodeLabel)
if err != nil {
if !added {
klog.Errorf("getEndpoints return error. err: %v", err)
Expand Down

0 comments on commit 892b82a

Please sign in to comment.