github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

When combining PolicyRules, don't duplicate verbs

Browse Source
This commit is contained in:
Sally O'Malley 2020-05-18 15:20:06 -04:00
parent 5afc42de95
commit ea23faa523
No known key found for this signature in database
GPG Key ID: 9AD4DAB10C905B8C
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/kubectl/pkg/util/rbac/BUILD
View File

@ -6,7 +6,10 @@ go_library(
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/rbac",
importpath = "k8s.io/kubectl/pkg/util/rbac",
visibility = ["//visibility:public"],
deps = ["//staging/src/k8s.io/api/rbac/v1:go_default_library"],
deps = [
"//staging/src/k8s.io/api/rbac/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
],
)
filegroup(

9
staging/src/k8s.io/kubectl/pkg/util/rbac/rbac.go
View File

@ -18,6 +18,7 @@ package rbac
import (
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/util/sets"
"reflect"
"strings"
)
@ -42,7 +43,13 @@ func CompactRules(rules []rbacv1.PolicyRule) ([]rbacv1.PolicyRule, error) {
if existingRule.Verbs == nil {
existingRule.Verbs = []string{}
}
existingRule.Verbs = append(existingRule.Verbs, rule.Verbs...)
existingVerbs := sets.NewString(existingRule.Verbs...)
for _, verb := range rule.Verbs {
if !existingVerbs.Has(verb) {
existingRule.Verbs = append(existingRule.Verbs, verb)
}
}
} else {
// Copy the rule to accumulate matching simple resource rules into
simpleRules[resource] = rule.DeepCopy()