Merge branch 'master' into tls

planetlabs · Sep 9, 2019 · 89001a6 · 89001a6
2 parents 626255f + fb01973
commit 89001a6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/handlers/kubecfg/kubecfg.go b/handlers/kubecfg/kubecfg.go
@@ -91,5 +91,6 @@ func populateUser(cfg *api.Config, username, token string) api.Config {
 		c.Clusters[name] = cluster
 		c.Contexts[name] = &api.Context{Cluster: name, AuthInfo: templateUser}
 	}
+	c.CurrentContext = cfg.CurrentContext
 	return c
 }