Skip to content

Commit f51f9df

Browse files
committed
fix failure
1 parent 7c5a312 commit f51f9df

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@
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;
2526

27+
import org.springframework.beans.factory.annotation.Autowired;
2628
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2729
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
2830
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2931
import org.springframework.boot.cloud.CloudPlatform;
3032
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
3133
import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
34+
import org.springframework.context.ApplicationContext;
3235
import org.springframework.context.annotation.Bean;
3336
import org.springframework.context.annotation.Configuration;
3437

@@ -44,6 +47,9 @@
4447
@AutoConfigureAfter(KubernetesCommonsAutoConfiguration.class)
4548
public class Fabric8AutoConfiguration {
4649

50+
@Autowired
51+
private ApplicationContext context;
52+
4753
private static <D> D or(D left, D right) {
4854
return left != null ? left : right;
4955
}
@@ -52,10 +58,6 @@ private static Integer orDurationInt(Duration left, Integer right) {
5258
return left != null ? (int) left.toMillis() : right;
5359
}
5460

55-
private static Long orDurationLong(Duration left, Long right) {
56-
return left != null ? left.toMillis() : right;
57-
}
58-
5961
@Bean
6062
@ConditionalOnMissingBean(Config.class)
6163
public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClientProperties) {
@@ -117,4 +119,9 @@ public Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
117119
return new Fabric8PodUtils(client);
118120
}
119121

122+
@PreDestroy
123+
void preDestroy() {
124+
context.getBeansOfType(KubernetesClient.class).values().forEach(KubernetesClient::close);
125+
}
126+
120127
}

0 commit comments

Comments
 (0)