Fix scheduled discovery when allNamespaces property is true (spring-cloud#544)

Co-authored-by: Thomas Zoratto <[email protected]>

Author: tzoratto

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatch.java

@@ -45,12 +45,16 @@ public class KubernetesCatalogWatch implements ApplicationEventPublisherAware {
 
 	private final KubernetesClient kubernetesClient;
 
+	private final KubernetesDiscoveryProperties properties;
+
 	private final AtomicReference<List<String>> catalogEndpointsState = new AtomicReference<>();
 
 	private ApplicationEventPublisher publisher;
 
-	public KubernetesCatalogWatch(KubernetesClient kubernetesClient) {
+	public KubernetesCatalogWatch(KubernetesClient kubernetesClient,
+			KubernetesDiscoveryProperties properties) {
 		this.kubernetesClient = kubernetesClient;
+		this.properties = properties;
 	}
 
 	@Override
@@ -66,8 +70,11 @@ public void catalogServicesWatch() {
 
 			// not all pods participate in the service discovery. only those that have
 			// endpoints.
-			List<Endpoints> endpoints = this.kubernetesClient.endpoints().list()
-					.getItems();
+			List<Endpoints> endpoints = this.properties
+					.isAllNamespaces()
+							? this.kubernetesClient.endpoints().inAnyNamespace().list()
+									.getItems()
+							: this.kubernetesClient.endpoints().list().getItems();
 			List<String> endpointsPodNames = endpoints.stream().map(Endpoints::getSubsets)
 					.filter(Objects::nonNull).flatMap(Collection::stream)
 					.map(EndpointSubset::getAddresses).filter(Objects::nonNull)

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java

@@ -42,8 +42,9 @@ public class KubernetesCatalogWatchAutoConfiguration {
 	@ConditionalOnProperty(
 			name = "spring.cloud.kubernetes.discovery.catalog-services-watch.enabled",
 			matchIfMissing = true)
-	public KubernetesCatalogWatch kubernetesCatalogWatch(KubernetesClient client) {
-		return new KubernetesCatalogWatch(client);
+	public KubernetesCatalogWatch kubernetesCatalogWatch(KubernetesClient client,
+			KubernetesDiscoveryProperties properties) {
+		return new KubernetesCatalogWatch(client, properties);
 	}
 
 }

spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTest.java

@@ -57,6 +57,9 @@ public class KubernetesCatalogWatchTest {
 	@Mock
 	private KubernetesClient kubernetesClient;
 
+	@Mock
+	private KubernetesDiscoveryProperties kubernetesDiscoveryProperties;
+
 	@Mock
 	private ApplicationEventPublisher applicationEventPublisher;