Merge pull request #39219 from liggitt/swagger-discovery

Automatic merge from submit-queue Include swaggerapi urls in system:discovery role Used by client side API validation and for client schema generation

Merge pull request #39219 from liggitt/swagger-discovery
2bad7e6b · Kubernetes Submit Queue · GitHub · 9b726d6b · a209040a · 2bad7e6b
Commit 2bad7e6b authored Jan 04, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 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 +2 -0

No files found.
--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
@@ -82,7 +82,7 @@ func ClusterRoles() []rbac.ClusterRole {
 			// a role which provides just enough power to discovery API versions for negotiation
 			ObjectMeta: api.ObjectMeta{Name: "system:discovery"},
 			Rules: []rbac.PolicyRule{
-				rbac.NewRule("get").URLs("/version", "/api", "/api/*", "/apis", "/apis/*").RuleOrDie(),
+				rbac.NewRule("get").URLs("/version", "/swaggerapi", "/swaggerapi/*", "/api", "/api/*", "/apis", "/apis/*").RuleOrDie(),
 			},
 		},
 		{

--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
@@ -383,6 +383,8 @@ items:
    - /api/*
    - /apis
    - /apis/*
+    - /swaggerapi
+    - /swaggerapi/*
    - /version
    verbs:
    - get