opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.0.0 -> release/2.1.0

Browse Source 
* commit 'ab44a1f54772cf13c9868b88d048c7f6ada91fba':
  climc: 支持获取 k8s 集群直连的配置
This commit is contained in:
邱剑
2018-08-07 18:40:43 +08:00
parent 89fea5c4bf ab44a1f547
commit b1f933290e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/k8s.go
+10 -2
View File
@@ -128,8 +128,16 @@ func initCluster() {
return nil
})
R(&getOpt{}, cmdN("kubeconfig"), "Generate kubeconfig of a cluster", func(s *mcclient.ClientSession, args *getOpt) error {
ret, err := k8s.Clusters.PerformAction(s, args.ID, "generate-kubeconfig", nil)
type kubeConfigOpt struct {
getOpt
Directly bool `help:"Get directly connect kubeconfig"`
}
R(&kubeConfigOpt{}, cmdN("kubeconfig"), "Generate kubeconfig of a cluster", func(s *mcclient.ClientSession, args *kubeConfigOpt) error {
params := jsonutils.NewDict()
if args.Directly {
params.Add(jsonutils.JSONTrue, "directly")
}
ret, err := k8s.Clusters.PerformAction(s, args.ID, "generate-kubeconfig", params)
if err != nil {
return err
}