Merge pull request #47897 from xilabao/dead-code-in-rbac-helper

Automatic merge from submit-queue (batch tested with PRs 49238, 49595, 43494, 47897, 48905) remove dead code in rbac helper **What this PR does / why we need it**: validated in `case len(r.PolicyRule.NonResourceURLs) > 0:` . **Which issue this PR fixes**: #49540 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #47897 from xilabao/dead-code-in-rbac-helper
79887972 · Kubernetes Submit Queue · GitHub · b3db5a20 · ece31885 · 79887972
Commit 79887972 authored Jul 28, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

helpers.go pkg/apis/rbac/helpers.go +2 -3

No files found.
--- a/pkg/apis/rbac/helpers.go
+++ b/pkg/apis/rbac/helpers.go
@@ -215,9 +215,8 @@ func (r *PolicyRuleBuilder) Rule() (PolicyRule, error) {
 			return PolicyRule{}, fmt.Errorf("non-resource rule may not have apiGroups, resources, or resourceNames: %#v", r.PolicyRule)
 		}
 	case len(r.PolicyRule.Resources) > 0:
-		if len(r.PolicyRule.NonResourceURLs) != 0 {
-			return PolicyRule{}, fmt.Errorf("resource rule may not have nonResourceURLs: %#v", r.PolicyRule)
-		}
+		// resource rule may not have nonResourceURLs
+
 		if len(r.PolicyRule.APIGroups) == 0 {
 			// this a common bug
 			return PolicyRule{}, fmt.Errorf("resource rule must have apiGroups: %#v", r.PolicyRule)