Merge pull request #390 from brendandburns/fix

Expand HOME detection on Windows.

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/util/ClientBuilder.java

@@ -17,7 +17,9 @@
 import static io.kubernetes.client.util.Config.ENV_SERVICE_PORT;
 import static io.kubernetes.client.util.Config.SERVICEACCOUNT_CA_PATH;
 import static io.kubernetes.client.util.Config.SERVICEACCOUNT_TOKEN_PATH;
-import static io.kubernetes.client.util.KubeConfig.*;
+import static io.kubernetes.client.util.KubeConfig.ENV_HOME;
+import static io.kubernetes.client.util.KubeConfig.KUBECONFIG;
+import static io.kubernetes.client.util.KubeConfig.KUBEDIR;
 
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.util.credentials.AccessTokenAuthentication;
@@ -77,7 +79,7 @@ public static ClientBuilder standard(boolean persistConfig) throws IOException {
     final File kubeConfig = findConfigFromEnv();
     if (kubeConfig != null) {
       try (FileReader kubeConfigReader = new FileReader(kubeConfig)) {
-        KubeConfig kc = loadKubeConfig(kubeConfigReader);
+        KubeConfig kc = KubeConfig.loadKubeConfig(kubeConfigReader);
         if (persistConfig) {
           kc.setPersistConfig(new FilePersister(kubeConfig));
         }
@@ -87,7 +89,7 @@ public static ClientBuilder standard(boolean persistConfig) throws IOException {
     final File config = findConfigInHomeDir();
     if (config != null) {
       try (FileReader configReader = new FileReader(config)) {
-        KubeConfig kc = loadKubeConfig(configReader);
+        KubeConfig kc = KubeConfig.loadKubeConfig(configReader);
         if (persistConfig) {
           kc.setPersistConfig(new FilePersister(config));
         }
@@ -115,14 +117,44 @@ private static File findConfigFromEnv() {
     }
   }
 
-  private static File findConfigInHomeDir() {
-    final File config = new File(new File(System.getenv(ENV_HOME), KUBEDIR), KUBECONFIG);
+  private static File findHomeDir() {
+    final File config = new File(System.getenv(ENV_HOME));
     if (config.exists()) {
       return config;
-    } else {
-      log.debug("Could not find ~/.kube/config");
-      return null;
     }
+    if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+      String homeDrive = System.getenv("HOMEDRIVE");
+      String homePath = System.getenv("HOMEPATH");
+      if (homeDrive != null
+          && homeDrive.length() > 0
+          && homePath != null
+          && homePath.length() > 0) {
+        File homeDir = new File(new File(homeDrive), homePath);
+        if (homeDir.exists()) {
+          return homeDir;
+        }
+      }
+      String userProfile = System.getenv("USERPROFILE");
+      if (userProfile != null && userProfile.length() > 0) {
+        File profileDir = new File(userProfile);
+        if (profileDir.exists()) {
+          return profileDir;
+        }
+      }
+    }
+    return null;
+  }
+
+  private static File findConfigInHomeDir() {
+    final File homeDir = findHomeDir();
+    if (homeDir != null) {
+      final File config = new File(new File(homeDir, KUBEDIR), KUBECONFIG);
+      if (config.exists()) {
+        return config;
+      }
+    }
+    log.debug("Could not find ~/.kube/config");
+    return null;
   }
 
   /**

util/src/main/java/io/kubernetes/client/util/KubeConfig.java

@@ -34,7 +34,7 @@ public class KubeConfig {
   private static final Logger log = LoggerFactory.getLogger(KubeConfig.class);
 
   // Defaults for where to find a kubeconfig file
-  public static final String ENV_HOME;
+  public static final String ENV_HOME = "HOME";
   public static final String KUBEDIR = ".kube";
   public static final String KUBECONFIG = "config";
   private static Map<String, Authenticator> authenticators = new HashMap<>();
@@ -63,12 +63,6 @@ public static void registerAuthenticator(Authenticator auth) {
   static {
     registerAuthenticator(new GCPAuthenticator());
     registerAuthenticator(new AzureActiveDirectoryAuthenticator());
-
-    if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
-      ENV_HOME = "USERPROFILE";
-    } else {
-      ENV_HOME = "HOME";
-    }
   }
 
   /** Load a Kubernetes config from a Reader */