Merge pull request #2122 from wind57/stop-informers-and-some-cleaup

close shared informers + minor cleanup in tests

Author: ryanjbaxter

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

@@ -33,6 +33,7 @@
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1Service;
 import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.client.ServiceInstance;
@@ -167,6 +168,11 @@ void afterPropertiesSet() {
 		postConstruct(sharedInformerFactories, properties, informersReadyFunc, serviceListers);
 	}
 
+	@PreDestroy
+	void preDestroy() {
+		sharedInformerFactories.forEach(SharedInformerFactory::stopAllRegisteredInformers);
+	}
+
 	private List<ServiceInstance> serviceInstances(V1Service service, String serviceId) {
 
 		List<ServiceInstance> instances = new ArrayList<>();

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

@@ -40,37 +40,33 @@ class KubernetesClientCatalogWatchAutoConfigurationApplicationContextTests {
 
 	@Test
 	void discoveryEnabledDefault() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false");
+		setup("spring.main.cloud-platform=KUBERNETES");
 		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesClientCatalogWatch.class));
 	}
 
 	@Test
 	void discoveryEnabled() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.discovery.enabled=true");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.discovery.enabled=true");
 		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesClientCatalogWatch.class));
 	}
 
 	@Test
 	void discoveryDisabled() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.discovery.enabled=false");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.discovery.enabled=false");
 		applicationContextRunner
 			.run(context -> assertThat(context).doesNotHaveBean(KubernetesClientCatalogWatch.class));
 	}
 
 	@Test
 	void kubernetesDiscoveryEnabled() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.kubernetes.discovery.enabled=true");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.discovery.enabled=true");
 		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesClientCatalogWatch.class));
 	}
 
 	// disabling discovery, disables catalog watcher.
 	@Test
 	void kubernetesDiscoveryDisabled() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.kubernetes.discovery.enabled=false");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.discovery.enabled=false");
 		applicationContextRunner
 			.run(context -> assertThat(context).doesNotHaveBean(KubernetesClientCatalogWatch.class));
 	}
@@ -80,8 +76,8 @@ void kubernetesDiscoveryDisabled() {
 	 */
 	@Test
 	void disableBlockingAndReactive() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=false");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.discovery.blocking.enabled=false",
+				"spring.cloud.discovery.reactive.enabled=false");
 		applicationContextRunner.run(context -> {
 			assertThat(context).doesNotHaveBean(KubernetesClientCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesClientInformerReactiveDiscoveryClient.class);
@@ -97,8 +93,8 @@ void disableBlockingAndReactive() {
 	 */
 	@Test
 	void disableBlockingEnableReactive() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.discovery.blocking.enabled=false",
+				"spring.cloud.discovery.reactive.enabled=true");
 		applicationContextRunner.run(context -> {
 			assertThat(context).hasSingleBean(KubernetesClientCatalogWatch.class);
 		});
@@ -109,8 +105,8 @@ void disableBlockingEnableReactive() {
 	 */
 	@Test
 	void enableBlockingDisableReactive() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.discovery.blocking.enabled=true",
+				"spring.cloud.discovery.reactive.enabled=false");
 		applicationContextRunner.run(context -> {
 			assertThat(context).hasSingleBean(KubernetesClientCatalogWatch.class);
 		});
@@ -122,8 +118,7 @@ void enableBlockingDisableReactive() {
 	 */
 	@Test
 	void disableKubernetesDiscovery() {
-		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
-				"spring.cloud.kubernetes.discovery.enabled=false");
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.discovery.enabled=false");
 		applicationContextRunner.run(context -> {
 			assertThat(context).doesNotHaveBean(KubernetesClientCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesClientInformerReactiveDiscoveryClient.class);