Upgrade k8s package verison (#5358)
* upgrade k8s package version Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io> * Script upgrade and code formatting. Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io> Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
12
vendor/k8s.io/apiserver/pkg/authentication/group/group_adder.go
generated
vendored
12
vendor/k8s.io/apiserver/pkg/authentication/group/group_adder.go
generated
vendored
@@ -41,11 +41,17 @@ func (g *GroupAdder) AuthenticateRequest(req *http.Request) (*authenticator.Resp
|
||||
if err != nil || !ok {
|
||||
return nil, ok, err
|
||||
}
|
||||
r.User = &user.DefaultInfo{
|
||||
|
||||
newGroups := make([]string, 0, len(r.User.GetGroups())+len(g.Groups))
|
||||
newGroups = append(newGroups, r.User.GetGroups()...)
|
||||
newGroups = append(newGroups, g.Groups...)
|
||||
|
||||
ret := *r // shallow copy
|
||||
ret.User = &user.DefaultInfo{
|
||||
Name: r.User.GetName(),
|
||||
UID: r.User.GetUID(),
|
||||
Groups: append(r.User.GetGroups(), g.Groups...),
|
||||
Groups: newGroups,
|
||||
Extra: r.User.GetExtra(),
|
||||
}
|
||||
return r, true, nil
|
||||
return &ret, true, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user