diff --git a/pkg/printers/internalversion/BUILD b/pkg/printers/internalversion/BUILD index 8f23319ae43..29661f62372 100644 --- a/pkg/printers/internalversion/BUILD +++ b/pkg/printers/internalversion/BUILD @@ -73,6 +73,7 @@ go_library( "//pkg/apis/core/helper:go_default_library", "//pkg/apis/core/install:go_default_library", "//pkg/apis/discovery:go_default_library", + "//pkg/apis/discovery/install:go_default_library", "//pkg/apis/events/install:go_default_library", "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/networking:go_default_library", diff --git a/pkg/printers/internalversion/import_known_versions.go b/pkg/printers/internalversion/import_known_versions.go index 47a379762bd..d6877600e97 100644 --- a/pkg/printers/internalversion/import_known_versions.go +++ b/pkg/printers/internalversion/import_known_versions.go @@ -27,6 +27,7 @@ import ( _ "k8s.io/kubernetes/pkg/apis/certificates/install" _ "k8s.io/kubernetes/pkg/apis/coordination/install" _ "k8s.io/kubernetes/pkg/apis/core/install" + _ "k8s.io/kubernetes/pkg/apis/discovery/install" _ "k8s.io/kubernetes/pkg/apis/events/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install" _ "k8s.io/kubernetes/pkg/apis/policy/install" diff --git a/pkg/registry/discovery/endpointslice/storage/BUILD b/pkg/registry/discovery/endpointslice/storage/BUILD index fff0cd9fa4c..b7cdad488fe 100644 --- a/pkg/registry/discovery/endpointslice/storage/BUILD +++ b/pkg/registry/discovery/endpointslice/storage/BUILD @@ -7,6 +7,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/discovery:go_default_library", + "//pkg/printers:go_default_library", + "//pkg/printers/internalversion:go_default_library", + "//pkg/printers/storage:go_default_library", "//pkg/registry/discovery/endpointslice:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library", diff --git a/pkg/registry/discovery/endpointslice/storage/storage.go b/pkg/registry/discovery/endpointslice/storage/storage.go index 92d4ed3a639..756553ad580 100644 --- a/pkg/registry/discovery/endpointslice/storage/storage.go +++ b/pkg/registry/discovery/endpointslice/storage/storage.go @@ -21,6 +21,9 @@ import ( "k8s.io/apiserver/pkg/registry/generic" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/apis/discovery" + "k8s.io/kubernetes/pkg/printers" + printersinternal "k8s.io/kubernetes/pkg/printers/internalversion" + printerstorage "k8s.io/kubernetes/pkg/printers/storage" "k8s.io/kubernetes/pkg/registry/discovery/endpointslice" ) @@ -32,16 +35,15 @@ type REST struct { // NewREST returns a RESTStorage object that will work against endpoint slices. func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) { store := &genericregistry.Store{ - NewFunc: func() runtime.Object { return &discovery.EndpointSlice{} }, - NewListFunc: func() runtime.Object { return &discovery.EndpointSliceList{} }, - ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*discovery.EndpointSlice).Name, nil - }, + NewFunc: func() runtime.Object { return &discovery.EndpointSlice{} }, + NewListFunc: func() runtime.Object { return &discovery.EndpointSliceList{} }, DefaultQualifiedResource: discovery.Resource("endpointslices"), CreateStrategy: endpointslice.Strategy, UpdateStrategy: endpointslice.Strategy, DeleteStrategy: endpointslice.Strategy, + + TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)}, } options := &generic.StoreOptions{RESTOptions: optsGetter} if err := store.CompleteWithOptions(options); err != nil {