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

Avoid registering manual conversion twice

Browse Source
This commit is contained in:
wojtekt 2019-10-24 13:35:16 +02:00
parent 2905275a08
commit 9acb04a8e5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
View File

@ -669,10 +669,14 @@ func (g *genConversion) Init(c *generator.Context, w io.Writer) error {
sw.Do("func RegisterConversions(s $.|raw$) error {\n", schemePtr) sw.Do("func RegisterConversions(s $.|raw$) error {\n", schemePtr)
for _, t := range g.types { for _, t := range g.types {
peerType := getPeerTypeFor(c, t, g.peerPackages) peerType := getPeerTypeFor(c, t, g.peerPackages)
args := argsFromType(t, peerType).With("Scope", types.Ref(conversionPackagePath, "Scope")) if _, found := g.preexists(t, peerType); !found {
sw.Do("if err := s.AddGeneratedConversionFunc((*$.inType|raw$)(nil), (*$.outType|raw$)(nil), func(a, b interface{}, scope $.Scope|raw$) error { return "+nameTmpl+"(a.(*$.inType|raw$), b.(*$.outType|raw$), scope) }); err != nil { return err }\n", args) args := argsFromType(t, peerType).With("Scope", types.Ref(conversionPackagePath, "Scope"))
args = argsFromType(peerType, t).With("Scope", types.Ref(conversionPackagePath, "Scope")) sw.Do("if err := s.AddGeneratedConversionFunc((*$.inType|raw$)(nil), (*$.outType|raw$)(nil), func(a, b interface{}, scope $.Scope|raw$) error { return "+nameTmpl+"(a.(*$.inType|raw$), b.(*$.outType|raw$), scope) }); err != nil { return err }\n", args)
sw.Do("if err := s.AddGeneratedConversionFunc((*$.inType|raw$)(nil), (*$.outType|raw$)(nil), func(a, b interface{}, scope $.Scope|raw$) error { return "+nameTmpl+"(a.(*$.inType|raw$), b.(*$.outType|raw$), scope) }); err != nil { return err }\n", args) }
if _, found := g.preexists(peerType, t); !found {
args := argsFromType(peerType, t).With("Scope", types.Ref(conversionPackagePath, "Scope"))
sw.Do("if err := s.AddGeneratedConversionFunc((*$.inType|raw$)(nil), (*$.outType|raw$)(nil), func(a, b interface{}, scope $.Scope|raw$) error { return "+nameTmpl+"(a.(*$.inType|raw$), b.(*$.outType|raw$), scope) }); err != nil { return err }\n", args)
}
} }
for i := range g.explicitConversions { for i := range g.explicitConversions {