wip

Signed-off-by: wind57 <[email protected]>

Author: wind57

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

@@ -52,6 +52,8 @@
 import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.getApplicationNamespace;
 
 /**
+ * This one uses: 'ConditionalOnBlockingOrReactiveDiscoveryEnabled' because beans it contains
+ * are specific to both clients.
  * @author wind57
  */
 @Configuration(proxyBeanMethods = false)
@@ -69,7 +71,7 @@ final class KubernetesClientInformerAutoConfiguration {
 	// we rely on the order of namespaces to enable listers, as such provide a bean of
 	// namespaces as a list, instead of the incoming Set.
 	@Bean
-	List<String> k8sDiscoveryClientNamespaces(KubernetesDiscoveryProperties properties,
+	List<String> k8sClientDiscoveryNamespaces(KubernetesDiscoveryProperties properties,
 			KubernetesNamespaceProvider provider) {
 
 		if (properties.allNamespaces()) {

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

@@ -26,19 +26,23 @@
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1Service;
 
+import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
 import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
+import org.springframework.cloud.kubernetes.commons.PodUtils;
 import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration;
+import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer;
+import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.springframework.core.log.LogAccessor;
 
 /**
  * @author wind57
@@ -48,9 +52,11 @@
 @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class })
 @AutoConfigureAfter({ KubernetesClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
 		KubernetesClientDiscoveryClientSpelAutoConfiguration.class })
-@Import(KubernetesDiscoveryClientHealthConfiguration.class)
 final class KubernetesClientInformerDiscoveryClientAutoConfiguration {
 
+	private static final LogAccessor LOG = new LogAccessor(
+		LogFactory.getLog(KubernetesClientInformerDiscoveryClientAutoConfiguration.class));
+
 	@Bean
 	@ConditionalOnMissingBean
 	KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient(
@@ -62,4 +68,12 @@ KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient(
 				serviceInformers, endpointsInformers, properties, coreV1Api, predicate);
 	}
 
+	@Bean
+	@ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer
+	KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer(
+		ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
+		LOG.debug(() -> "Will publish InstanceRegisteredEvent from blocking implementation");
+		return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher);
+	}
+
 }

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

@@ -43,7 +43,6 @@
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.log.LogAccessor;
 
@@ -66,7 +65,13 @@ final class KubernetesClientInformerReactiveDiscoveryClientAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	KubernetesClientInformerReactiveDiscoveryClient kubernetesClientReactiveDiscoveryClient(
-			KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient) {
+			List<SharedInformerFactory> sharedInformerFactories, List<Lister<V1Service>> serviceListers,
+			List<Lister<V1Endpoints>> endpointsListers, List<SharedInformer<V1Service>> serviceInformers,
+			List<SharedInformer<V1Endpoints>> endpointsInformers, KubernetesDiscoveryProperties properties,
+			CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
+		KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient =
+			new KubernetesClientInformerDiscoveryClient(sharedInformerFactories, serviceListers, endpointsListers,
+				serviceInformers, endpointsInformers, properties, coreV1Api, predicate);
 		return new KubernetesClientInformerReactiveDiscoveryClient(kubernetesClientInformerDiscoveryClient);
 	}
 

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

@@ -40,6 +40,7 @@
 import org.springframework.context.annotation.Primary;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertInformerBeansMissing;
 import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertInformerBeansPresent;
 
 /**
@@ -224,7 +225,8 @@ void kubernetesDiscoveryDisabledWithSelectiveNamespaces() {
 			// only "simple" one from commons, as ours is not picked up
 			assertThat(context).hasSingleBean(ReactiveDiscoveryClientHealthIndicator.class);
 
-			assertInformerBeansPresent(context , 2);
+			// we don't read the KubernetesClientInformerAutoConfiguration
+			assertInformerBeansMissing(context);
 		});
 	}
 
@@ -267,15 +269,15 @@ void kubernetesReactiveDiscoveryEnabledWithSelectiveNamespaces() {
 	@Test
 	void kubernetesReactiveDiscoveryDisabled() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.discovery.reactive.enabled=false");
+				"spring.cloud.discovery.reactive.enabled=false", "spring.cloud.kubernetes.client.namespace=default");
 		applicationContextRunner.run(context -> {
-			assertThat(context).doesNotHaveBean(KubernetesClientInformerDiscoveryClient.class);
+			assertThat(context).hasSingleBean(KubernetesClientInformerDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(KubernetesClientInformerReactiveDiscoveryClient.class);
 
 			assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
-			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
+			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 
-			assertInformerBeansPresent(context, 2);
+			assertInformerBeansPresent(context, 1);
 		});
 	}
 
@@ -288,7 +290,7 @@ void kubernetesReactiveDiscoveryDisabledWithSelectiveNamespaces() {
 			assertThat(context).doesNotHaveBean(KubernetesClientInformerReactiveDiscoveryClient.class);
 
 			assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
-			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
+			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 
 			assertInformerBeansPresent(context, 2);
 		});
@@ -323,7 +325,7 @@ void blockingDisabledWithSelectiveNamespaces() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.kubernetes.discovery.namespaces=a,b");
 		applicationContextRunner.run(context -> {
-			assertThat(context).hasSingleBean(KubernetesClientInformerDiscoveryClient.class);
+			assertThat(context).doesNotHaveBean(KubernetesClientInformerDiscoveryClient.class);
 			assertThat(context).hasSingleBean(KubernetesClientInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours

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

@@ -78,4 +78,31 @@ static void assertInformerBeansPresent(AssertableApplicationContext context, int
 		assertThat(endpointsListers.size()).isEqualTo(times);
 	}
 
+	static void assertInformerBeansMissing(AssertableApplicationContext context) {
+		String[] sharedInformerFactoriesBeanName = context
+			.getBeanNamesForType(ResolvableType.forType(new ParameterizedTypeReference<List<SharedInformerFactory>>() {
+			}));
+		assertThat(sharedInformerFactoriesBeanName).isEmpty();
+
+		String[] serviceSharedIndexInformersBeanName = context.getBeanNamesForType(
+			ResolvableType.forType(new ParameterizedTypeReference<List<SharedIndexInformer<V1Service>>>() {
+			}));
+		assertThat(serviceSharedIndexInformersBeanName).isEmpty();
+
+		String[] endpointsSharedIndexInformersBeanName = context.getBeanNamesForType(
+			ResolvableType.forType(new ParameterizedTypeReference<List<SharedIndexInformer<V1Endpoints>>>() {
+			}));
+		assertThat(endpointsSharedIndexInformersBeanName).isEmpty();
+
+		String[] serviceListersBeanName = context
+			.getBeanNamesForType(ResolvableType.forType(new ParameterizedTypeReference<List<Lister<V1Service>>>() {
+			}));
+		assertThat(serviceListersBeanName).isEmpty();
+
+		String[] endpointsListersBeanName = context
+			.getBeanNamesForType(ResolvableType.forType(new ParameterizedTypeReference<List<Lister<V1Endpoints>>>() {
+			}));
+		assertThat(endpointsListersBeanName).isEmpty();
+	}
+
 }