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

Fix register-gen wrt gengo/v2

Browse Source
This commit is contained in:
Tim Hockin 2023-12-24 09:59:59 -08:00
parent f772410082
commit c8b61bb98b
No known key found for this signature in database
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/code-generator/cmd/register-gen/generators/packages.go
View File

@ -50,8 +50,8 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
} }
packages := generator.Packages{} packages := generator.Packages{}
for _, inputDir := range arguments.InputDirs { for _, input := range context.Inputs {
pkg := context.Universe.Package(inputDir) pkg := context.Universe.Package(input)
internal, err := isInternal(pkg) internal, err := isInternal(pkg)
if err != nil { if err != nil {
klog.V(5).Infof("skipping the generation of %s file, due to err %v", arguments.OutputFileBaseName, err) klog.V(5).Infof("skipping the generation of %s file, due to err %v", arguments.OutputFileBaseName, err)
@ -62,7 +62,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
continue continue
} }
registerFileName := "register.go" registerFileName := "register.go"
searchPath := path.Join(args.DefaultSourceTree(), inputDir, registerFileName) searchPath := path.Join(pkg.SourcePath, registerFileName)
if _, err := os.Stat(path.Join(searchPath)); err == nil { if _, err := os.Stat(path.Join(searchPath)); err == nil {
klog.V(5).Infof("skipping the generation of %s file because %s already exists in the path %s", arguments.OutputFileBaseName, registerFileName, searchPath) klog.V(5).Infof("skipping the generation of %s file because %s already exists in the path %s", arguments.OutputFileBaseName, registerFileName, searchPath)
continue continue
@ -102,7 +102,8 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
packages = append(packages, packages = append(packages,
&generator.DefaultPackage{ &generator.DefaultPackage{
PackageName: pkg.Name, PackageName: pkg.Name,
PackagePath: pkg.Path, PackagePath: pkg.Path, // output to same pkg as input
Source: pkg.SourcePath, // output to same pkg as input
HeaderText: boilerplate, HeaderText: boilerplate,
GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) { GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) {
return []generator.Generator{ return []generator.Generator{