From f378584a98beeeeab8aaf7d659576606cb4257e9 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 12 Jan 2018 17:35:13 -0500 Subject: [PATCH] Include proto swagger in discovery --- pkg/authorization/apis/authorization/types.go | 2 +- test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml | 2 ++ test/testdata/bootstrappolicy/bootstrap_policy_file.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/authorization/apis/authorization/types.go b/pkg/authorization/apis/authorization/types.go index 8b4fc06eef6a..7f3fa0e21c32 100644 --- a/pkg/authorization/apis/authorization/types.go +++ b/pkg/authorization/apis/authorization/types.go @@ -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/*", diff --git a/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml b/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml index 4e11c067fe45..cc44a5478e58 100644 --- a/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml +++ b/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml @@ -1731,6 +1731,7 @@ items: - /swaggerapi - /swaggerapi/* - /swagger.json + - /swagger-2.0.0.pb-v1 - /osapi - /osapi/ - /.well-known @@ -2436,6 +2437,7 @@ items: - /swaggerapi - /swaggerapi/* - /swagger.json + - /swagger-2.0.0.pb-v1 - /osapi - /osapi/ - /.well-known diff --git a/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml b/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml index d2ca40afb225..44e2cb8ca75a 100644 --- a/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml +++ b/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml @@ -1889,6 +1889,7 @@ items: - /oapi/* - /osapi - /osapi/ + - /swagger-2.0.0.pb-v1 - /swagger.json - /swaggerapi - /swaggerapi/* @@ -2666,6 +2667,7 @@ items: - /oapi/* - /osapi - /osapi/ + - /swagger-2.0.0.pb-v1 - /swagger.json - /swaggerapi - /swaggerapi/*