Merge pull request #57368 from brendandburns/version

Automatic merge from submit-queue (batch tested with PRs 57349, 57368). 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>. Add '/version/' to the system:discovery role, since that's what the spec says. See: https://github.com/kubernetes-client/java/issues/153 ```release-note Add the path '/version/' to the `system:discovery` cluster role. ```

Merge pull request #57368 from brendandburns/version
c13a2aba · Kubernetes Submit Queue · GitHub · 1cfbd3c4 · 20bb9edf · c13a2aba
Unverified Commit c13a2aba authored Dec 20, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

policy.go plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go +1 -1

cluster-roles.yaml ...thorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml +1 -0

No files found.
--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
@@ -169,7 +169,7 @@ func ClusterRoles() []rbac.ClusterRole {
 			ObjectMeta: metav1.ObjectMeta{Name: "system:discovery"},
 			Rules: []rbac.PolicyRule{
 				rbac.NewRule("get").URLs(
-					"/healthz", "/version",
+					"/healthz", "/version", "/version/",
 					// remove once swagger 1.2 support is removed
 					"/swaggerapi", "/swaggerapi/*",
 					// do not expand this pattern for openapi discovery docs

--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
@@ -640,6 +640,7 @@ items:
    - /swaggerapi
    - /swaggerapi/*
    - /version
+    - /version/
    verbs:
    - get
 - apiVersion: rbac.authorization.k8s.io/v1