Merge branch 'main' of https://github.com/spring-cloud/spring-cloud-k…

…ubernetes

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

@@ -36,6 +36,7 @@
 
 import org.springframework.boot.BootstrapRegistry;
 import org.springframework.boot.ConfigurableBootstrapContext;
+import org.springframework.context.ApplicationListener;
 import org.springframework.core.env.Environment;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.CollectionUtils;
@@ -60,6 +61,8 @@ public final class ConfigUtils {
 					|| sourceName.endsWith("-" + activeProfile + ".yaml")
 					|| sourceName.endsWith("-" + activeProfile + ".properties");
 
+	private static final ApplicationListener<?> NO_OP = (e) -> { };
+
 	private ConfigUtils() {
 	}
 
@@ -329,17 +332,23 @@ private static Map<String, String> decodeData(Map<String, String> data) {
 	}
 
 	public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapContext, Class<T> cls, T instance,
-			String name) {
+			String name, ApplicationListener<?> listener) {
 		bootstrapContext.registerIfAbsent(cls, BootstrapRegistry.InstanceSupplier.of(instance));
 		bootstrapContext.addCloseListener(event -> {
 			if (event.getApplicationContext().getBeanFactory().getSingleton(name) == null) {
 				event.getApplicationContext()
 					.getBeanFactory()
 					.registerSingleton(name, event.getBootstrapContext().get(cls));
+				event.getApplicationContext().addApplicationListener(listener);
 			}
 		});
 	}
 
+	public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapContext, Class<T> cls, T instance,
+			String name) {
+		registerSingle(bootstrapContext, cls, instance, name, NO_OP);
+	}
+
 	/**
 	 * append prefix to the keys and return a new Map with the new values.
 	 */

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

@@ -34,6 +34,8 @@
 import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySourceLocator;
 import org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.core.env.Environment;
 
 import static org.springframework.cloud.kubernetes.commons.config.ConfigUtils.registerSingle;
@@ -90,7 +92,8 @@ private KubernetesClient registerConfigAndClient(ConfigurableBootstrapContext bo
 		registerSingle(bootstrapContext, Config.class, config, "fabric8Config");
 
 		KubernetesClient kubernetesClient = new Fabric8AutoConfiguration().kubernetesClient(config);
-		registerSingle(bootstrapContext, KubernetesClient.class, kubernetesClient, "configKubernetesClient");
+		registerSingle(bootstrapContext, KubernetesClient.class, kubernetesClient, "configKubernetesClient",
+				(ApplicationListener<ContextClosedEvent>) event -> kubernetesClient.close());
 		return kubernetesClient;
 	}
 

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java

@@ -124,6 +124,11 @@ public static void assertReloadLogStatements(String left, String right, String a
 	 * create a tar, copy it in the running k3s and load this tar as an image.
 	 */
 	public static void loadImage(String image, String tag, String tarName, K3sContainer container) throws Exception {
+
+		if (imageAlreadyInK3s(container, tarName)) {
+			return;
+		}
+
 		// save image
 		try (SaveImageCmd saveImageCmd = container.getDockerClient().saveImageCmd(image)) {
 			InputStream imageStream = saveImageCmd.withTag(tag).exec();
@@ -182,7 +187,7 @@ public static void load(K3sContainer container, String tarName, String imageName
 		try {
 			LOG.info("no tars found, will resort to pulling the image");
 			LOG.info("using : " + imageVersion + " for : " + imageNameForDownload);
-			pullImage(imageNameForDownload, imageVersion, container);
+			pullImage(imageNameForDownload, imageVersion, tarName, container);
 			loadImage(imageNameForDownload, imageVersion, tarName, container);
 		}
 		catch (Exception e) {
@@ -205,7 +210,13 @@ public static void validateImage(String image, K3sContainer container) {
 		}
 	}
 
-	public static void pullImage(String image, String tag, K3sContainer container) throws InterruptedException {
+	public static void pullImage(String image, String tag, String tarName, K3sContainer container)
+			throws InterruptedException {
+
+		if (imageAlreadyInK3s(container, tarName)) {
+			return;
+		}
+
 		try (PullImageCmd pullImageCmd = container.getDockerClient().pullImageCmd(image)) {
 			pullImageCmd.withTag(tag).start().awaitCompletion();
 		}
@@ -265,6 +276,11 @@ private static void loadImageFromPath(String tarName, K3sContainer container) {
 	}
 
 	private static boolean imageAlreadyInK3s(K3sContainer container, String tarName) {
+
+		if (tarName == null) {
+			return false;
+		}
+
 		try {
 			boolean present = container.execInContainer("sh", "-c", "ctr images list | grep " + tarName)
 				.getStdout()

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java

@@ -103,7 +103,7 @@ public void createAndWait(String namespace, String name, @Nullable Deployment de
 				}
 				else {
 					String[] image = imageFromDeployment.split(":", 2);
-					pullImage(image[0], image[1], container);
+					pullImage(image[0], image[1], name, container);
 					loadImage(image[0], image[1], name, container);
 				}
 

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java

@@ -136,7 +136,7 @@ public void createAndWait(String namespace, String name, V1Deployment deployment
 				}
 				else {
 					String[] image = imageFromDeployment.split(":", 2);
-					pullImage(image[0], image[1], container);
+					pullImage(image[0], image[1], name, container);
 					loadImage(image[0], image[1], name, container);
 				}