Skip to content

Commit 97d45fe

Browse files
authored
Merge pull request kubernetes#85309 from liggitt/cs-table-handler
Avoid constructing table printer on every componentstatus request
2 parents ff0a1d8 + 114e71b commit 97d45fe

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

pkg/registry/core/componentstatus/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ go_library(
2323
"//pkg/probe/http:go_default_library",
2424
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
2525
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
26-
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
2726
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
2827
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
2928
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",

pkg/registry/core/componentstatus/rest.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
31-
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
3231
"k8s.io/apimachinery/pkg/runtime"
3332
"k8s.io/apiserver/pkg/registry/rest"
3433
api "k8s.io/kubernetes/pkg/apis/core"
@@ -40,21 +39,17 @@ import (
4039

4140
type REST struct {
4241
GetServersToValidate func() map[string]*Server
42+
rest.TableConvertor
4343
}
4444

4545
// NewStorage returns a new REST.
4646
func NewStorage(serverRetriever func() map[string]*Server) *REST {
4747
return &REST{
4848
GetServersToValidate: serverRetriever,
49+
TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)},
4950
}
5051
}
5152

52-
// ConvertToTable converts the result to the table.
53-
func (rs *REST) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) {
54-
tableConvertor := printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)}
55-
return tableConvertor.ConvertToTable(ctx, object, tableOptions)
56-
}
57-
5853
func (*REST) NamespaceScoped() bool {
5954
return false
6055
}

0 commit comments

Comments
 (0)