Allow ApiClient to be constructed from KubeConfig

Lars Wander · Lars Wander · commit 2a599b2c6cf6 · 2017-08-14T12:35:35.000-04:00
diff --git a/util/src/main/java/io/kubernetes/client/util/Config.java b/util/src/main/java/io/kubernetes/client/util/Config.java
@@ -99,8 +99,10 @@ public static ApiClient fromConfig(InputStream stream) {
     }
 
     public static ApiClient fromConfig(Reader input) {
+        return fromConfig(KubeConfig.loadKubeConfig(input));
+    }
 
-        KubeConfig config = KubeConfig.loadKubeConfig(input);
+    public static ApiClient fromConfig(KubeConfig config) {
         ApiClient client = new ApiClient();
         client.setBasePath(config.getServer());
 

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,10 @@ public static ApiClient fromConfig(InputStream stream) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public static ApiClient fromConfig(Reader input) {`
	`102`	`+ return fromConfig(KubeConfig.loadKubeConfig(input));`
	`103`	`+ }`
`102`	`104`
`103`		`- KubeConfig config = KubeConfig.loadKubeConfig(input);`
	`105`	`+ public static ApiClient fromConfig(KubeConfig config) {`
`104`	`106`	`ApiClient client = new ApiClient();`
`105`	`107`	`client.setBasePath(config.getServer());`
`106`	`108`