github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45171 from ncdc/groupName-override

Browse Source 
Automatic merge from submit-queue

Use groupName comment for listers/informers

If present, use the "// +groupName" doc comment as the desired group
name when generating listers and informers.

@kubernetes/sig-api-machinery-pr-reviews @smarterclayton @deads2k @liggitt @sttts
This commit is contained in:
Kubernetes Submit Queue 2017-05-15 14:14:21 -07:00 committed by GitHub
commit 682f3a39a0
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/libs/go2idl/informer-gen/generators/packages.go
View File

@ -150,6 +150,13 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
targetGroupVersions = externalGroupVersions targetGroupVersions = externalGroupVersions
} }
// If there's a comment of the form "// +groupName=somegroup" or
// "// +groupName=somegroup.foo.bar.io", use the first field (somegroup) as the name of the
// group when generating.
if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil {
gv.Group = clientgentypes.Group(strings.SplitN(override[0], ".", 2)[0])
}
var typesToGenerate []*types.Type var typesToGenerate []*types.Type
for _, t := range p.Types { for _, t := range p.Types {
// filter out types which dont have genclient=true. // filter out types which dont have genclient=true.

7
cmd/libs/go2idl/lister-gen/generators/lister.go
View File

@ -106,6 +106,13 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
internalGVPkg = strings.Join(parts[0:len(parts)-1], "/") internalGVPkg = strings.Join(parts[0:len(parts)-1], "/")
} }
// If there's a comment of the form "// +groupName=somegroup" or
// "// +groupName=somegroup.foo.bar.io", use the first field (somegroup) as the name of the
// group when generating.
if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil {
gv.Group = clientgentypes.Group(strings.SplitN(override[0], ".", 2)[0])
}
var typesToGenerate []*types.Type var typesToGenerate []*types.Type
for _, t := range p.Types { for _, t := range p.Types {
// filter out types which dont have genclient=true. // filter out types which dont have genclient=true.