Set config file when using home directory

Himanshu Pandey · Himanshu Pandey · commit 10597c7affc9 · 2019-10-04T14:58:36.000-07:00
diff --git a/util/src/main/java/io/kubernetes/client/util/ClientBuilder.java b/util/src/main/java/io/kubernetes/client/util/ClientBuilder.java
@@ -97,7 +97,7 @@ public static ClientBuilder standard(boolean persistConfig) throws IOException {
         if (persistConfig) {
           kc.setPersistConfig(new FilePersister(config));
         }
-        kc.setFile(kubeConfig);
+        kc.setFile(config);
         return kubeconfig(kc);
       }
     }
diff --git a/util/src/test/java/io/kubernetes/client/util/ClientBuilderTest.java b/util/src/test/java/io/kubernetes/client/util/ClientBuilderTest.java
@@ -49,6 +49,8 @@ public class ClientBuilderTest {
   private String userName = "userName";
   private String password = "password";
   private String apiKeyPrefix = "Bearer";
+  public static final String KUBEDIR = ".kube";
+  public static final String KUBECONFIG = "config";
 
   @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
 
@@ -172,4 +174,13 @@ public void testOverridePatchFormat() throws IOException, ApiException {
             .setOverridePatchFormat(V1Patch.PATCH_FORMAT_STRATEGIC_MERGE_PATCH)
             .build();
   }
+
+  @Test
+  public void testHomeDirPreferredOverKubeConfig() throws Exception {
+    environmentVariables.set("HOME", HOME_PATH);
+    environmentVariables.set("KUBEDIR", KUBEDIR);
+    environmentVariables.set("KUBECONFIG", KUBECONFIG);
+    final ApiClient client = ClientBuilder.standard().build();
+    assertEquals("http://home.dir.com", client.getBasePath());
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public static ClientBuilder standard(boolean persistConfig) throws IOException {`
`97`	`97`	`if (persistConfig) {`
`98`	`98`	`kc.setPersistConfig(new FilePersister(config));`
`99`	`99`	`}`
`100`		`- kc.setFile(kubeConfig);`
	`100`	`+ kc.setFile(config);`
`101`	`101`	`return kubeconfig(kc);`
`102`	`102`	`}`
`103`	`103`	`}`