Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
2e97611b
Commit
2e97611b
authored
Jun 29, 2017
by
Cao Shufeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove useless argument "name"
parent
b353792f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
util.go
pkg/serviceaccount/util.go
+1
-1
util.go
...8s.io/apiserver/pkg/authentication/serviceaccount/util.go
+2
-2
impersonation.go
...c/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go
+1
-1
No files found.
pkg/serviceaccount/util.go
View file @
2e97611b
...
@@ -28,7 +28,7 @@ func UserInfo(namespace, name, uid string) user.Info {
...
@@ -28,7 +28,7 @@ func UserInfo(namespace, name, uid string) user.Info {
return
&
user
.
DefaultInfo
{
return
&
user
.
DefaultInfo
{
Name
:
apiserverserviceaccount
.
MakeUsername
(
namespace
,
name
),
Name
:
apiserverserviceaccount
.
MakeUsername
(
namespace
,
name
),
UID
:
uid
,
UID
:
uid
,
Groups
:
apiserverserviceaccount
.
MakeGroupNames
(
namespace
,
name
),
Groups
:
apiserverserviceaccount
.
MakeGroupNames
(
namespace
),
}
}
}
}
...
...
staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go
View file @
2e97611b
...
@@ -59,8 +59,8 @@ func SplitUsername(username string) (string, string, error) {
...
@@ -59,8 +59,8 @@ func SplitUsername(username string) (string, string, error) {
return
namespace
,
name
,
nil
return
namespace
,
name
,
nil
}
}
// MakeGroupNames generates service account group names for the given namespace
and ServiceAccount name
// MakeGroupNames generates service account group names for the given namespace
func
MakeGroupNames
(
namespace
,
name
string
)
[]
string
{
func
MakeGroupNames
(
namespace
string
)
[]
string
{
return
[]
string
{
return
[]
string
{
AllServiceAccountsGroup
,
AllServiceAccountsGroup
,
MakeNamespaceGroupName
(
namespace
),
MakeNamespaceGroupName
(
namespace
),
...
...
staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go
View file @
2e97611b
...
@@ -84,7 +84,7 @@ func WithImpersonation(handler http.Handler, requestContextMapper request.Reques
...
@@ -84,7 +84,7 @@ func WithImpersonation(handler http.Handler, requestContextMapper request.Reques
username
=
serviceaccount
.
MakeUsername
(
impersonationRequest
.
Namespace
,
impersonationRequest
.
Name
)
username
=
serviceaccount
.
MakeUsername
(
impersonationRequest
.
Namespace
,
impersonationRequest
.
Name
)
if
!
groupsSpecified
{
if
!
groupsSpecified
{
// if groups aren't specified for a service account, we know the groups because its a fixed mapping. Add them
// 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
()
:
case
v1
.
SchemeGroupVersion
.
WithKind
(
"User"
)
.
GroupKind
()
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment