Merge pull request #51261 from xilabao/remove-deprecated-rule

Automatic merge from submit-queue (batch tested with PRs 46986, 51214, 51169, 50155, 51261) remove deprecated rbac rule **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #51261 from xilabao/remove-deprecated-rule
b248f777 · Kubernetes Submit Queue · GitHub · 6a3647a7 · f0f06a3d · b248f777
Commit b248f777 authored Aug 25, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

controller_policy.go ...auth/authorizer/rbac/bootstrappolicy/controller_policy.go +0 -2

controller-roles.yaml ...rizer/rbac/bootstrappolicy/testdata/controller-roles.yaml +0 -9

No files found.
--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go
@@ -141,8 +141,6 @@ func init() {
 			rbac.NewRule("get", "update").Groups(extensionsGroup).Resources("replicationcontrollers/scale").RuleOrDie(),
 			rbac.NewRule("get", "update").Groups(extensionsGroup, appsGroup).Resources("deployments/scale", "replicasets/scale").RuleOrDie(),
 			rbac.NewRule("list").Groups(legacyGroup).Resources("pods").RuleOrDie(),
-			// TODO: Remove the root /proxy permission in 1.7; MetricsClient no longer requires root proxy access as of 1.6 (fixed in https://github.com/kubernetes/kubernetes/pull/39636)
-			rbac.NewRule("proxy").Groups(legacyGroup).Resources("services").Names("https:heapster:", "http:heapster:").RuleOrDie(),
 			// TODO: restrict this to the appropriate namespace
 			rbac.NewRule("get").Groups(legacyGroup).Resources("services/proxy").Names("https:heapster:", "http:heapster:").RuleOrDie(),
 			eventsRule(),

--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml
@@ -459,15 +459,6 @@ items:
    - 'http:heapster:'
    - 'https:heapster:'
    resources:
-    - services
-    verbs:
-    - proxy
-  - apiGroups:
-    - ""
-    resourceNames:
-    - 'http:heapster:'
-    - 'https:heapster:'
-    resources:
    - services/proxy
    verbs:
    - get