List EndpointSlices only from the Service namespace to build endpoint…

…s conf
utilitywarehouse · Jul 14, 2023 · 9b60149 · 9b60149
1 parent 0a4b06f
commit 9b60149
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/controller/controller.go b/controller/controller.go
@@ -233,7 +233,7 @@ func (c *Controller) endpointsStoreForXdsServiceStore(svcs xds.XdsServiceStore)
 	store := xds.NewXdsEnpointStore()
 	for _, s := range svcs.All() {
 		// Add EndpointSlices from the local cluster
-		es, err := c.localClient.EndpointSliceList(fmt.Sprintf("%s=%s", kube.KubernetesIOServiceNameLabel, s.Service.Name))
+		es, err := c.localClient.EndpointSliceList(fmt.Sprintf("%s=%s", kube.KubernetesIOServiceNameLabel, s.Service.Name), s.Service.Namespace)
 		if err != nil {
 			return nil, err
 		}
@@ -251,7 +251,7 @@ func (c *Controller) endpointsStoreForXdsServiceStore(svcs xds.XdsServiceStore)
 				priority = uint32(1)
 			}
 			for _, client := range c.remoteClients {
-				es, err := client.EndpointSliceList(fmt.Sprintf("%s=%s", kube.KubernetesIOServiceNameLabel, s.Service.Name))
+				es, err := client.EndpointSliceList(fmt.Sprintf("%s=%s", kube.KubernetesIOServiceNameLabel, s.Service.Name), s.Service.Namespace)
 				if err != nil {
 					return nil, err
 				}

diff --git a/kube/client.go b/kube/client.go
@@ -98,7 +98,7 @@ type Client interface {
 	KubeClient() kubernetes.Interface
 	Service(namespace, name string) (*corev1.Service, error)
 	EndpointSlice(name, namespace string) (*discoveryv1.EndpointSlice, error)
-	EndpointSliceList(labelSelector string) ([]*discoveryv1.EndpointSlice, error)
+	EndpointSliceList(labelSelector, namespace string) ([]*discoveryv1.EndpointSlice, error)
 	XdsServiceList() ([]*v1alpha1.XdsService, error)
 }
 
@@ -213,7 +213,7 @@ func (c *clientWrapper) EndpointSlice(name, namespace string) (*discoveryv1.Endp
 }
 
 // EndpointSliceList returns all the EndpointSlices selected by a label
-func (c *clientWrapper) EndpointSliceList(labelSelector string) ([]*discoveryv1.EndpointSlice, error) {
+func (c *clientWrapper) EndpointSliceList(labelSelector, namespace string) ([]*discoveryv1.EndpointSlice, error) {
 	// Return an empty slice if watcher is not initialised yet (for remote watchers)
 	if c.factoryKube == nil {
 		return []*discoveryv1.EndpointSlice{}, nil
@@ -222,7 +222,7 @@ func (c *clientWrapper) EndpointSliceList(labelSelector string) ([]*discoveryv1.
 	if err != nil {
 		return []*discoveryv1.EndpointSlice{}, err
 	}
-	return filterKubeNotFound(c.factoryKube.Discovery().V1().EndpointSlices().Lister().EndpointSlices(metav1.NamespaceAll).List(selector))
+	return filterKubeNotFound(c.factoryKube.Discovery().V1().EndpointSlices().Lister().EndpointSlices(namespace).List(selector))
 }
 
 // XdsServiceList lists the watched XdsServices resources

diff --git a/kube/client_mock.go b/kube/client_mock.go
@@ -141,7 +141,7 @@ func (c *clientMock) EndpointSlice(name, namespace string) (*discoveryv1.Endpoin
 }
 
 // EndpointSliceList returns all the EndpointSlices selected by a label
-func (c *clientMock) EndpointSliceList(labelSelector string) ([]*discoveryv1.EndpointSlice, error) {
+func (c *clientMock) EndpointSliceList(labelSelector, namespace string) ([]*discoveryv1.EndpointSlice, error) {
 	return c.endpointSlices, nil
 }