Merge pull request #18309 from openshift-cherrypick-robot/cherry-pick-18105-to-release-3.7

Automatic merge from submit-queue.

[release-3.7] Include proto swagger in discovery

This is an automated cherry-pick of #18105

/assign juanvallejo

Author: openshift-merge-robot

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/*",
 

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

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/*