From 2e97611bc62b88c48777d6209a0ed28d17d0e52d Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Thu, 29 Jun 2017 17:36:00 +0800 Subject: [PATCH] remove useless argument "name" --- pkg/serviceaccount/util.go | 2 +- .../apiserver/pkg/authentication/serviceaccount/util.go | 4 ++-- .../k8s.io/apiserver/pkg/endpoints/filters/impersonation.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/serviceaccount/util.go b/pkg/serviceaccount/util.go index 2ab8484a83..df4dc3a914 100644 --- a/pkg/serviceaccount/util.go +++ b/pkg/serviceaccount/util.go @@ -28,7 +28,7 @@ func UserInfo(namespace, name, uid string) user.Info { return &user.DefaultInfo{ Name: apiserverserviceaccount.MakeUsername(namespace, name), UID: uid, - Groups: apiserverserviceaccount.MakeGroupNames(namespace, name), + Groups: apiserverserviceaccount.MakeGroupNames(namespace), } } diff --git a/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go b/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go index ac3c252b75..1b7bbc1390 100644 --- a/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go +++ b/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go @@ -59,8 +59,8 @@ func SplitUsername(username string) (string, string, error) { return namespace, name, nil } -// MakeGroupNames generates service account group names for the given namespace and ServiceAccount name -func MakeGroupNames(namespace, name string) []string { +// MakeGroupNames generates service account group names for the given namespace +func MakeGroupNames(namespace string) []string { return []string{ AllServiceAccountsGroup, MakeNamespaceGroupName(namespace), diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go index 891b339ecc..822d0fc5e7 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go @@ -84,7 +84,7 @@ func WithImpersonation(handler http.Handler, requestContextMapper request.Reques username = serviceaccount.MakeUsername(impersonationRequest.Namespace, impersonationRequest.Name) if !groupsSpecified { // if groups aren't specified for a service account, we know the groups because its a fixed mapping. Add them - groups = serviceaccount.MakeGroupNames(impersonationRequest.Namespace, impersonationRequest.Name) + groups = serviceaccount.MakeGroupNames(impersonationRequest.Namespace) } case v1.SchemeGroupVersion.WithKind("User").GroupKind():