Merge pull request #113 from loxilb-io/multus-chk

PR - skip loxilb class check if multus annotation exists
loxilb-io · Mar 12, 2024 · 235193f · 235193f
2 parents b16fbab + 7c57d61
commit 235193f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go
@@ -320,7 +320,11 @@ func (m *Manager) syncLoadBalancer(lb LbCacheKey) error {
 func (m *Manager) addLoadBalancer(svc *corev1.Service) error {
 	// check LoadBalancerClass
 	lbClassName := svc.Spec.LoadBalancerClass
-	if lbClassName == nil {
+
+	// Check for loxilb specific annotation - Multus Networks
+	_, needPodEP := svc.Annotations[LoxiMultusServiceAnnotation]
+	if lbClassName == nil && !needPodEP {
+		klog.V(4).Infof("service %s/%s missing loadBalancerClass & multus annotation", svc.Namespace, svc.Name)
 		return nil
 	}
 
@@ -351,7 +355,7 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error {
 		prefLocal = true
 	}
 
-	if strings.Compare(*lbClassName, m.networkConfig.LoxilbLoadBalancerClass) != 0 {
+	if strings.Compare(*lbClassName, m.networkConfig.LoxilbLoadBalancerClass) != 0 && !needPodEP {
 		return nil
 	}
 
@@ -510,8 +514,6 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error {
 		numSecondarySvc = 0
 	}
 
-	// Check for loxilb specific annotation - Multus Networks
-	_, needPodEP := svc.Annotations[LoxiMultusServiceAnnotation]
 	endpointIPs, err := m.getEndpoints(svc, needPodEP, addrType)
 	if err != nil {
 		return err