Merge pull request #1302 from Vlatombe/JENKINS-70493

jenkinsci · Jan 27, 2023 · 7ff395e · 7ff395e
2 parents 43e9e49 + c2d6b2c
commit 7ff395e
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java
@@ -107,11 +107,9 @@ public KubernetesClient createClient() throws KubernetesAuthException {
             LOGGER.log(FINE, "Autoconfiguring Kubernetes client");
             builder = new ConfigBuilder(Config.autoConfigure(null));
         } else {
-            // although this will still autoconfigure based on Config constructor notes
-            // In future releases (2.4.x) the public constructor will be empty.
-            // The current functionality will be provided by autoConfigure().
-            // This is a necessary change to allow us distinguish between auto configured values and builder values.
-            builder = new ConfigBuilder().withMasterUrl(serviceAddress);
+            // Using Config.empty() disables autoconfiguration when both serviceAddress and auth are set
+            builder = auth == null ? new ConfigBuilder() : new ConfigBuilder(Config.empty());
+            builder = builder.withMasterUrl(serviceAddress);
         }
 
         if (auth != null) {