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

climc: k8s general raw resource GET, PUT, DELETE support

Browse Source
This commit is contained in:
Zexi Li
2018-09-07 13:22:37 +08:00
parent d36f20d5c9
commit 87d99fca2a
2 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/k8s/raw.go
+37 -5
View File
@@ -1,32 +1,64 @@
package k8s
import (
"fmt"
"io/ioutil"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
)
type rawGetOpt struct {
type rawOpt struct {
namespaceOptions
KIND string `help:"resource kind"`
NAME string `help:"instance name"`
}
type rawGetOpt struct {
rawOpt
Output string `help:"Output format" short-token:"o" default:"yaml" choices:"json|yaml"`
}
type rawDeleteOpt struct {
rawGetOpt
rawOpt
}
type rawPutOpt struct {
rawOpt
File string `help:"Resource json description file" short-token:"f"`
}
func initRaw() {
R(&rawGetOpt{}, "k8s-get", "Get k8s resource instance raw info", func(s *mcclient.ClientSession, args *rawGetOpt) error {
obj, err := k8s.RawResource.Get(s, args.KIND, args.Namespace, args.NAME, args.ClusterParams())
obj, err := k8s.RawResource.Get(s, args.KIND, args.Namespace, args.NAME, args.Cluster)
if err != nil {
return err
}
printObjectYAML(obj)
if args.Output == "json" {
fmt.Println(obj.PrettyString())
} else {
printObjectYAML(obj)
}
return nil
})
R(&rawDeleteOpt{}, "k8s-delete", "Delete k8s resource instance", func(s *mcclient.ClientSession, args *rawDeleteOpt) error {
err := k8s.RawResource.Delete(s, args.KIND, args.Namespace, args.NAME, args.ClusterParams())
err := k8s.RawResource.Delete(s, args.KIND, args.Namespace, args.NAME, args.Cluster)
if err != nil {
return err
}
return nil
})
R(&rawPutOpt{}, "k8s-put", "Update k8s resource instance", func(s *mcclient.ClientSession, args *rawPutOpt) error {
content, err := ioutil.ReadFile(args.File)
if err != nil {
return err
}
body := jsonutils.Marshal(string(content))
err = k8s.RawResource.Put(s, args.KIND, args.Namespace, args.NAME, body, args.Cluster)
if err != nil {
return err
}
pkg/mcclient/modules/k8s/raw.go
+10 -11
View File
@@ -23,10 +23,10 @@ type rawResource struct {
query jsonutils.JSONObject
}
func newRawResource(kind, namespace, name string, query jsonutils.JSONObject) *rawResource {
func newRawResource(kind, namespace, name, cluster string) *rawResource {
nsQuery := getNamespaceQuery(namespace)
if query != nil {
nsQuery.Update(query)
if cluster != "" {
nsQuery.Add(jsonutils.NewString(cluster), "cluster")
}
ctx := &rawResource{kind: kind, name: name, query: nsQuery}
return ctx
@@ -62,22 +62,21 @@ func getNamespaceQuery(namespace string) *jsonutils.JSONDict {
return query
}
func (m *RawResourceManager) Get(s *mcclient.ClientSession, kind string, namespace string, name string, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
ctx := newRawResource(kind, namespace, name, query)
func (m *RawResourceManager) Get(s *mcclient.ClientSession, kind string, namespace string, name string, cluster string) (jsonutils.JSONObject, error) {
ctx := newRawResource(kind, namespace, name, cluster)
return m.request(s, "GET", ctx.path(), nil)
}
func (m *RawResourceManager) Put(s *mcclient.ClientSession, kind string, namespace string, name string, body jsonutils.JSONObject) error {
rawBytes := body.String()
func (m *RawResourceManager) Put(s *mcclient.ClientSession, kind string, namespace string, name string, body jsonutils.JSONObject, cluster string) error {
newBody := jsonutils.NewDict()
newBody.Add(jsonutils.NewString(rawBytes), "raw")
ctx := newRawResource(kind, namespace, name, nil)
newBody.Add(body, "raw")
ctx := newRawResource(kind, namespace, name, cluster)
_, err := m.request(s, "PUT", ctx.path(), newBody)
return err
}
func (m *RawResourceManager) Delete(s *mcclient.ClientSession, kind string, namespace string, name string, query jsonutils.JSONObject) error {
ctx := newRawResource(kind, namespace, name, query)
func (m *RawResourceManager) Delete(s *mcclient.ClientSession, kind string, namespace string, name string, cluster string) error {
ctx := newRawResource(kind, namespace, name, cluster)
_, err := m.request(s, "DELETE", ctx.path(), nil)
return err
}