github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91264 from sallyom/dupeVerbsDescribe

Browse Source 
When combining PolicyRules, don't duplicate verbs
This commit is contained in:
Kubernetes Prow Robot 2020-07-12 06:58:00 -07:00 committed by GitHub
commit 79428712b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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", importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/rbac",
importpath = "k8s.io/kubectl/pkg/util/rbac", importpath = "k8s.io/kubectl/pkg/util/rbac",
visibility = ["//visibility:public"], 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( filegroup(

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

@ -18,6 +18,7 @@ package rbac
import ( import (
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/util/sets"
"reflect" "reflect"
"strings" "strings"
) )
@ -42,7 +43,13 @@ func CompactRules(rules []rbacv1.PolicyRule) ([]rbacv1.PolicyRule, error) {
if existingRule.Verbs == nil { if existingRule.Verbs == nil {
existingRule.Verbs = []string{} 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 { } else {
// Copy the rule to accumulate matching simple resource rules into // Copy the rule to accumulate matching simple resource rules into
simpleRules[resource] = rule.DeepCopy() simpleRules[resource] = rule.DeepCopy()