SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close the connection of ad hoc kubernetes client (#550)

Browse Source
This commit is contained in:
Yuusaku Taniguchi
2020-04-20 23:59:16 +09:00
committed by GitHub
parent 67783aefb5
commit 5a28981faf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileEnvironmentPostProcessor.java
View File

@@ -49,9 +49,7 @@ public class KubernetesProfileEnvironmentPostProcessor
return;
}
final StandardPodUtils podUtils = new StandardPodUtils(
new DefaultKubernetesClient());
if (podUtils.isInsideKubernetes()) {
if (isInsideKubernetes()) {
if (hasKubernetesProfile(environment)) {
if (LOG.isDebugEnabled()) {
LOG.debug("'kubernetes' already in list of active profiles");
@@ -72,6 +70,13 @@ public class KubernetesProfileEnvironmentPostProcessor
}
}
private boolean isInsideKubernetes() {
try (DefaultKubernetesClient client = new DefaultKubernetesClient()) {
final StandardPodUtils podUtils = new StandardPodUtils(client);
return podUtils.isInsideKubernetes();
}
}
private boolean hasKubernetesProfile(Environment environment) {
for (String activeProfile : environment.getActiveProfiles()) {
if (KUBERNETES_PROFILE.equalsIgnoreCase(activeProfile)) {