Merge pull request #1348 from jglick/client.authentication.k8s.io/v1b…

…eta1
fabric8io · Feb 7, 2019 · bdf41c3 · bdf41c3
2 parents e8da79e + f633494
commit bdf41c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,9 @@
     * Updated compatability matrix after model upgrade in README.md 
 
     * Fix #1306: Support `KUBECONFIG` env var with multiple paths
-
+
+    * Fix #1348: support `v1beta1` version for `ExecCredentials`
+
   Dependency Upgrade
 
     * Updated jackson to 2.9.8

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
@@ -521,7 +521,7 @@ private static boolean loadFromKubeconfig(Config config, String context, String
             ExecConfig exec = currentAuthInfo.getExec();
             if (exec != null) {
               String apiVersion = exec.getApiVersion();
-              if ("client.authentication.k8s.io/v1alpha1".equals(apiVersion)) {
+              if ("client.authentication.k8s.io/v1alpha1".equals(apiVersion) || "client.authentication.k8s.io/v1beta1".equals(apiVersion)) {
                 List<String> argv = new ArrayList<String>();
                 String command = exec.getCommand();
                 if (command.contains("/") && !command.startsWith("/") && kubeconfigPath != null && !kubeconfigPath.isEmpty()) {