Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

close fabric8 client on context close #1776

Open
wants to merge 4 commits into
base: 3.1.x
Choose a base branch
from
Open

close fabric8 client on context close #1776

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10ae190
fix
wind57 Oct 22, 2024
a4dcda3
cleanup
wind57 Oct 22, 2024
b5352f8
cleanup
wind57 Oct 22, 2024
bca5930
checkstyle
wind57 Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .../src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
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;
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

Expand All @@ -44,6 +48,9 @@
@AutoConfigureAfter(KubernetesCommonsAutoConfiguration.class)
public class Fabric8AutoConfiguration {

@Autowired
private ConfigurableApplicationContext context;

private static <D> D or(D left, D right) {
return left != null ? left : right;
}
Expand All @@ -52,10 +59,6 @@ private static Integer orDurationInt(Duration left, Integer right) {
return left != null ? (int) left.toMillis() : right;
}

private static Long orDurationLong(Duration left, Long right) {
return left != null ? left.toMillis() : right;
}

@Bean
@ConditionalOnMissingBean(Config.class)
public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClientProperties) {
Expand Down Expand Up @@ -117,4 +120,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);
}
}

}
Loading