Skip to content

K
k3s
Commit ecd28d97 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #50139 from mfojtik/fix-clientgen

Automatic merge from submit-queue codegen: skip generation of informers and listers on resources with missing verbs This patch will prevent generation of listers and informers for resources that does not implement the required verbs (list, get, watch). Currently informers and listers are generated for those resources which cause a compilation failure.
parents 41933572 cd23e5f1
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/packages.go
View file @ ecd28d97
...@@ -172,7 +172,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat ...@@ -172,7 +172,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
var typesToGenerate []*types.Type var typesToGenerate []*types.Type
for _, t := range p.Types { for _, t := range p.Types {
tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) tags := util.MustParseClientGenTags(t.SecondClosestCommentLines)
if !tags.GenerateClient || tags.NoVerbs { if !tags.GenerateClient || tags.NoVerbs || !tags.HasVerb("list") || !tags.HasVerb("watch") {
continue continue
} }
...@@ -304,7 +304,8 @@ func groupPackage(basePackage string, groupVersions clientgentypes.GroupVersions ...@@ -304,7 +304,8 @@ func groupPackage(basePackage string, groupVersions clientgentypes.GroupVersions
return generators return generators
}, },
FilterFunc: func(c *generator.Context, t *types.Type) bool { FilterFunc: func(c *generator.Context, t *types.Type) bool {
return util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient tags := util.MustParseClientGenTags(t.SecondClosestCommentLines)
return tags.GenerateClient && tags.HasVerb("list") && tags.HasVerb("watch")
}, },
} }
} }
...@@ -344,7 +345,8 @@ func versionPackage(basePackage string, gv clientgentypes.GroupVersion, boilerpl ...@@ -344,7 +345,8 @@ func versionPackage(basePackage string, gv clientgentypes.GroupVersion, boilerpl
return generators return generators
}, },
FilterFunc: func(c *generator.Context, t *types.Type) bool { FilterFunc: func(c *generator.Context, t *types.Type) bool {
return util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient tags := util.MustParseClientGenTags(t.SecondClosestCommentLines)
return tags.GenerateClient && tags.HasVerb("list") && tags.HasVerb("watch")
}, },
} }
} }
staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go
View file @ ecd28d97
...@@ -117,11 +117,15 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat ...@@ -117,11 +117,15 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
var typesToGenerate []*types.Type var typesToGenerate []*types.Type
for _, t := range p.Types { for _, t := range p.Types {
if !util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient { tags := util.MustParseClientGenTags(t.SecondClosestCommentLines)
if !tags.GenerateClient || !tags.HasVerb("list") || !tags.HasVerb("get") {
continue continue
} }
typesToGenerate = append(typesToGenerate, t) typesToGenerate = append(typesToGenerate, t)
} }
if len(typesToGenerate) == 0 {
continue
}
orderer := namer.Orderer{Namer: namer.NewPrivateNamer(0)} orderer := namer.Orderer{Namer: namer.NewPrivateNamer(0)}
typesToGenerate = orderer.OrderTypes(typesToGenerate) typesToGenerate = orderer.OrderTypes(typesToGenerate)
...@@ -155,7 +159,8 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat ...@@ -155,7 +159,8 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
return generators return generators
}, },
FilterFunc: func(c *generator.Context, t *types.Type) bool { FilterFunc: func(c *generator.Context, t *types.Type) bool {
return util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient tags := util.MustParseClientGenTags(t.SecondClosestCommentLines)
return tags.GenerateClient && tags.HasVerb("list") && tags.HasVerb("get")
}, },
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment