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

Merge pull request #124193 from soltysh/fix_applyconfig-gen

Browse Source 
Update applyconfiguration generator for packages where paths differ in name
This commit is contained in:
Kubernetes Prow Robot 2024-04-18 03:24:14 -07:00 committed by GitHub
commit 679f021809
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go
View File

@ -35,6 +35,7 @@ type applyConfigurationGenerator struct {
generator.GoGenerator generator.GoGenerator
// outPkgBase is the base package, under which the "internal" and GV-specific subdirs live // outPkgBase is the base package, under which the "internal" and GV-specific subdirs live
outPkgBase string // must be a Go import-path outPkgBase string // must be a Go import-path
localPkg string
groupVersion clientgentypes.GroupVersion groupVersion clientgentypes.GroupVersion
applyConfig applyConfig applyConfig applyConfig
imports namer.ImportTracker imports namer.ImportTracker
@ -49,9 +50,8 @@ func (g *applyConfigurationGenerator) Filter(_ *generator.Context, t *types.Type
} }
func (g *applyConfigurationGenerator) Namers(*generator.Context) namer.NameSystems { func (g *applyConfigurationGenerator) Namers(*generator.Context) namer.NameSystems {
localPkg := path.Join(g.outPkgBase, g.groupVersion.Group.PackageName(), g.groupVersion.Version.PackageName())
return namer.NameSystems{ return namer.NameSystems{
"raw": namer.NewRawNamer(localPkg, g.imports), "raw": namer.NewRawNamer(g.localPkg, g.imports),
"singularKind": namer.NewPublicNamer(0), "singularKind": namer.NewPublicNamer(0),
} }
} }

1
staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go
View File

@ -185,6 +185,7 @@ func targetForApplyConfigurationsPackage(outputDirBase, outputPkgBase, pkgSubdir
OutputFilename: strings.ToLower(toGenerate.Type.Name.Name) + ".go", OutputFilename: strings.ToLower(toGenerate.Type.Name.Name) + ".go",
}, },
outPkgBase: outputPkgBase, outPkgBase: outputPkgBase,
localPkg: outputPkg,
groupVersion: gv, groupVersion: gv,
applyConfig: toGenerate, applyConfig: toGenerate,
imports: generator.NewImportTracker(), imports: generator.NewImportTracker(),