back

Author: wind57

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

@@ -22,6 +22,7 @@
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import jakarta.annotation.PreDestroy;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -106,7 +107,7 @@ public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClient
 
 	}
 
-	@Bean(destroyMethod = "close")
+	@Bean
 	@ConditionalOnMissingBean
 	public KubernetesClient kubernetesClient(Config config) {
 		return new KubernetesClientBuilder().withConfig(config).build();
@@ -118,4 +119,15 @@ public Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
 		return new Fabric8PodUtils(client);
 	}
 
+	@PreDestroy
+	void preDestroy() {
+		context.getBeansOfType(KubernetesClient.class).values().forEach(KubernetesClient::close);
+
+		// in case of bootstrap
+		ApplicationContext parent = context.getParent();
+		if (parent != null) {
+			parent.getBeansOfType(KubernetesClient.class).values().forEach(KubernetesClient::close);
+		}
+	}
+
 }