jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add namespace for rolebinding on a clusterrole (#2170) 

* add namespace for rolebinding on a clusterrole

Signed-off-by: Vlad Fratila <vlad.fratila@gmail.com>

* remove unused function

Signed-off-by: Vlad Fratila <vlad.fratila@gmail.com>

---------

Signed-off-by: Vlad Fratila <vlad.fratila@gmail.com>
mine
Vlad Fratila 2023-07-26 21:39:37 +03:00 committed by GitHub
parent c1e16e338a
commit f42f19bbce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/dao/rbac_policy.go
View File

@ -88,21 +88,20 @@ func (p *Policy) loadClusterRoleBinding(kind, name string) (render.Policies, err
} }
func (p *Policy) loadRoleBinding(kind, name string) (render.Policies, error) { func (p *Policy) loadRoleBinding(kind, name string) (render.Policies, error) {
ss, err := p.fetchRoleBindingSubjects(kind, name) rbsMap, err := p.fetchRoleBindingNamespaces(kind, name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
crs, err := p.fetchClusterRoles() crs, err := p.fetchClusterRoles()
if err != nil { if err != nil {
return nil, err return nil, err
} }
rows := make(render.Policies, 0, len(crs)) rows := make(render.Policies, 0, len(crs))
for _, cr := range crs { for _, cr := range crs {
if !inList(ss, "ClusterRole:"+cr.Name) { if rbNs, ok := rbsMap["ClusterRole:"+cr.Name]; ok {
continue log.Debug().Msgf("Loading rules for clusterrole %q:%q", rbNs, cr.Name)
rows = append(rows, parseRules(rbNs, "CR:"+cr.Name, cr.Rules)...)
} }
rows = append(rows, parseRules("*", "CR:"+cr.Name, cr.Rules)...)
} }
ros, err := p.fetchRoles() ros, err := p.fetchRoles()
@ -110,7 +109,7 @@ func (p *Policy) loadRoleBinding(kind, name string) (render.Policies, error) {
return nil, err return nil, err
} }
for _, ro := range ros { for _, ro := range ros {
if !inList(ss, "Role:"+ro.Name) { if _, ok := rbsMap["Role:"+ro.Name]; !ok {
continue continue
} }
log.Debug().Msgf("Loading rules for role %q:%q", ro.Namespace, ro.Name) log.Debug().Msgf("Loading rules for role %q:%q", ro.Namespace, ro.Name)
@ -156,19 +155,19 @@ func fetchRoleBindings(f Factory) ([]rbacv1.RoleBinding, error) {
return rbs, nil return rbs, nil
} }
func (p *Policy) fetchRoleBindingSubjects(kind, name string) ([]string, error) { func (p *Policy) fetchRoleBindingNamespaces(kind, name string) (map[string]string, error) {
rbs, err := fetchRoleBindings(p.Factory) rbs, err := fetchRoleBindings(p.Factory)
if err != nil { if err != nil {
return nil, err return nil, err
} }
ns, n := client.Namespaced(name) ns, n := client.Namespaced(name)
ss := make([]string, 0, len(rbs)) ss := make(map[string]string, len(rbs))
for _, rb := range rbs { for _, rb := range rbs {
for _, s := range rb.Subjects { for _, s := range rb.Subjects {
s := s s := s
if isSameSubject(kind, ns, n, &s) { if isSameSubject(kind, ns, n, &s) {
ss = append(ss, rb.RoleRef.Kind+":"+rb.RoleRef.Name) ss[rb.RoleRef.Kind+":"+rb.RoleRef.Name] = rb.Namespace
} }
} }
} }