github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45999 from enj/enj/i/custom_resource_name 

Automatic merge from submit-queue

Remove ObjectNameFunc from custom resources

@deads2k as far as I can tell these `ObjectNameFunc`s are unnecessary.

Signed-off-by: Monis Khan <mkhan@redhat.com>

**Release note**:

```
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-05-18 10:29:03 -07:00 committed by GitHub
parent d775ff4c3a cb1328261c
commit 151846db80
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package customresource
import (
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -41,13 +40,6 @@ func NewREST(resource schema.GroupResource, listKind schema.GroupVersionKind, co
ret.SetGroupVersionKind(listKind)
return ret
},
ObjectNameFunc: func(obj runtime.Object) (string, error) {
accessor, err := meta.Accessor(obj)
if err != nil {
return "", err
}
return accessor.GetName(), nil
},
PredicateFunc: strategy.MatchCustomResourceDefinitionStorage,
QualifiedResource: resource,

9
staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go
View File

@ -35,12 +35,9 @@ func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) *REST
strategy := NewStrategy(scheme)
store := &genericregistry.Store{
Copier: scheme,
NewFunc: func() runtime.Object { return &apiextensions.CustomResourceDefinition{} },
NewListFunc: func() runtime.Object { return &apiextensions.CustomResourceDefinitionList{} },
ObjectNameFunc: func(obj runtime.Object) (string, error) {
return obj.(*apiextensions.CustomResourceDefinition).Name, nil
},
Copier: scheme,
NewFunc: func() runtime.Object { return &apiextensions.CustomResourceDefinition{} },
NewListFunc: func() runtime.Object { return &apiextensions.CustomResourceDefinitionList{} },
PredicateFunc: MatchCustomResourceDefinition,
QualifiedResource: apiextensions.Resource("customresourcedefinitions"),