github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 21:36:24 +00:00
Code Issues Projects Releases Wiki Activity

kube-apiserver/corerest: remove redundant interface

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2023-07-03 12:30:43 +02:00
parent a864ce77b7
commit 19cb6d036a
No known key found for this signature in database
GPG Key ID: 4C68E0F19F95EC33
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/core/serviceaccount/storage/storage.go
View File

@ -39,7 +39,7 @@ type REST struct {
} }
// NewREST returns a RESTStorage object that will work against service accounts. // 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{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &api.ServiceAccount{} }, NewFunc: func() runtime.Object { return &api.ServiceAccount{} },
NewListFunc: func() runtime.Object { return &api.ServiceAccountList{} }, NewListFunc: func() runtime.Object { return &api.ServiceAccountList{} },

10
pkg/registry/core/serviceaccount/storage/token.go
View File

@ -50,9 +50,9 @@ func (r *TokenREST) Destroy() {
} }
type TokenREST struct { type TokenREST struct {
svcaccts getter svcaccts rest.Getter
pods getter pods rest.Getter
secrets getter secrets rest.Getter
issuer token.TokenGenerator issuer token.TokenGenerator
auds authenticator.Audiences auds authenticator.Audiences
audsSet sets.String audsSet sets.String
@ -198,10 +198,6 @@ func (r *TokenREST) GroupVersionKind(schema.GroupVersion) schema.GroupVersionKin
return gvk 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 // 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 { func newContext(ctx context.Context, resource, name string, gvk schema.GroupVersionKind) context.Context {
oldInfo, found := genericapirequest.RequestInfoFrom(ctx) oldInfo, found := genericapirequest.RequestInfoFrom(ctx)