Merge pull request #11987 from gastaldi/deprecated

quarkusio · Sep 9, 2020 · 4ccdbc2 · 4ccdbc2
2 parents 604a84a + d55f187
commit 4ccdbc2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...ent/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java b/...ent/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
@@ -14,7 +14,7 @@ public class KubernetesClientUtils {
     private static final String PREFIX = "quarkus.kubernetes-client.";
 
     public static Config createConfig(KubernetesClientBuildConfig buildConfig) {
-        Config base = new Config();
+        Config base = Config.autoConfigure(null);
         return new ConfigBuilder()
                 .withTrustCerts(buildConfig.trustCerts)
                 .withWatchReconnectInterval((int) buildConfig.watchReconnectInterval.toMillis())
@@ -38,7 +38,7 @@ public static Config createConfig(KubernetesClientBuildConfig buildConfig) {
                 .withHttpsProxy(buildConfig.httpsProxy.orElse(base.getHttpsProxy()))
                 .withProxyUsername(buildConfig.proxyUsername.orElse(base.getProxyUsername()))
                 .withProxyPassword(buildConfig.proxyPassword.orElse(base.getProxyPassword()))
-                .withNoProxy(buildConfig.noProxy.isPresent() ? buildConfig.noProxy.get() : base.getNoProxy())
+                .withNoProxy(buildConfig.noProxy.orElse(base.getNoProxy()))
                 .build();
     }
 
@@ -48,7 +48,7 @@ public static KubernetesClient createClient(KubernetesClientBuildConfig buildCon
 
     public static KubernetesClient createClient() {
         org.eclipse.microprofile.config.Config config = ConfigProvider.getConfig();
-        Config base = new Config();
+        Config base = Config.autoConfigure(null);
         return new DefaultKubernetesClient(new ConfigBuilder()
                 .withTrustCerts(config.getOptionalValue(PREFIX + "trust-certs", Boolean.class).orElse(base.isTrustCerts()))
                 .withWatchReconnectLimit(config.getOptionalValue(PREFIX + "watch-reconnect-limit", Integer.class)