Fix svcPort support (#2599)

F5Networks · Sep 23, 2022 · 853845a · 853845a
1 parent f5f30bc
commit 853845a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/controller/resourceConfig.go b/pkg/controller/resourceConfig.go
@@ -426,10 +426,10 @@ func (ctlr *Controller) prepareRSConfigFromVirtualServer(
 			continue
 		}
 		framedPools[poolName] = struct{}{}
-		targetPort := intstr.IntOrString{IntVal: pl.ServicePort}
+		targetPort := ctlr.fetchTargetPort(vs.Namespace, pl.Service, pl.ServicePort)
 
 		if (intstr.IntOrString{}) == targetPort {
-			targetPort = ctlr.fetchTargetPort(vs.Namespace, pl.Service, pl.ServicePort)
+			targetPort = intstr.IntOrString{IntVal: pl.ServicePort}
 		}
 		svcNamespace := vs.Namespace
 		if pl.ServiceNamespace != "" {

diff --git a/pkg/controller/worker.go b/pkg/controller/worker.go
@@ -1518,6 +1518,10 @@ func (ctlr *Controller) updatePoolMembersForNodePort(
 					ctlr.getEndpointsForNodePort(svcPort.NodePort, pool.NodeMemberLabel)
 			}
 		}
+		//check if endpoints are found
+		if rsCfg.Pools[index].Members == nil {
+			log.Errorf("[CORE]Endpoints could not be fetched for service %v with targetPort %v", svcName, pool.ServicePort.IntVal)
+		}
 	}
 }
 
@@ -1545,6 +1549,10 @@ func (ctlr *Controller) updatePoolMembersForCluster(
 			rsCfg.MetaData.Active = true
 			rsCfg.Pools[index].Members = mems
 		}
+		//check if endpoints are found
+		if rsCfg.Pools[index].Members == nil {
+			log.Errorf("[CORE]Endpoints could not be fetched for service %v with targetPort %v", svcName, pool.ServicePort.IntVal)
+		}
 	}
 }