Send context to the inner method

rohanKanojia · Aug 28, 2018 · ec5d34c · ec5d34c
1 parent 9e090b9
commit ec5d34c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
    * Fix #1144 : Get Request with OpenShift Mock Server Not Working
    * fix(#1055): add OpenShiftOAuthInterceptor to httpClient for openshifClient
    * Fix #1126 : Add option to disable hostname verification without disabling the certificate validation 
+   * Fix #1147: Cluster context was being ignored when loading the Config from a kubeconfig file
 
   New Feature
 

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
@@ -414,7 +414,7 @@ public static Config fromKubeconfig(String kubeconfigContents) {
   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.loadFromKubeconfig(config, null, kubeconfigContents, kubeconfigPath);
+    Config.loadFromKubeconfig(config, context, kubeconfigContents, kubeconfigPath);
     return config;
   }