Adding event listener to close fabric 8 clients

Author: ryanjbaxter

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java

@@ -61,6 +61,8 @@ public final class ConfigUtils {
 					|| sourceName.endsWith("-" + activeProfile + ".yaml")
 					|| sourceName.endsWith("-" + activeProfile + ".properties");
 
+	private static final ApplicationListener<?> NO_OP = (e) -> { };
+
 	private ConfigUtils() {
 	}
 
@@ -344,8 +346,7 @@ public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapCont
 
 	public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapContext, Class<T> cls, T instance,
 			String name) {
-		registerSingle(bootstrapContext, cls, instance, name, event -> {
-		});
+		registerSingle(bootstrapContext, cls, instance, name, NO_OP);
 	}
 
 	/**

spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java

@@ -18,11 +18,13 @@
 
 import java.time.Duration;
 
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -31,6 +33,8 @@
 import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.event.EventListener;
 
 /**
  * Auto configuration for Kubernetes.
@@ -117,4 +121,11 @@ public Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
 		return new Fabric8PodUtils(client);
 	}
 
+	@EventListener
+	void onContextClosed(ContextClosedEvent event) {
+		// Clean up any open connections from the KubernetesClient when the context is closed
+		BeanFactoryUtils.beansOfTypeIncludingAncestors(event.getApplicationContext(), KubernetesClient.class).values()
+				.forEach(Client::close);
+	}
+
 }

spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolver.java

@@ -93,9 +93,7 @@ private KubernetesClient registerConfigAndClient(ConfigurableBootstrapContext bo
 
 		KubernetesClient kubernetesClient = new Fabric8AutoConfiguration().kubernetesClient(config);
 		registerSingle(bootstrapContext, KubernetesClient.class, kubernetesClient, "configKubernetesClient",
-				(ApplicationListener<ContextClosedEvent>) event -> {
-					kubernetesClient.close();
-				});
+				(ApplicationListener<ContextClosedEvent>) event -> kubernetesClient.close());
 		return kubernetesClient;
 	}