Merge pull request #1123 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cluster-api to release/2.7.0

* commit 'b6fe9b80592be6a080c981c8af32a7ae293c5b84':
  k8s multi cluster api
This commit is contained in:
李泽玺
2019-02-28 16:20:28 +08:00
11 changed files with 420 additions and 12 deletions
+1 -2
View File
@@ -62,8 +62,7 @@ func fetchK8sEnv(ctx context.Context, w http.ResponseWriter, r *http.Request) (*
}
data := jsonutils.NewDict()
data.Add(jsonutils.JSONTrue, "directly")
ret, err := k8s.Clusters.PerformAction(adminSession, cluster, "generate-kubeconfig", data)
ret, err := k8s.KubeClusters.GetSpecific(adminSession, cluster, "kubeconfig", data)
if err != nil {
return nil, err
}