Rename a variable

Signed-off-by: juliankatz <juliankatz@google.com>
open-policy-agent · Oct 11, 2021 · 5dcb771 · 5dcb771
1 parent 654f030
commit 5dcb771
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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 {