Merge pull request #2476 from Fabian-K/fix-2474

fabric8io · Sep 16, 2020 · 323be1c · 323be1c
2 parents f26412a + 9846bd0
commit 323be1c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 #### Bugs
 * Fix: #2442: Wrong resource kind in `ProjectRequestHandler` causes ClassCastException when handling Project resources.
 * Fix #2467: OpenShiftClient cannot replace existing resource with API version =! v1
+* Fix: #2474: Config.fromKubeconfig throws NullPointerException
 
 #### Improvements
 * Fix #2473: Removed unused ValidationMessages.properties

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/Config.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/Config.java
@@ -505,7 +505,8 @@ public static Config fromKubeconfig(String kubeconfigContents) throws IOExceptio
   public static Config fromKubeconfig(String context, String kubeconfigContents, String kubeconfigPath) {
     // we allow passing context along here, since downstream accepts it
     Config config = new Config();
-    config.file = new File(kubeconfigPath);
+    if(kubeconfigPath != null)
+      config.file = new File(kubeconfigPath);
     loadFromKubeconfig(config, context, kubeconfigContents);
     return config;
   }

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java
@@ -308,6 +308,14 @@ void testWithKubeConfigAndSytemPropertiesAndBuilder() {
     assertEquals("testns2", config.getNamespace());
   }
 
+  @Test
+  void testFromKubeconfigContent() throws IOException {
+    File configFile = new File(TEST_KUBECONFIG_FILE);
+    final String configYAML = String.join("\n", Files.readAllLines(configFile.toPath()));
+    final Config config = Config.fromKubeconfig(configYAML);
+    assertEquals("https://172.28.128.4:8443", config.getMasterUrl());
+  }
+
   @Test
   void testWithNamespacePath() {
     System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, "nokubeconfigfile");