Skip to content

Commit 930e159

Browse files
authored
Merge pull request #2079 from ryanjbaxter/cherry-pick-defaultApiClient-13.0.x
Cherry Pick #1963 To 13.0
2 parents 8836712 + 51b9330 commit 930e159

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

spring/src/main/java/io/kubernetes/client/spring/extended/controller/config/KubernetesInformerAutoConfiguration.java

+15-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import io.kubernetes.client.spring.extended.controller.KubernetesInformerFactoryProcessor;
1818
import io.kubernetes.client.util.ClientBuilder;
1919
import java.io.IOException;
20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
2022
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2123
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2224
import org.springframework.context.annotation.Bean;
@@ -29,10 +31,22 @@
2931
})
3032
public class KubernetesInformerAutoConfiguration {
3133

34+
private static final Logger LOGGER =
35+
LoggerFactory.getLogger(KubernetesInformerAutoConfiguration.class);
36+
3237
@Bean
3338
@ConditionalOnMissingBean
3439
public ApiClient defaultApiClient() throws IOException {
35-
return ClientBuilder.defaultClient();
40+
try {
41+
ApiClient apiClient = ClientBuilder.defaultClient();
42+
return apiClient;
43+
} catch (Exception e) {
44+
LOGGER.warn(
45+
"Could not create a Kubernetes ApiClient from either a cluster or standard environment. "
46+
+ "Will return one that always connects to localhost:8080",
47+
e);
48+
return new ClientBuilder().build();
49+
}
3650
}
3751

3852
@Bean

0 commit comments

Comments
 (0)