github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85309 from liggitt/cs-table-handler

Browse Source 
Avoid constructing table printer on every componentstatus request
This commit is contained in:
Kubernetes Prow Robot 2019-11-14 17:51:31 -08:00 committed by GitHub
commit 97d45fe3c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/core/componentstatus/BUILD
View File

@ -23,7 +23,6 @@ go_library(
"//pkg/probe/http:go_default_library", "//pkg/probe/http:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",

9
pkg/registry/core/componentstatus/rest.go
View File

@ -28,7 +28,6 @@ import (
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
@ -40,21 +39,17 @@ import (
type REST struct { type REST struct {
GetServersToValidate func() map[string]*Server GetServersToValidate func() map[string]*Server
rest.TableConvertor
} }
// NewStorage returns a new REST. // NewStorage returns a new REST.
func NewStorage(serverRetriever func() map[string]*Server) *REST { func NewStorage(serverRetriever func() map[string]*Server) *REST {
return &REST{ return &REST{
GetServersToValidate: serverRetriever, GetServersToValidate: serverRetriever,
TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)},
} }
} }
// ConvertToTable converts the result to the table.
func (rs *REST) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) {
tableConvertor := printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)}
return tableConvertor.ConvertToTable(ctx, object, tableOptions)
}
func (*REST) NamespaceScoped() bool { func (*REST) NamespaceScoped() bool {
return false return false
} }