Skip to content

Commit

Permalink
Rename a variable
Browse files Browse the repository at this point in the history 
Signed-off-by: juliankatz <juliankatz@google.com>
  • Loading branch information
@julianKatz
julianKatz committed Oct 12, 2021
1 parent 654f030 commit 65407b5
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions constraint/pkg/apis/templates/v1/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
// versionless api representation.
func (versioned *ConstraintTemplate) ToVersionless() (*templates.ConstraintTemplate, error) {
versionedCopy := versioned.DeepCopy()
sch.Default(versionedCopy)
versionedScheme.Default(versionedCopy)

versionless := &templates.ConstraintTemplate{}
if err := sch.Convert(versionedCopy, versionless, nil); err != nil {
if err := versionedScheme.Convert(versionedCopy, versionless, nil); err != nil {
return nil, err
}

Expand Down
16 changes: 8 additions & 8 deletions constraint/pkg/apis/templates/v1/scheme.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const version = "v1"

var (
structuralSchema *schema.Structural
sch *runtime.Scheme
versionedScheme *runtime.Scheme
)

func init() {
Expand All @@ -22,21 +22,21 @@ 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()
versionedScheme = runtime.NewScheme()
var err error
if err = apiextensionsv1.AddToScheme(sch); err != nil {
if err = apiextensionsv1.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if err = apiextensions.AddToScheme(sch); err != nil {
if err = apiextensions.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if err = schemeBuilder.AddToScheme(sch); err != nil {
if err = sb.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if structuralSchema, err = ctschema.CRDSchema(sch, version); err != nil {
if structuralSchema, err = ctschema.CRDSchema(versionedScheme, version); err != nil {
panic(err)
}
}
4 changes: 2 additions & 2 deletions constraint/pkg/apis/templates/v1alpha1/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
// versionless api representation.
func (versioned *ConstraintTemplate) ToVersionless() (*templates.ConstraintTemplate, error) {
versionedCopy := versioned.DeepCopy()
sch.Default(versionedCopy)
versionedScheme.Default(versionedCopy)

versionless := &templates.ConstraintTemplate{}
if err := sch.Convert(versionedCopy, versionless, nil); err != nil {
if err := versionedScheme.Convert(versionedCopy, versionless, nil); err != nil {
return nil, err
}

Expand Down
16 changes: 8 additions & 8 deletions constraint/pkg/apis/templates/v1alpha1/scheme.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const version = "v1alpha1"

var (
structuralSchema *schema.Structural
sch *runtime.Scheme
versionedScheme *runtime.Scheme
)

func init() {
Expand All @@ -22,21 +22,21 @@ 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()
versionedScheme = runtime.NewScheme()
var err error
if err = apiextensionsv1.AddToScheme(sch); err != nil {
if err = apiextensionsv1.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if err = apiextensions.AddToScheme(sch); err != nil {
if err = apiextensions.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if err = schemeBuilder.AddToScheme(sch); err != nil {
if err = sb.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if structuralSchema, err = ctschema.CRDSchema(sch, version); err != nil {
if structuralSchema, err = ctschema.CRDSchema(versionedScheme, version); err != nil {
panic(err)
}
}
4 changes: 2 additions & 2 deletions constraint/pkg/apis/templates/v1beta1/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
// versionless api representation.
func (versioned *ConstraintTemplate) ToVersionless() (*templates.ConstraintTemplate, error) {
versionedCopy := versioned.DeepCopy()
sch.Default(versionedCopy)
versionedScheme.Default(versionedCopy)

versionless := &templates.ConstraintTemplate{}
if err := sch.Convert(versionedCopy, versionless, nil); err != nil {
if err := versionedScheme.Convert(versionedCopy, versionless, nil); err != nil {
return nil, err
}

Expand Down
16 changes: 8 additions & 8 deletions constraint/pkg/apis/templates/v1beta1/scheme.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const version = "v1beta1"

var (
structuralSchema *schema.Structural
sch *runtime.Scheme
versionedScheme *runtime.Scheme
)

func init() {
Expand All @@ -22,21 +22,21 @@ 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()
versionedScheme = runtime.NewScheme()
var err error
if err = apiextensionsv1.AddToScheme(sch); err != nil {
if err = apiextensionsv1.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if err = apiextensions.AddToScheme(sch); err != nil {
if err = apiextensions.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if err = schemeBuilder.AddToScheme(sch); err != nil {
if err = sb.AddToScheme(versionedScheme); err != nil {
panic(err)
}
if structuralSchema, err = ctschema.CRDSchema(sch, version); err != nil {
if structuralSchema, err = ctschema.CRDSchema(versionedScheme, version); err != nil {
panic(err)
}
}

0 comments on commit 65407b5

Please sign in to comment.