github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57040 from liggitt/sort-by-group

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56858, 57040, 56979, 57051, 57052). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Display apiGroups before resources in PolicyRule

This lets them sort logically into groups by string

"" "pods"
"" "configmaps"
"apps" "deployments"
"apps" "daemonsets"
etc

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-12-16 16:34:42 -08:00
committed by GitHub
parent 9c38cef9b1 16d4fb7e52
commit 62c89368db
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/rbac/helpers.go
View File

@@ -147,6 +147,10 @@ func (r PolicyRule) String() string {
func (r PolicyRule) CompactString() string { func (r PolicyRule) CompactString() string {
formatStringParts := []string{} formatStringParts := []string{}
formatArgs := []interface{}{} formatArgs := []interface{}{}
if len(r.APIGroups) > 0 {
formatStringParts = append(formatStringParts, "APIGroups:%q")
formatArgs = append(formatArgs, r.APIGroups)
}
if len(r.Resources) > 0 { if len(r.Resources) > 0 {
formatStringParts = append(formatStringParts, "Resources:%q") formatStringParts = append(formatStringParts, "Resources:%q")
formatArgs = append(formatArgs, r.Resources) formatArgs = append(formatArgs, r.Resources)
@@ -159,10 +163,6 @@ func (r PolicyRule) CompactString() string {
formatStringParts = append(formatStringParts, "ResourceNames:%q") formatStringParts = append(formatStringParts, "ResourceNames:%q")
formatArgs = append(formatArgs, r.ResourceNames) formatArgs = append(formatArgs, r.ResourceNames)
} }
if len(r.APIGroups) > 0 {
formatStringParts = append(formatStringParts, "APIGroups:%q")
formatArgs = append(formatArgs, r.APIGroups)
}
if len(r.Verbs) > 0 { if len(r.Verbs) > 0 {
formatStringParts = append(formatStringParts, "Verbs:%q") formatStringParts = append(formatStringParts, "Verbs:%q")
formatArgs = append(formatArgs, r.Verbs) formatArgs = append(formatArgs, r.Verbs)