Skip to content

Commit 1cc7f5d

Browse files
deads2kdeads2k
committed
remove extraneous field selector conversions
1 parent 0bc330c commit 1cc7f5d

File tree

11 files changed

+6
-165
lines changed

11 files changed

+6
-165
lines changed

‎hack/import-restrictions.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,7 @@
201201
"allowedImportPackages": [
202202
"vendor/k8s.io/kubernetes/pkg/api",
203203
"vendor/k8s.io/kubernetes/pkg/api/v1",
204-
"github.com/openshift/origin/pkg/api",
205-
"github.com/openshift/origin/pkg/api/extension",
206-
"github.com/openshift/origin/pkg/api/install",
207-
"github.com/openshift/origin/test/util/api"
204+
"github.com/openshift/origin/pkg/api/extension"
208205
]
209206
},
210207

‎pkg/template/apis/template/fields.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎pkg/template/apis/template/v1/conversion.go

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,9 @@ import (
44
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
55
"k8s.io/apimachinery/pkg/runtime"
66

7-
oapi "github.com/openshift/origin/pkg/api"
87
"github.com/openshift/origin/pkg/api/extension"
9-
templateapi "github.com/openshift/origin/pkg/template/apis/template"
108
)
119

12-
func addConversionFuncs(scheme *runtime.Scheme) error {
13-
if err := scheme.AddFieldLabelConversionFunc("v1", "Template",
14-
oapi.GetFieldLabelConversionFunc(templateapi.TemplateToSelectableFields(&templateapi.Template{}), nil),
15-
); err != nil {
16-
return err
17-
}
18-
19-
if err := scheme.AddFieldLabelConversionFunc("v1", "TemplateInstance",
20-
oapi.GetFieldLabelConversionFunc(templateapi.TemplateInstanceToSelectableFields(&templateapi.TemplateInstance{}), nil),
21-
); err != nil {
22-
return err
23-
}
24-
25-
if err := scheme.AddFieldLabelConversionFunc("v1", "BrokerTemplateInstance",
26-
oapi.GetFieldLabelConversionFunc(templateapi.BrokerTemplateInstanceToSelectableFields(&templateapi.BrokerTemplateInstance{}), nil),
27-
); err != nil {
28-
return err
29-
}
30-
31-
return nil
32-
33-
}
34-
3510
var _ runtime.NestedObjectDecoder = &Template{}
3611
var _ runtime.NestedObjectEncoder = &Template{}
3712

‎pkg/template/apis/template/v1/conversion_test.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎pkg/template/apis/template/v1/register.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ var (
1717
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
1818
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
1919

20-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs)
20+
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes)
2121
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
2222

23-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
23+
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
2424
AddToScheme = SchemeBuilder.AddToScheme
2525
)
2626

‎pkg/template/registry/brokertemplateinstance/etcd/etcd.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ func NewREST(optsGetter restoptions.Getter) (*REST, error) {
2525
Copier: kapi.Scheme,
2626
NewFunc: func() runtime.Object { return &templateapi.BrokerTemplateInstance{} },
2727
NewListFunc: func() runtime.Object { return &templateapi.BrokerTemplateInstanceList{} },
28-
PredicateFunc: brokertemplateinstance.Matcher,
2928
DefaultQualifiedResource: templateapi.Resource("brokertemplateinstances"),
3029

3130
CreateStrategy: brokertemplateinstance.Strategy,
3231
UpdateStrategy: brokertemplateinstance.Strategy,
3332
DeleteStrategy: brokertemplateinstance.Strategy,
3433
}
3534

36-
options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: brokertemplateinstance.GetAttrs}
35+
options := &generic.StoreOptions{RESTOptions: optsGetter}
3736
if err := store.CompleteWithOptions(options); err != nil {
3837
return nil, err
3938
}

‎pkg/template/registry/brokertemplateinstance/strategy.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package brokertemplateinstance
22

33
import (
4-
"fmt"
5-
6-
"k8s.io/apimachinery/pkg/fields"
7-
"k8s.io/apimachinery/pkg/labels"
84
"k8s.io/apimachinery/pkg/runtime"
95
"k8s.io/apimachinery/pkg/util/validation/field"
106
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11-
"k8s.io/apiserver/pkg/storage"
127
"k8s.io/apiserver/pkg/storage/names"
138
kapi "k8s.io/kubernetes/pkg/api"
149

@@ -61,25 +56,3 @@ func (brokerTemplateInstanceStrategy) AllowUnconditionalUpdate() bool {
6156
func (brokerTemplateInstanceStrategy) ValidateUpdate(ctx apirequest.Context, obj, old runtime.Object) field.ErrorList {
6257
return validation.ValidateBrokerTemplateInstanceUpdate(obj.(*templateapi.BrokerTemplateInstance), old.(*templateapi.BrokerTemplateInstance))
6358
}
64-
65-
// Matcher returns a generic matcher for a given label and field selector.
66-
func Matcher(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
67-
return storage.SelectionPredicate{
68-
Label: label,
69-
Field: field,
70-
GetAttrs: GetAttrs,
71-
}
72-
}
73-
74-
func GetAttrs(o runtime.Object) (labels.Set, fields.Set, bool, error) {
75-
obj, ok := o.(*templateapi.BrokerTemplateInstance)
76-
if !ok {
77-
return nil, nil, false, fmt.Errorf("not a BrokerTemplateInstance")
78-
}
79-
return labels.Set(obj.Labels), SelectableFields(obj), obj.Initializers != nil, nil
80-
}
81-
82-
// SelectableFields returns a field set that can be used for filter selection
83-
func SelectableFields(obj *templateapi.BrokerTemplateInstance) fields.Set {
84-
return templateapi.BrokerTemplateInstanceToSelectableFields(obj)
85-
}

‎pkg/template/registry/template/etcd/etcd.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ func NewREST(optsGetter restoptions.Getter) (*REST, error) {
2525
Copier: kapi.Scheme,
2626
NewFunc: func() runtime.Object { return &templateapi.Template{} },
2727
NewListFunc: func() runtime.Object { return &templateapi.TemplateList{} },
28-
PredicateFunc: template.Matcher,
2928
DefaultQualifiedResource: templateapi.Resource("templates"),
3029

3130
CreateStrategy: template.Strategy,
@@ -35,7 +34,7 @@ func NewREST(optsGetter restoptions.Getter) (*REST, error) {
3534
ReturnDeletedObject: true,
3635
}
3736

38-
options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: template.GetAttrs}
37+
options := &generic.StoreOptions{RESTOptions: optsGetter}
3938
if err := store.CompleteWithOptions(options); err != nil {
4039
return nil, err
4140
}

‎pkg/template/registry/template/strategy.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package template
22

33
import (
4-
"fmt"
5-
6-
"k8s.io/apimachinery/pkg/fields"
7-
"k8s.io/apimachinery/pkg/labels"
84
"k8s.io/apimachinery/pkg/runtime"
95
"k8s.io/apimachinery/pkg/util/validation/field"
106
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11-
"k8s.io/apiserver/pkg/storage"
127
"k8s.io/apiserver/pkg/storage/names"
138
kapi "k8s.io/kubernetes/pkg/api"
149

@@ -60,26 +55,3 @@ func (templateStrategy) AllowUnconditionalUpdate() bool {
6055
func (templateStrategy) ValidateUpdate(ctx apirequest.Context, obj, old runtime.Object) field.ErrorList {
6156
return validation.ValidateTemplateUpdate(obj.(*templateapi.Template), old.(*templateapi.Template))
6257
}
63-
64-
// GetAttrs returns labels and fields of a given object for filtering purposes
65-
func GetAttrs(o runtime.Object) (labels.Set, fields.Set, bool, error) {
66-
obj, ok := o.(*templateapi.Template)
67-
if !ok {
68-
return nil, nil, false, fmt.Errorf("not a Template")
69-
}
70-
return labels.Set(obj.Labels), SelectableFields(obj), obj.Initializers != nil, nil
71-
}
72-
73-
// Matcher returns a generic matcher for a given label and field selector.
74-
func Matcher(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
75-
return storage.SelectionPredicate{
76-
Label: label,
77-
Field: field,
78-
GetAttrs: GetAttrs,
79-
}
80-
}
81-
82-
// SelectableFields returns a field set that can be used for filter selection
83-
func SelectableFields(obj *templateapi.Template) fields.Set {
84-
return templateapi.TemplateToSelectableFields(obj)
85-
}

‎pkg/template/registry/templateinstance/etcd/etcd.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,14 @@ func NewREST(optsGetter restoptions.Getter, authorizationClient authorizationint
3030
Copier: kapi.Scheme,
3131
NewFunc: func() runtime.Object { return &templateapi.TemplateInstance{} },
3232
NewListFunc: func() runtime.Object { return &templateapi.TemplateInstanceList{} },
33-
PredicateFunc: templateinstance.Matcher,
3433
DefaultQualifiedResource: templateapi.Resource("templateinstances"),
3534

3635
CreateStrategy: strategy,
3736
UpdateStrategy: strategy,
3837
DeleteStrategy: strategy,
3938
}
4039

41-
options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: templateinstance.GetAttrs}
40+
options := &generic.StoreOptions{RESTOptions: optsGetter}
4241
if err := store.CompleteWithOptions(options); err != nil {
4342
return nil, nil, err
4443
}

‎pkg/template/registry/templateinstance/strategy.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@ package templateinstance
22

33
import (
44
"errors"
5-
"fmt"
65

7-
"k8s.io/apimachinery/pkg/fields"
8-
"k8s.io/apimachinery/pkg/labels"
96
"k8s.io/apimachinery/pkg/runtime"
107
"k8s.io/apimachinery/pkg/util/validation/field"
118
"k8s.io/apiserver/pkg/authentication/user"
129
apirequest "k8s.io/apiserver/pkg/endpoints/request"
13-
"k8s.io/apiserver/pkg/storage"
1410
"k8s.io/apiserver/pkg/storage/names"
1511
kapi "k8s.io/kubernetes/pkg/api"
1612
kapihelper "k8s.io/kubernetes/pkg/api/helper"
@@ -103,29 +99,6 @@ func (s *templateInstanceStrategy) ValidateUpdate(ctx apirequest.Context, obj, o
10399
return allErrs
104100
}
105101

106-
// Matcher returns a generic matcher for a given label and field selector.
107-
func Matcher(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
108-
return storage.SelectionPredicate{
109-
Label: label,
110-
Field: field,
111-
GetAttrs: GetAttrs,
112-
}
113-
}
114-
115-
// GetAttrs returns labels and fields of a given object for filtering purposes
116-
func GetAttrs(o runtime.Object) (labels.Set, fields.Set, bool, error) {
117-
obj, ok := o.(*templateapi.TemplateInstance)
118-
if !ok {
119-
return nil, nil, false, fmt.Errorf("not a TemplateInstance")
120-
}
121-
return labels.Set(obj.Labels), SelectableFields(obj), obj.Initializers != nil, nil
122-
}
123-
124-
// SelectableFields returns a field set that can be used for filter selection
125-
func SelectableFields(obj *templateapi.TemplateInstance) fields.Set {
126-
return templateapi.TemplateInstanceToSelectableFields(obj)
127-
}
128-
129102
func (s *templateInstanceStrategy) validateImpersonationUpdate(templateInstance, oldTemplateInstance *templateapi.TemplateInstance, userinfo user.Info) field.ErrorList {
130103
if rbacregistry.IsOnlyMutatingGCFields(templateInstance, oldTemplateInstance, kapihelper.Semantic) {
131104
return nil

0 commit comments

Comments
 (0)