From 19cb6d036ae8b189bb2fdfd0c832ff1e4a6f6074 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 3 Jul 2023 12:30:43 +0200 Subject: [PATCH] kube-apiserver/corerest: remove redundant interface --- pkg/registry/core/serviceaccount/storage/storage.go | 2 +- pkg/registry/core/serviceaccount/storage/token.go | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/registry/core/serviceaccount/storage/storage.go b/pkg/registry/core/serviceaccount/storage/storage.go index 0bdcf07282d..c4707943803 100644 --- a/pkg/registry/core/serviceaccount/storage/storage.go +++ b/pkg/registry/core/serviceaccount/storage/storage.go @@ -39,7 +39,7 @@ type REST struct { } // NewREST returns a RESTStorage object that will work against service accounts. -func NewREST(optsGetter generic.RESTOptionsGetter, issuer token.TokenGenerator, auds authenticator.Audiences, max time.Duration, podStorage, secretStorage *genericregistry.Store, extendExpiration bool) (*REST, error) { +func NewREST(optsGetter generic.RESTOptionsGetter, issuer token.TokenGenerator, auds authenticator.Audiences, max time.Duration, podStorage, secretStorage rest.Getter, extendExpiration bool) (*REST, error) { store := &genericregistry.Store{ NewFunc: func() runtime.Object { return &api.ServiceAccount{} }, NewListFunc: func() runtime.Object { return &api.ServiceAccountList{} }, diff --git a/pkg/registry/core/serviceaccount/storage/token.go b/pkg/registry/core/serviceaccount/storage/token.go index 6f840e53154..45cb723ed61 100644 --- a/pkg/registry/core/serviceaccount/storage/token.go +++ b/pkg/registry/core/serviceaccount/storage/token.go @@ -50,9 +50,9 @@ func (r *TokenREST) Destroy() { } type TokenREST struct { - svcaccts getter - pods getter - secrets getter + svcaccts rest.Getter + pods rest.Getter + secrets rest.Getter issuer token.TokenGenerator auds authenticator.Audiences audsSet sets.String @@ -198,10 +198,6 @@ func (r *TokenREST) GroupVersionKind(schema.GroupVersion) schema.GroupVersionKin return gvk } -type getter interface { - Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) -} - // newContext return a copy of ctx in which new RequestInfo is set func newContext(ctx context.Context, resource, name string, gvk schema.GroupVersionKind) context.Context { oldInfo, found := genericapirequest.RequestInfoFrom(ctx)