[JENKINS-76157] Restore autoconfigure when auth is not null (#1752)

Author: Dohbedoh

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java

@@ -176,7 +176,7 @@ public KubernetesClient createClient() throws KubernetesAuthException {
             builder = new ConfigBuilder(Config.autoConfigure(null));
         } else {
             // Using Config.empty() disables autoconfiguration when both serviceAddress and auth are set
-            builder = auth == null ? new ConfigBuilder() : new ConfigBuilder(Config.empty());
+            builder = auth == null ? new ConfigBuilder(Config.autoConfigure(null)) : new ConfigBuilder(Config.empty());
             builder = builder.withMasterUrl(serviceAddress);
         }
 

src/test/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapterTest.java

@@ -151,6 +151,36 @@ public void autoConfigWithMasterUrl() throws Exception {
         assertEquals("http://example.com/", client.getConfiguration().getMasterUrl());
     }
 
+    @Test
+    public void autoConfigWithMasterUrlWithoutAuth() throws Exception {
+        System.setProperty(KUBERNETES_NAMESPACE_FILE, "src/test/resources/kubenamespace");
+        KubernetesFactoryAdapter factory = new KubernetesFactoryAdapter("http://example.com", null, null, false);
+        KubernetesClient client = factory.createClient();
+        assertEquals("test-namespace", client.getNamespace());
+        assertEquals(HTTP_PROXY, client.getConfiguration().getHttpProxy());
+        assertEquals(HTTPS_PROXY, client.getConfiguration().getHttpsProxy());
+        assertArrayEquals(new String[] {NO_PROXY}, client.getConfiguration().getNoProxy());
+        assertEquals(PROXY_USERNAME, client.getConfiguration().getProxyUsername());
+        assertEquals(PROXY_PASSWORD, client.getConfiguration().getProxyPassword());
+        assertTrue(client.getConfiguration().getAutoConfigure());
+        assertEquals("http://example.com/", client.getConfiguration().getMasterUrl());
+    }
+
+    @Test
+    public void autoConfigWithKubeconfig() throws Exception {
+        System.setProperty(KUBERNETES_KUBECONFIG_FILE, "src/test/resources/kubeconfig");
+        KubernetesFactoryAdapter factory = new KubernetesFactoryAdapter("http://example.com", null, null, false);
+        KubernetesClient client = factory.createClient();
+        assertEquals("test-namespace", client.getNamespace());
+        assertEquals(HTTP_PROXY, client.getConfiguration().getHttpProxy());
+        assertEquals(HTTPS_PROXY, client.getConfiguration().getHttpsProxy());
+        assertArrayEquals(new String[] {NO_PROXY}, client.getConfiguration().getNoProxy());
+        assertEquals(PROXY_USERNAME, client.getConfiguration().getProxyUsername());
+        assertEquals(PROXY_PASSWORD, client.getConfiguration().getProxyPassword());
+        assertTrue(client.getConfiguration().getAutoConfigure());
+        assertEquals("http://example.com/", client.getConfiguration().getMasterUrl());
+    }
+
     @Test
     @Issue("JENKINS-70416")
     public void autoConfigWithAuth() throws Exception {

src/test/resources/kubeconfig

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Config
+clusters:
+  - name: test-cluster
+    cluster:
+      server: http://example.com
+      insecure-skip-tls-verify: true
+contexts:
+  - name: test-context
+    context:
+      cluster: test-cluster
+      user: test-user
+      namespace: test-namespace
+current-context: test-context
+users:
+  - name: test-user
+    user:
+      token: dummy-token