From 5dcb7714b8f23c57aaa0c7e1ee2c379901906d02 Mon Sep 17 00:00:00 2001 From: juliankatz Date: Mon, 11 Oct 2021 11:03:13 -0700 Subject: [PATCH] Rename a variable Signed-off-by: juliankatz --- constraint/pkg/apis/templates/v1/scheme.go | 6 +++--- constraint/pkg/apis/templates/v1alpha1/scheme.go | 6 +++--- constraint/pkg/apis/templates/v1beta1/scheme.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/constraint/pkg/apis/templates/v1/scheme.go b/constraint/pkg/apis/templates/v1/scheme.go index f911e3a4c..eb537194f 100644 --- a/constraint/pkg/apis/templates/v1/scheme.go +++ b/constraint/pkg/apis/templates/v1/scheme.go @@ -22,8 +22,8 @@ func init() { // zz_generated.conversion.go, the conversion functions haven't been // registered with the localSchemeBuilder by the time this init() function // runs. We sidestep this problem by adding RegisterConversions here. - schemeBuilder := runtime.NewSchemeBuilder(localSchemeBuilder...) - schemeBuilder.Register(RegisterConversions) + sb := runtime.NewSchemeBuilder(SchemeBuilder.AddToScheme, addDefaultingFuncs) + sb.Register(RegisterConversions) sch = runtime.NewScheme() var err error @@ -33,7 +33,7 @@ func init() { if err = apiextensions.AddToScheme(sch); err != nil { panic(err) } - if err = schemeBuilder.AddToScheme(sch); err != nil { + if err = sb.AddToScheme(sch); err != nil { panic(err) } if structuralSchema, err = ctschema.CRDSchema(sch, version); err != nil { diff --git a/constraint/pkg/apis/templates/v1alpha1/scheme.go b/constraint/pkg/apis/templates/v1alpha1/scheme.go index e4df5966d..96b148d56 100644 --- a/constraint/pkg/apis/templates/v1alpha1/scheme.go +++ b/constraint/pkg/apis/templates/v1alpha1/scheme.go @@ -22,8 +22,8 @@ func init() { // zz_generated.conversion.go, the conversion functions haven't been // registered with the localSchemeBuilder by the time this init() function // runs. We sidestep this problem by adding RegisterConversions here. - schemeBuilder := runtime.NewSchemeBuilder(localSchemeBuilder...) - schemeBuilder.Register(RegisterConversions) + sb := runtime.NewSchemeBuilder(SchemeBuilder.AddToScheme, addDefaultingFuncs) + sb.Register(RegisterConversions) sch = runtime.NewScheme() var err error @@ -33,7 +33,7 @@ func init() { if err = apiextensions.AddToScheme(sch); err != nil { panic(err) } - if err = schemeBuilder.AddToScheme(sch); err != nil { + if err = sb.AddToScheme(sch); err != nil { panic(err) } if structuralSchema, err = ctschema.CRDSchema(sch, version); err != nil { diff --git a/constraint/pkg/apis/templates/v1beta1/scheme.go b/constraint/pkg/apis/templates/v1beta1/scheme.go index 0d92ff6b2..f838c46dc 100644 --- a/constraint/pkg/apis/templates/v1beta1/scheme.go +++ b/constraint/pkg/apis/templates/v1beta1/scheme.go @@ -22,8 +22,8 @@ func init() { // zz_generated.conversion.go, the conversion functions haven't been // registered with the localSchemeBuilder by the time this init() function // runs. We sidestep this problem by adding RegisterConversions here. - schemeBuilder := runtime.NewSchemeBuilder(localSchemeBuilder...) - schemeBuilder.Register(RegisterConversions) + sb := runtime.NewSchemeBuilder(SchemeBuilder.AddToScheme, addDefaultingFuncs) + sb.Register(RegisterConversions) sch = runtime.NewScheme() var err error @@ -33,7 +33,7 @@ func init() { if err = apiextensions.AddToScheme(sch); err != nil { panic(err) } - if err = schemeBuilder.AddToScheme(sch); err != nil { + if err = sb.AddToScheme(sch); err != nil { panic(err) } if structuralSchema, err = ctschema.CRDSchema(sch, version); err != nil {