Skip to content

Commit c2513c8

Browse files
authored
Merge pull request kubernetes#82603 from robscott/endpointslice-kubectl-fix
Fixing EndpointSlice kubectl output
2 parents 4ee1e75 + 57757b6 commit c2513c8

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

pkg/printers/internalversion/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ go_library(
7373
"//pkg/apis/core/helper:go_default_library",
7474
"//pkg/apis/core/install:go_default_library",
7575
"//pkg/apis/discovery:go_default_library",
76+
"//pkg/apis/discovery/install:go_default_library",
7677
"//pkg/apis/events/install:go_default_library",
7778
"//pkg/apis/extensions/install:go_default_library",
7879
"//pkg/apis/networking:go_default_library",

pkg/printers/internalversion/import_known_versions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
_ "k8s.io/kubernetes/pkg/apis/certificates/install"
2828
_ "k8s.io/kubernetes/pkg/apis/coordination/install"
2929
_ "k8s.io/kubernetes/pkg/apis/core/install"
30+
_ "k8s.io/kubernetes/pkg/apis/discovery/install"
3031
_ "k8s.io/kubernetes/pkg/apis/events/install"
3132
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
3233
_ "k8s.io/kubernetes/pkg/apis/policy/install"

pkg/registry/discovery/endpointslice/storage/BUILD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ go_library(
77
visibility = ["//visibility:public"],
88
deps = [
99
"//pkg/apis/discovery:go_default_library",
10+
"//pkg/printers:go_default_library",
11+
"//pkg/printers/internalversion:go_default_library",
12+
"//pkg/printers/storage:go_default_library",
1013
"//pkg/registry/discovery/endpointslice:go_default_library",
1114
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
1215
"//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library",

pkg/registry/discovery/endpointslice/storage/storage.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import (
2121
"k8s.io/apiserver/pkg/registry/generic"
2222
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
2323
"k8s.io/kubernetes/pkg/apis/discovery"
24+
"k8s.io/kubernetes/pkg/printers"
25+
printersinternal "k8s.io/kubernetes/pkg/printers/internalversion"
26+
printerstorage "k8s.io/kubernetes/pkg/printers/storage"
2427
"k8s.io/kubernetes/pkg/registry/discovery/endpointslice"
2528
)
2629

@@ -32,16 +35,15 @@ type REST struct {
3235
// NewREST returns a RESTStorage object that will work against endpoint slices.
3336
func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) {
3437
store := &genericregistry.Store{
35-
NewFunc: func() runtime.Object { return &discovery.EndpointSlice{} },
36-
NewListFunc: func() runtime.Object { return &discovery.EndpointSliceList{} },
37-
ObjectNameFunc: func(obj runtime.Object) (string, error) {
38-
return obj.(*discovery.EndpointSlice).Name, nil
39-
},
38+
NewFunc: func() runtime.Object { return &discovery.EndpointSlice{} },
39+
NewListFunc: func() runtime.Object { return &discovery.EndpointSliceList{} },
4040
DefaultQualifiedResource: discovery.Resource("endpointslices"),
4141

4242
CreateStrategy: endpointslice.Strategy,
4343
UpdateStrategy: endpointslice.Strategy,
4444
DeleteStrategy: endpointslice.Strategy,
45+
46+
TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)},
4547
}
4648
options := &generic.StoreOptions{RESTOptions: optsGetter}
4749
if err := store.CompleteWithOptions(options); err != nil {

0 commit comments

Comments
 (0)