Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-3.7] Include proto swagger in discovery #18309

Merged
merged 1 commit into from
Jan 29, 2018
Merged

[release-3.7] Include proto swagger in discovery #18309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/authorization/apis/authorization/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var DiscoveryRule = rbac.PolicyRule{
"/api", "/api/*",
"/apis", "/apis/*",
"/oapi", "/oapi/*",
"/swaggerapi", "/swaggerapi/*", "/swagger.json",
"/swaggerapi", "/swaggerapi/*", "/swagger.json", "/swagger-2.0.0.pb-v1",
"/osapi", "/osapi/", // these cannot be removed until we can drop support for pre 3.1 clients
"/.well-known", "/.well-known/*",

Expand Down
2 changes: 2 additions & 0 deletions test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,6 +1731,7 @@ items:
- /swaggerapi
- /swaggerapi/*
- /swagger.json
- /swagger-2.0.0.pb-v1
- /osapi
- /osapi/
- /.well-known
Expand Down Expand Up @@ -2436,6 +2437,7 @@ items:
- /swaggerapi
- /swaggerapi/*
- /swagger.json
- /swagger-2.0.0.pb-v1
- /osapi
- /osapi/
- /.well-known
Expand Down
2 changes: 2 additions & 0 deletions test/testdata/bootstrappolicy/bootstrap_policy_file.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,7 @@ items:
- /oapi/*
- /osapi
- /osapi/
- /swagger-2.0.0.pb-v1
- /swagger.json
- /swaggerapi
- /swaggerapi/*
Expand Down Expand Up @@ -2666,6 +2667,7 @@ items:
- /oapi/*
- /osapi
- /osapi/
- /swagger-2.0.0.pb-v1
- /swagger.json
- /swaggerapi
- /swaggerapi/*
Expand Down