Merge pull request #81 from lwander/allow-kubeconfig-load-wo-context

brendandburns · web-flow · commit 60a8cd19f759 · 2017-09-29T07:59:29.000-07:00
Allow kubeconfig to be loaded without current-context
diff --git a/util/src/main/java/io/kubernetes/client/util/KubeConfig.java b/util/src/main/java/io/kubernetes/client/util/KubeConfig.java
@@ -96,6 +96,10 @@ public KubeConfig(ArrayList<Object> contexts,
     }
 
     public boolean setContext(String context) {
+        if (context == null) {
+            return false;
+        }
+
         currentCluster = null;
         currentUser = null;
         Map<String, Object> ctx = findObject(contexts, context);
@@ -197,6 +201,9 @@ public String getAccessToken() {
     }
 
     public boolean verifySSL() {
+        if (currentCluster == null) {
+            return false;
+        }
         if (currentCluster.containsKey("insecure-skip-tls-verify")) {
             return ! ((Boolean) currentCluster.get("insecure-skip-tls-verify")).booleanValue();
         }

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,10 @@ public KubeConfig(ArrayList<Object> contexts,`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public boolean setContext(String context) {`
	`99`	`+ if (context == null) {`
	`100`	`+ return false;`
	`101`	`+ }`
	`102`	`+`
`99`	`103`	`currentCluster = null;`
`100`	`104`	`currentUser = null;`
`101`	`105`	`Map<String, Object> ctx = findObject(contexts, context);`
`@@ -197,6 +201,9 @@ public String getAccessToken() {`
`197`	`201`	`}`
`198`	`202`
`199`	`203`	`public boolean verifySSL() {`
	`204`	`+ if (currentCluster == null) {`
	`205`	`+ return false;`
	`206`	`+ }`
`200`	`207`	`if (currentCluster.containsKey("insecure-skip-tls-verify")) {`
`201`	`208`	`return ! ((Boolean) currentCluster.get("insecure-skip-tls-verify")).booleanValue();`
`202`	`209`	`}`