Skip to content

Commit b318202

Browse files
committed
use destroyMethod
1 parent 515c91b commit b318202

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.fabric8.kubernetes.client.ConfigBuilder;
2323
import io.fabric8.kubernetes.client.KubernetesClient;
2424
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
25-
import jakarta.annotation.PreDestroy;
2625

2726
import org.springframework.beans.factory.annotation.Autowired;
2827
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -107,7 +106,7 @@ public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClient
107106

108107
}
109108

110-
@Bean
109+
@Bean(destroyMethod = "close")
111110
@ConditionalOnMissingBean
112111
public KubernetesClient kubernetesClient(Config config) {
113112
return new KubernetesClientBuilder().withConfig(config).build();
@@ -119,15 +118,4 @@ public Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
119118
return new Fabric8PodUtils(client);
120119
}
121120

122-
@PreDestroy
123-
void preDestroy() {
124-
context.getBeansOfType(KubernetesClient.class).values().forEach(KubernetesClient::close);
125-
126-
// in case of bootstrap
127-
ApplicationContext parent = context.getParent();
128-
if (parent != null) {
129-
parent.getBeansOfType(KubernetesClient.class).values().forEach(KubernetesClient::close);
130-
}
131-
}
132-
133121
}

0 commit comments

Comments
 (0)