github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18147 from wojtek-t/fix_client_gen 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-03 11:01:51 -08:00
parent 13b0fd3cda 8952210304
commit 537405feda
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/libs/go2idl/client-gen/generators/generator-for-type.go
View File

@ -54,11 +54,9 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
"type": t, "type": t,
"package": pkg, "package": pkg,
"Package": namer.IC(pkg), "Package": namer.IC(pkg),
"fieldSelector": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/fields", Name: "Selector"}),
"labelSelector": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/labels", Name: "Selector"}),
"watchInterface": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/watch", Name: "Interface"}), "watchInterface": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/watch", Name: "Interface"}),
"apiDeleteOptions": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"}), "apiDeleteOptions": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"}),
"apiListOptions": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"}), "unvListOptions": c.Universe.Get(types.Name{Package: "k8s.io/kubernetes/pkg/api/unversioned", Name: "ListOptions"}),
} }
sw.Do(namespacerTemplate, m) sw.Do(namespacerTemplate, m)
sw.Do(interfaceTemplate, m) sw.Do(interfaceTemplate, m)
@ -90,8 +88,8 @@ type $.type|public$Interface interface {
Update(*$.type|raw$) (*$.type|raw$, error) Update(*$.type|raw$) (*$.type|raw$, error)
Delete(name string, options *$.apiDeleteOptions|raw$) error Delete(name string, options *$.apiDeleteOptions|raw$) error
Get(name string) (*$.type|raw$, error) Get(name string) (*$.type|raw$, error)
List(label $.labelSelector|raw$, field $.fieldSelector|raw$) (*$.type|raw$List, error) List(opts $.unvListOptions|raw$) (*$.type|raw$List, error)
Watch(label $.labelSelector|raw$, field $.fieldSelector|raw$, opts $.apiListOptions|raw$) ($.watchInterface|raw$, error) Watch(opts $.unvListOptions|raw$) ($.watchInterface|raw$, error)
} }
` `
@ -114,13 +112,12 @@ func new$.type|public$s(c *ExtensionsClient, namespace string) *$.type|private$s
` `
var listTemplate = ` var listTemplate = `
// List takes label and field selectors, and returns the list of $.type|public$s that match those selectors. // List takes label and field selectors, and returns the list of $.type|public$s that match those selectors.
func (c *$.type|private$s) List(label $.labelSelector|raw$, field $.fieldSelector|raw$) (result *$.type|raw$List, err error) { func (c *$.type|private$s) List(opts $.unvListOptions|raw$) (result *$.type|raw$List, err error) {
result = &$.type|raw$List{} result = &$.type|raw$List{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
Resource("$.type|private$s"). Resource("$.type|private$s").
LabelsSelectorParam(label). VersionedParams(&opts, api.Scheme).
FieldsSelectorParam(field).
Do(). Do().
Into(result) Into(result)
return return
@ -191,15 +188,12 @@ func (c *$.type|private$s) Update($.type|private$ *$.type|raw$) (result *$.type|
var watchTemplate = ` var watchTemplate = `
// Watch returns a $.watchInterface|raw$ that watches the requested $.type|private$s. // Watch returns a $.watchInterface|raw$ that watches the requested $.type|private$s.
func (c *$.type|private$s) Watch(label $.labelSelector|raw$, field $.fieldSelector|raw$, opts $.apiListOptions|raw$) ($.watchInterface|raw$, error) { func (c *$.type|private$s) Watch(opts $.unvListOptions|raw$) ($.watchInterface|raw$, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).
Resource("$.type|private$s"). Resource("$.type|private$s").
Param("resourceVersion", opts.ResourceVersion). VersionedParams(&opts, api.Scheme).
TimeoutSeconds(TimeoutFromListOptions(opts)).
LabelsSelectorParam(label).
FieldsSelectorParam(field).
Watch() Watch()
} }
` `