From 1c60949dfd37c1d66704443721b57e23fa919ff7 Mon Sep 17 00:00:00 2001 From: MikeSpreitzer Date: Wed, 13 Nov 2019 16:45:38 +0000 Subject: [PATCH] updated generated files --- api/openapi-spec/swagger.json | 9 +- .../v1alpha1/zz_generated.conversion.go | 2 + .../flowcontrol/validation/validation_test.go | 14 +- .../api/flowcontrol/v1alpha1/generated.pb.go | 211 ++++++++++-------- .../api/flowcontrol/v1alpha1/generated.proto | 40 ++-- .../k8s.io/api/flowcontrol/v1alpha1/types.go | 4 +- .../v1alpha1/types_swagger_doc_generated.go | 11 +- 7 files changed, 161 insertions(+), 130 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 89a7626d723..da3204c7cf9 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -14274,8 +14274,12 @@ "type": "array", "x-kubernetes-list-type": "set" }, + "clusterScope": { + "description": "`clusterScope` indicates whether to match requests that do not specify a namespace (which happens either because the resource is not namespaced or the request targets all namespaces). If this field is omitted or false then the `namespaces` field must contain a non-empty list.", + "type": "boolean" + }, "namespaces": { - "description": "`namespaces` is a list of target namespaces that restricts matches. A request that does not specify a target namespace (which happens both when the resource is not namespaced and when the resource is namespaced and the request is for all namespaces) matches only if this list includes \"Cluster Scope\" (this string is not a valid namespace and thus can not be confused with an actual namespace). A request that specifies a target namespace matches only if either (a) this list contains that target namespace or (b) this list contains \"*\".\n\nThis list may not be omitted or empty. If the list contains \"*\" then the only other allowed member is \"Cluster Scope\". Without \"*\", it is allowed to list \"Cluster Scope\" along with particular namespaces.\n\nRequests will match only if the values in this list are appropriate for the resource(s) involved. For example: for a cluster scoped resource (i.e., one not namespaced) a request can match only if this list contains \"Cluster Scope\". It is entirely up to the client to populate this list with appropriate values; the server-performed validation does not (at least in this alpha) address this issue.", + "description": "`namespaces` is a list of target namespaces that restricts matches. A request that specifies a target namespace matches only if either (a) this list contains that target namespace or (b) this list contains \"*\". Note that \"*\" matches any specified namespace but does not match a request that _does not specify_ a namespace (see the `clusterScope` field for that). This list may be empty, but only if `clusterScope` is true.", "items": { "type": "string" }, @@ -14302,8 +14306,7 @@ "required": [ "verbs", "apiGroups", - "resources", - "namespaces" + "resources" ], "type": "object" }, diff --git a/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go b/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go index c2a380d72a3..e0b3ebd6626 100644 --- a/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go @@ -697,6 +697,7 @@ func autoConvert_v1alpha1_ResourcePolicyRule_To_flowcontrol_ResourcePolicyRule(i out.Verbs = *(*[]string)(unsafe.Pointer(&in.Verbs)) out.APIGroups = *(*[]string)(unsafe.Pointer(&in.APIGroups)) out.Resources = *(*[]string)(unsafe.Pointer(&in.Resources)) + out.ClusterScope = in.ClusterScope out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) return nil } @@ -710,6 +711,7 @@ func autoConvert_flowcontrol_ResourcePolicyRule_To_v1alpha1_ResourcePolicyRule(i out.Verbs = *(*[]string)(unsafe.Pointer(&in.Verbs)) out.APIGroups = *(*[]string)(unsafe.Pointer(&in.APIGroups)) out.Resources = *(*[]string)(unsafe.Pointer(&in.Resources)) + out.ClusterScope = in.ClusterScope out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) return nil } diff --git a/pkg/apis/flowcontrol/validation/validation_test.go b/pkg/apis/flowcontrol/validation/validation_test.go index 92c44225705..dc1c93b6e7f 100644 --- a/pkg/apis/flowcontrol/validation/validation_test.go +++ b/pkg/apis/flowcontrol/validation/validation_test.go @@ -431,9 +431,9 @@ func TestFlowSchemaValidation(t *testing.T) { }, ResourceRules: []flowcontrol.ResourcePolicyRule{ { - Verbs: []string{flowcontrol.VerbAll}, - APIGroups: []string{flowcontrol.APIGroupAll}, - Resources: []string{flowcontrol.ResourceAll}, + Verbs: []string{flowcontrol.VerbAll}, + APIGroups: []string{flowcontrol.APIGroupAll}, + Resources: []string{flowcontrol.ResourceAll}, ClusterScope: true, }, }, @@ -464,11 +464,11 @@ func TestFlowSchemaValidation(t *testing.T) { }, ResourceRules: []flowcontrol.ResourcePolicyRule{ { - Verbs: []string{flowcontrol.VerbAll}, - APIGroups: []string{flowcontrol.APIGroupAll}, - Resources: []string{flowcontrol.ResourceAll}, + Verbs: []string{flowcontrol.VerbAll}, + APIGroups: []string{flowcontrol.APIGroupAll}, + Resources: []string{flowcontrol.ResourceAll}, ClusterScope: true, - Namespaces: []string{flowcontrol.NamespaceEvery}, + Namespaces: []string{flowcontrol.NamespaceEvery}, }, }, }, diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go index 2900ff091bc..c6f3c2575e5 100644 --- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go @@ -689,95 +689,96 @@ func init() { } var fileDescriptor_45ba024d525b289b = []byte{ - // 1400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xdd, 0x6e, 0xd4, 0xc6, - 0x17, 0x8f, 0x37, 0xbb, 0x49, 0x76, 0x42, 0x3e, 0xfe, 0x93, 0x3f, 0xca, 0x36, 0x48, 0xbb, 0xa9, - 0x2b, 0x15, 0x28, 0x60, 0x13, 0x4a, 0x29, 0x15, 0x42, 0x28, 0x06, 0x95, 0xaf, 0x24, 0x4d, 0x26, - 0x40, 0x55, 0x44, 0x25, 0x26, 0xde, 0x89, 0x77, 0xc8, 0xae, 0xed, 0xce, 0xd8, 0x4b, 0x53, 0x71, - 0x51, 0xa9, 0x2f, 0xc0, 0x03, 0xf0, 0x00, 0x7d, 0x89, 0xaa, 0xbd, 0x44, 0x55, 0x2f, 0xb8, 0xe4, - 0x6a, 0x45, 0xb6, 0xb7, 0x7d, 0x80, 0x8a, 0xab, 0x6a, 0xc6, 0x63, 0x7b, 0xbd, 0x1f, 0xd9, 0xa5, - 0x91, 0xb8, 0xea, 0x9d, 0x7d, 0x3e, 0x7e, 0xe7, 0xcc, 0x6f, 0xce, 0x99, 0x73, 0xc0, 0xad, 0xbd, - 0xcb, 0xdc, 0xa0, 0x9e, 0xb9, 0x17, 0xee, 0x10, 0xe6, 0x92, 0x80, 0x70, 0xb3, 0x49, 0xdc, 0xaa, - 0xc7, 0x4c, 0xa5, 0xc0, 0x3e, 0x35, 0x77, 0xeb, 0xde, 0x53, 0xdb, 0x73, 0x03, 0xe6, 0xd5, 0xcd, - 0xe6, 0x0a, 0xae, 0xfb, 0x35, 0xbc, 0x62, 0x3a, 0xc4, 0x25, 0x0c, 0x07, 0xa4, 0x6a, 0xf8, 0xcc, - 0x0b, 0x3c, 0x58, 0x89, 0x1c, 0x0c, 0xec, 0x53, 0xa3, 0xc3, 0xc1, 0x88, 0x1d, 0x96, 0xce, 0x39, - 0x34, 0xa8, 0x85, 0x3b, 0x86, 0xed, 0x35, 0x4c, 0xc7, 0x73, 0x3c, 0x53, 0xfa, 0xed, 0x84, 0xbb, - 0xf2, 0x4f, 0xfe, 0xc8, 0xaf, 0x08, 0x6f, 0xe9, 0x62, 0x9a, 0x40, 0x03, 0xdb, 0x35, 0xea, 0x12, - 0xb6, 0x6f, 0xfa, 0x7b, 0x8e, 0x10, 0x70, 0xb3, 0x41, 0x02, 0x6c, 0x36, 0x7b, 0xb2, 0x58, 0x32, - 0x07, 0x79, 0xb1, 0xd0, 0x0d, 0x68, 0x83, 0xf4, 0x38, 0x5c, 0x1a, 0xe6, 0xc0, 0xed, 0x1a, 0x69, - 0xe0, 0x6e, 0x3f, 0xfd, 0x21, 0x58, 0xfc, 0xb2, 0xee, 0x3d, 0xbd, 0x41, 0x79, 0x40, 0x5d, 0x27, - 0xa4, 0xbc, 0x46, 0xd8, 0x3a, 0x09, 0x6a, 0x5e, 0x15, 0x5e, 0x03, 0xf9, 0x60, 0xdf, 0x27, 0x25, - 0x6d, 0x59, 0x3b, 0x55, 0xb4, 0xce, 0xbc, 0x6c, 0x55, 0xc6, 0xda, 0xad, 0x4a, 0xfe, 0xde, 0xbe, - 0x4f, 0xde, 0xb6, 0x2a, 0x27, 0x06, 0xb8, 0x09, 0x35, 0x92, 0x8e, 0xfa, 0x8b, 0x1c, 0x00, 0xc2, - 0x6a, 0x5b, 0x86, 0x86, 0x8f, 0xc1, 0x94, 0x38, 0x6e, 0x15, 0x07, 0x58, 0x62, 0x4e, 0x5f, 0x38, - 0x6f, 0xa4, 0x64, 0x27, 0x59, 0x1b, 0xfe, 0x9e, 0x23, 0x04, 0xdc, 0x10, 0xd6, 0x46, 0x73, 0xc5, - 0xf8, 0x6a, 0xe7, 0x09, 0xb1, 0x83, 0x75, 0x12, 0x60, 0x0b, 0xaa, 0x2c, 0x40, 0x2a, 0x43, 0x09, - 0x2a, 0xdc, 0x02, 0x79, 0xee, 0x13, 0xbb, 0x94, 0x93, 0xe8, 0xa6, 0x31, 0xe4, 0x2a, 0x8d, 0x34, - 0xb9, 0x6d, 0x9f, 0xd8, 0xd6, 0xb1, 0xf8, 0x88, 0xe2, 0x0f, 0x49, 0x28, 0xf8, 0x0d, 0x98, 0xe0, - 0x01, 0x0e, 0x42, 0x5e, 0x1a, 0x97, 0xa0, 0x2b, 0xef, 0x02, 0x2a, 0x1d, 0xad, 0x59, 0x05, 0x3b, - 0x11, 0xfd, 0x23, 0x05, 0xa8, 0xbf, 0xce, 0x81, 0x85, 0xd4, 0xf8, 0xba, 0xe7, 0x56, 0x69, 0x40, - 0x3d, 0x17, 0x5e, 0xc9, 0xf0, 0x7e, 0xb2, 0x8b, 0xf7, 0xc5, 0x3e, 0x2e, 0x29, 0xe7, 0xf0, 0x8b, - 0x24, 0xdf, 0x9c, 0x74, 0xff, 0x30, 0x1b, 0xfc, 0x6d, 0xab, 0x32, 0x97, 0xb8, 0x65, 0xf3, 0x81, - 0x4d, 0x00, 0xeb, 0x98, 0x07, 0xf7, 0x18, 0x76, 0x79, 0x04, 0x4b, 0x1b, 0x44, 0x1d, 0xfb, 0x93, - 0xd1, 0x6e, 0x4a, 0x78, 0x58, 0x4b, 0x2a, 0x24, 0x5c, 0xeb, 0x41, 0x43, 0x7d, 0x22, 0xc0, 0x8f, - 0xc1, 0x04, 0x23, 0x98, 0x7b, 0x6e, 0x29, 0x2f, 0x53, 0x4e, 0xf8, 0x42, 0x52, 0x8a, 0x94, 0x16, - 0x9e, 0x06, 0x93, 0x0d, 0xc2, 0x39, 0x76, 0x48, 0xa9, 0x20, 0x0d, 0xe7, 0x94, 0xe1, 0xe4, 0x7a, - 0x24, 0x46, 0xb1, 0x5e, 0xff, 0x4d, 0x03, 0xb3, 0x29, 0x4f, 0x6b, 0x94, 0x07, 0xf0, 0x51, 0x4f, - 0xf5, 0x19, 0xa3, 0x9d, 0x49, 0x78, 0xcb, 0xda, 0x9b, 0x57, 0xe1, 0xa6, 0x62, 0x49, 0x47, 0xe5, - 0x6d, 0x82, 0x02, 0x0d, 0x48, 0x43, 0xb0, 0x3e, 0x7e, 0x6a, 0xfa, 0xc2, 0x99, 0x77, 0xa8, 0x12, - 0x6b, 0x46, 0xe1, 0x16, 0x6e, 0x0b, 0x04, 0x14, 0x01, 0xe9, 0x7f, 0x8d, 0x77, 0x1e, 0x41, 0x54, - 0x24, 0xfc, 0x59, 0x03, 0x4b, 0x3e, 0xa3, 0x1e, 0xa3, 0xc1, 0xfe, 0x1a, 0x69, 0x92, 0xfa, 0x75, - 0xcf, 0xdd, 0xa5, 0x4e, 0xc8, 0xb0, 0xe0, 0x52, 0x9d, 0xea, 0xc6, 0xd0, 0xd0, 0x9b, 0x03, 0x21, - 0x10, 0xd9, 0x25, 0x8c, 0xb8, 0x36, 0xb1, 0x74, 0x95, 0xd3, 0xd2, 0x21, 0xc6, 0x87, 0xe4, 0x02, - 0xef, 0x00, 0xd8, 0xc0, 0x81, 0xe0, 0xd4, 0xd9, 0x64, 0xc4, 0x26, 0x55, 0x81, 0x2a, 0x4b, 0xb2, - 0x90, 0xd6, 0xc7, 0x7a, 0x8f, 0x05, 0xea, 0xe3, 0x05, 0x7f, 0xd2, 0xc0, 0x42, 0xb5, 0xf7, 0xa1, - 0x51, 0x95, 0x79, 0x79, 0x24, 0xaa, 0xfb, 0x3c, 0x54, 0xd6, 0x62, 0xbb, 0x55, 0x59, 0xe8, 0xa3, - 0x40, 0xfd, 0xa2, 0xc1, 0x6f, 0x41, 0x81, 0x85, 0x75, 0xc2, 0x4b, 0x79, 0x79, 0xc3, 0xc3, 0xc3, - 0x6e, 0x7a, 0x75, 0x6a, 0xef, 0x23, 0xe1, 0xf3, 0x35, 0x0d, 0x6a, 0xdb, 0xa1, 0x7c, 0xb1, 0x78, - 0x7a, 0xdd, 0x52, 0x85, 0x22, 0x54, 0xfd, 0x19, 0x98, 0xef, 0x7e, 0x38, 0x60, 0x0d, 0x00, 0x3b, - 0xee, 0x55, 0x5e, 0xd2, 0x64, 0xdc, 0x8b, 0xef, 0x50, 0x59, 0x49, 0xa3, 0xa7, 0xcf, 0x66, 0x22, - 0xe2, 0xa8, 0x03, 0x5b, 0x3f, 0x0f, 0x8e, 0xdd, 0x64, 0x5e, 0xe8, 0xab, 0x24, 0xe1, 0x32, 0xc8, - 0xbb, 0xb8, 0x11, 0x3f, 0x41, 0xc9, 0xbb, 0xb8, 0x81, 0x1b, 0x04, 0x49, 0x8d, 0xfe, 0x14, 0x1c, - 0xdf, 0x10, 0x05, 0xc3, 0xbd, 0x90, 0xd9, 0x24, 0x3d, 0x2b, 0xac, 0x80, 0x42, 0x93, 0xb0, 0x9d, - 0x28, 0xdf, 0xa2, 0x55, 0x14, 0x27, 0x7d, 0x20, 0x04, 0x28, 0x92, 0xc3, 0xab, 0x60, 0xce, 0x4d, - 0x3d, 0xef, 0xa3, 0x35, 0x5e, 0x9a, 0x90, 0xa6, 0x0b, 0xed, 0x56, 0x65, 0x6e, 0x23, 0xab, 0x42, - 0xdd, 0xb6, 0xfa, 0x41, 0x0e, 0x2c, 0x0e, 0xa0, 0x16, 0x3e, 0x00, 0x53, 0x5c, 0x7d, 0x2b, 0xba, - 0x4e, 0x0d, 0xa5, 0x4b, 0x39, 0xa7, 0xdd, 0x1d, 0xa3, 0xa1, 0x04, 0x0b, 0xfa, 0x60, 0x86, 0xa9, - 0x1c, 0x64, 0x50, 0xd5, 0xe5, 0x9f, 0x0e, 0x05, 0xef, 0xe5, 0xc7, 0x3a, 0xae, 0xe2, 0xcc, 0xa0, - 0x4e, 0x44, 0x94, 0x0d, 0x00, 0x9f, 0x81, 0xf9, 0x8e, 0x83, 0x47, 0x41, 0xc7, 0x65, 0xd0, 0x4b, - 0x43, 0x83, 0xf6, 0xbd, 0x17, 0xab, 0xa4, 0xe2, 0xce, 0x6f, 0x74, 0xe1, 0xa2, 0x9e, 0x48, 0xfa, - 0x1f, 0x39, 0x70, 0x48, 0xe3, 0xbf, 0x87, 0x41, 0x8e, 0x33, 0x83, 0xfc, 0xda, 0x11, 0x9e, 0xb4, - 0x81, 0x83, 0x9d, 0x76, 0x0d, 0xf6, 0xd5, 0xa3, 0x04, 0x39, 0x7c, 0xd0, 0xff, 0x9d, 0x03, 0x1f, - 0x0d, 0x76, 0x4e, 0x07, 0xff, 0xdd, 0xcc, 0xe0, 0xff, 0xbc, 0x6b, 0xf0, 0x9f, 0x1c, 0x01, 0xe2, - 0xbf, 0x45, 0xa0, 0x6b, 0x11, 0x78, 0xa3, 0x81, 0xf2, 0x60, 0xde, 0xde, 0xc3, 0x62, 0xf0, 0x38, - 0xbb, 0x18, 0x5c, 0x39, 0x42, 0x95, 0x0d, 0x58, 0x14, 0x6e, 0x1e, 0x56, 0x5c, 0xc9, 0x44, 0x1f, - 0xe1, 0x49, 0xff, 0xe5, 0x50, 0xae, 0xe4, 0x06, 0x72, 0x35, 0x53, 0xa1, 0xa7, 0xbb, 0x2a, 0xf4, - 0x83, 0x8c, 0xf7, 0x56, 0x48, 0x42, 0x42, 0x5d, 0xa7, 0xa3, 0x26, 0x1f, 0x81, 0xc9, 0xef, 0x42, - 0x12, 0x52, 0xd7, 0x51, 0x9d, 0xfd, 0xd9, 0x50, 0x3a, 0xb6, 0x22, 0xfb, 0x2c, 0x11, 0xd3, 0xe2, - 0xae, 0x95, 0x06, 0xc5, 0x90, 0xfa, 0x0b, 0x0d, 0x2c, 0x0f, 0xeb, 0x51, 0xf8, 0x7d, 0x9f, 0x99, - 0x7a, 0x94, 0x95, 0x69, 0xf4, 0x19, 0xfb, 0x3c, 0x07, 0xfe, 0xdf, 0xef, 0x34, 0xf0, 0x11, 0x28, - 0x61, 0xce, 0x43, 0x46, 0xaa, 0xd7, 0x3d, 0xd7, 0x0e, 0x99, 0xb8, 0xaf, 0xfd, 0xed, 0x1a, 0x66, - 0x84, 0x4b, 0xa2, 0x0b, 0xd6, 0xb2, 0x82, 0x2e, 0xad, 0x0e, 0xb0, 0x43, 0x03, 0x11, 0x44, 0x53, - 0x09, 0x82, 0x08, 0x57, 0xdb, 0x57, 0xd2, 0x54, 0xf2, 0x7e, 0x38, 0x52, 0x5a, 0x78, 0x16, 0x4c, - 0xd5, 0xb0, 0x5b, 0xdd, 0xa6, 0x3f, 0x44, 0xad, 0x5e, 0x48, 0xcb, 0xfa, 0x96, 0x92, 0xa3, 0xc4, - 0x02, 0xde, 0x00, 0xf3, 0xd2, 0x6f, 0x8d, 0xb8, 0x4e, 0x50, 0x5b, 0xa3, 0x0d, 0x1a, 0xc8, 0xa6, - 0x2d, 0xa4, 0x73, 0x66, 0xab, 0x4b, 0x8f, 0x7a, 0x3c, 0xf4, 0x5f, 0x35, 0x00, 0xff, 0xcd, 0x0a, - 0x71, 0x06, 0x14, 0xb1, 0x4f, 0xe5, 0xc6, 0x12, 0x35, 0x56, 0xd1, 0x9a, 0x69, 0xb7, 0x2a, 0xc5, - 0xd5, 0xcd, 0xdb, 0x91, 0x10, 0xa5, 0x7a, 0x61, 0x1c, 0xcf, 0xd6, 0x68, 0x86, 0x2a, 0xe3, 0x38, - 0x30, 0x47, 0xa9, 0x1e, 0x1a, 0x00, 0x88, 0x5e, 0xe0, 0x3e, 0xb6, 0xd5, 0xaa, 0x57, 0xb4, 0x66, - 0xc5, 0xa5, 0x6e, 0x24, 0x52, 0xd4, 0x61, 0xa1, 0x3f, 0x01, 0xc7, 0xb7, 0x09, 0x6b, 0x52, 0x9b, - 0xac, 0xda, 0xb6, 0x17, 0xba, 0x41, 0xbc, 0x41, 0x99, 0xa0, 0x98, 0x98, 0xa9, 0x76, 0xf9, 0x9f, - 0x62, 0xa6, 0x98, 0x60, 0xa1, 0xd4, 0x26, 0xe9, 0xcf, 0xdc, 0xc0, 0xfe, 0xfc, 0x3d, 0x07, 0x26, - 0x53, 0xf8, 0xfc, 0x1e, 0x75, 0xab, 0x0a, 0xf9, 0x44, 0x6c, 0x7d, 0x97, 0xba, 0xd5, 0xb7, 0xad, - 0xca, 0xb4, 0x32, 0x13, 0xbf, 0x48, 0x1a, 0xc2, 0x3b, 0x20, 0x1f, 0x72, 0xc2, 0x54, 0xdf, 0x9d, - 0x1d, 0x5a, 0xf1, 0xf7, 0x39, 0x61, 0xf1, 0x6a, 0x34, 0x25, 0xa0, 0x85, 0x00, 0x49, 0x0c, 0xb8, - 0x01, 0x0a, 0x8e, 0xe0, 0x56, 0x8d, 0x84, 0x73, 0x43, 0xc1, 0x3a, 0x77, 0xcb, 0xe8, 0x3a, 0xa5, - 0x04, 0x45, 0x30, 0x90, 0x81, 0x59, 0x9e, 0x21, 0x51, 0x96, 0xd2, 0x28, 0xab, 0x4e, 0x5f, 0xee, - 0x2d, 0xd8, 0x6e, 0x55, 0x66, 0xb3, 0x2a, 0xd4, 0x15, 0x41, 0x37, 0xc1, 0x74, 0xc7, 0x11, 0x87, - 0xbf, 0x8e, 0x96, 0xf1, 0xf2, 0xa0, 0x3c, 0xf6, 0xea, 0xa0, 0x3c, 0xf6, 0xfa, 0xa0, 0x3c, 0xf6, - 0x63, 0xbb, 0xac, 0xbd, 0x6c, 0x97, 0xb5, 0x57, 0xed, 0xb2, 0xf6, 0xba, 0x5d, 0xd6, 0xde, 0xb4, - 0xcb, 0xda, 0xf3, 0x3f, 0xcb, 0x63, 0x0f, 0xa7, 0xe2, 0xd4, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x94, 0x08, 0x88, 0x43, 0x92, 0x12, 0x00, 0x00, + // 1424 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x36, 0x65, 0xc9, 0x96, 0xd6, 0xbf, 0x5d, 0x27, 0xb0, 0xea, 0x00, 0x92, 0xcb, 0x02, 0x4d, + 0xd2, 0x24, 0x64, 0x9c, 0xa6, 0x69, 0x8a, 0x20, 0x08, 0x4c, 0x07, 0xcd, 0x9f, 0xed, 0xda, 0xab, + 0x24, 0x45, 0x83, 0x14, 0x08, 0x4d, 0xad, 0xa9, 0x8d, 0x25, 0x92, 0xdd, 0x25, 0x95, 0xba, 0xc8, + 0xa1, 0x40, 0x5f, 0x20, 0x0f, 0x90, 0x07, 0xe8, 0x4b, 0x14, 0xe8, 0x31, 0x28, 0x7a, 0xc8, 0x31, + 0x27, 0x21, 0x56, 0xaf, 0x7d, 0x80, 0x36, 0xa7, 0x62, 0x97, 0x4b, 0x52, 0xd4, 0x8f, 0x25, 0xd7, + 0x40, 0x4e, 0xbd, 0x91, 0x33, 0xf3, 0x7d, 0x33, 0x3b, 0x3b, 0xb3, 0x33, 0xe0, 0xf6, 0xde, 0x55, + 0xa6, 0x11, 0x57, 0xdf, 0x0b, 0x76, 0x30, 0x75, 0xb0, 0x8f, 0x99, 0xde, 0xc4, 0x4e, 0xd5, 0xa5, + 0xba, 0x54, 0x98, 0x1e, 0xd1, 0x77, 0xeb, 0xee, 0x33, 0xcb, 0x75, 0x7c, 0xea, 0xd6, 0xf5, 0xe6, + 0x8a, 0x59, 0xf7, 0x6a, 0xe6, 0x8a, 0x6e, 0x63, 0x07, 0x53, 0xd3, 0xc7, 0x55, 0xcd, 0xa3, 0xae, + 0xef, 0xc2, 0x72, 0x08, 0xd0, 0x4c, 0x8f, 0x68, 0x1d, 0x00, 0x2d, 0x02, 0x2c, 0x5d, 0xb0, 0x89, + 0x5f, 0x0b, 0x76, 0x34, 0xcb, 0x6d, 0xe8, 0xb6, 0x6b, 0xbb, 0xba, 0xc0, 0xed, 0x04, 0xbb, 0xe2, + 0x4f, 0xfc, 0x88, 0xaf, 0x90, 0x6f, 0xe9, 0x72, 0x12, 0x40, 0xc3, 0xb4, 0x6a, 0xc4, 0xc1, 0x74, + 0x5f, 0xf7, 0xf6, 0x6c, 0x2e, 0x60, 0x7a, 0x03, 0xfb, 0xa6, 0xde, 0xec, 0x89, 0x62, 0x49, 0x1f, + 0x84, 0xa2, 0x81, 0xe3, 0x93, 0x06, 0xee, 0x01, 0x5c, 0x19, 0x06, 0x60, 0x56, 0x0d, 0x37, 0xcc, + 0x6e, 0x9c, 0xfa, 0x08, 0x2c, 0x7e, 0x55, 0x77, 0x9f, 0xdd, 0x24, 0xcc, 0x27, 0x8e, 0x1d, 0x10, + 0x56, 0xc3, 0x74, 0x03, 0xfb, 0x35, 0xb7, 0x0a, 0x6f, 0x80, 0xac, 0xbf, 0xef, 0xe1, 0xa2, 0xb2, + 0xac, 0x9c, 0x29, 0x18, 0xe7, 0x5e, 0xb5, 0xca, 0x63, 0xed, 0x56, 0x39, 0x7b, 0x7f, 0xdf, 0xc3, + 0xef, 0x5a, 0xe5, 0x53, 0x03, 0x60, 0x5c, 0x8d, 0x04, 0x50, 0x7d, 0x99, 0x01, 0x80, 0x5b, 0x55, + 0x84, 0x6b, 0xf8, 0x04, 0xe4, 0xf9, 0x71, 0xab, 0xa6, 0x6f, 0x0a, 0xce, 0xa9, 0x4b, 0x17, 0xb5, + 0x24, 0xd9, 0x71, 0xd4, 0x9a, 0xb7, 0x67, 0x73, 0x01, 0xd3, 0xb8, 0xb5, 0xd6, 0x5c, 0xd1, 0xbe, + 0xde, 0x79, 0x8a, 0x2d, 0x7f, 0x03, 0xfb, 0xa6, 0x01, 0x65, 0x14, 0x20, 0x91, 0xa1, 0x98, 0x15, + 0x6e, 0x83, 0x2c, 0xf3, 0xb0, 0x55, 0xcc, 0x08, 0x76, 0x5d, 0x1b, 0x72, 0x95, 0x5a, 0x12, 0x5c, + 0xc5, 0xc3, 0x96, 0x31, 0x1d, 0x1d, 0x91, 0xff, 0x21, 0x41, 0x05, 0xbf, 0x05, 0x13, 0xcc, 0x37, + 0xfd, 0x80, 0x15, 0xc7, 0x05, 0xe9, 0xca, 0x51, 0x48, 0x05, 0xd0, 0x98, 0x95, 0xb4, 0x13, 0xe1, + 0x3f, 0x92, 0x84, 0xea, 0x9b, 0x0c, 0x58, 0x48, 0x8c, 0xd7, 0x5c, 0xa7, 0x4a, 0x7c, 0xe2, 0x3a, + 0xf0, 0x5a, 0x2a, 0xef, 0xa7, 0xbb, 0xf2, 0xbe, 0xd8, 0x07, 0x92, 0xe4, 0x1c, 0x7e, 0x19, 0xc7, + 0x9b, 0x11, 0xf0, 0x8f, 0xd2, 0xce, 0xdf, 0xb5, 0xca, 0x73, 0x31, 0x2c, 0x1d, 0x0f, 0x6c, 0x02, + 0x58, 0x37, 0x99, 0x7f, 0x9f, 0x9a, 0x0e, 0x0b, 0x69, 0x49, 0x03, 0xcb, 0x63, 0x7f, 0x3a, 0xda, + 0x4d, 0x71, 0x84, 0xb1, 0x24, 0x5d, 0xc2, 0xf5, 0x1e, 0x36, 0xd4, 0xc7, 0x03, 0xfc, 0x04, 0x4c, + 0x50, 0x6c, 0x32, 0xd7, 0x29, 0x66, 0x45, 0xc8, 0x71, 0xbe, 0x90, 0x90, 0x22, 0xa9, 0x85, 0x67, + 0xc1, 0x64, 0x03, 0x33, 0x66, 0xda, 0xb8, 0x98, 0x13, 0x86, 0x73, 0xd2, 0x70, 0x72, 0x23, 0x14, + 0xa3, 0x48, 0xaf, 0xfe, 0xa6, 0x80, 0xd9, 0x24, 0x4f, 0xeb, 0x84, 0xf9, 0xf0, 0x71, 0x4f, 0xf5, + 0x69, 0xa3, 0x9d, 0x89, 0xa3, 0x45, 0xed, 0xcd, 0x4b, 0x77, 0xf9, 0x48, 0xd2, 0x51, 0x79, 0x5b, + 0x20, 0x47, 0x7c, 0xdc, 0xe0, 0x59, 0x1f, 0x3f, 0x33, 0x75, 0xe9, 0xdc, 0x11, 0xaa, 0xc4, 0x98, + 0x91, 0xbc, 0xb9, 0x3b, 0x9c, 0x01, 0x85, 0x44, 0xea, 0x5f, 0xe3, 0x9d, 0x47, 0xe0, 0x15, 0x09, + 0x7f, 0x51, 0xc0, 0x92, 0x47, 0x89, 0x4b, 0x89, 0xbf, 0xbf, 0x8e, 0x9b, 0xb8, 0xbe, 0xe6, 0x3a, + 0xbb, 0xc4, 0x0e, 0xa8, 0xc9, 0x73, 0x29, 0x4f, 0x75, 0x73, 0xa8, 0xeb, 0xad, 0x81, 0x14, 0x08, + 0xef, 0x62, 0x8a, 0x1d, 0x0b, 0x1b, 0xaa, 0x8c, 0x69, 0xe9, 0x10, 0xe3, 0x43, 0x62, 0x81, 0x77, + 0x01, 0x6c, 0x98, 0x3e, 0xcf, 0xa9, 0xbd, 0x45, 0xb1, 0x85, 0xab, 0x9c, 0x55, 0x94, 0x64, 0x2e, + 0xa9, 0x8f, 0x8d, 0x1e, 0x0b, 0xd4, 0x07, 0x05, 0x7f, 0x56, 0xc0, 0x42, 0xb5, 0xf7, 0xa1, 0x91, + 0x95, 0x79, 0x75, 0xa4, 0x54, 0xf7, 0x79, 0xa8, 0x8c, 0xc5, 0x76, 0xab, 0xbc, 0xd0, 0x47, 0x81, + 0xfa, 0x79, 0x83, 0xdf, 0x81, 0x1c, 0x0d, 0xea, 0x98, 0x15, 0xb3, 0xe2, 0x86, 0x87, 0xbb, 0xdd, + 0x72, 0xeb, 0xc4, 0xda, 0x47, 0x1c, 0xf3, 0x0d, 0xf1, 0x6b, 0x95, 0x40, 0xbc, 0x58, 0x2c, 0xb9, + 0x6e, 0xa1, 0x42, 0x21, 0xab, 0xfa, 0x1c, 0xcc, 0x77, 0x3f, 0x1c, 0xb0, 0x06, 0x80, 0x15, 0xf5, + 0x2a, 0x2b, 0x2a, 0xc2, 0xef, 0xe5, 0x23, 0x54, 0x56, 0xdc, 0xe8, 0xc9, 0xb3, 0x19, 0x8b, 0x18, + 0xea, 0xe0, 0x56, 0x2f, 0x82, 0xe9, 0x5b, 0xd4, 0x0d, 0x3c, 0x19, 0x24, 0x5c, 0x06, 0x59, 0xc7, + 0x6c, 0x44, 0x4f, 0x50, 0xfc, 0x2e, 0x6e, 0x9a, 0x0d, 0x8c, 0x84, 0x46, 0x7d, 0x06, 0x4e, 0x6e, + 0xf2, 0x82, 0x61, 0x6e, 0x40, 0x2d, 0x9c, 0x9c, 0x15, 0x96, 0x41, 0xae, 0x89, 0xe9, 0x4e, 0x18, + 0x6f, 0xc1, 0x28, 0xf0, 0x93, 0x3e, 0xe4, 0x02, 0x14, 0xca, 0xe1, 0x75, 0x30, 0xe7, 0x24, 0xc8, + 0x07, 0x68, 0x9d, 0x15, 0x27, 0x84, 0xe9, 0x42, 0xbb, 0x55, 0x9e, 0xdb, 0x4c, 0xab, 0x50, 0xb7, + 0xad, 0x7a, 0x90, 0x01, 0x8b, 0x03, 0x52, 0x0b, 0x1f, 0x82, 0x3c, 0x93, 0xdf, 0x32, 0x5d, 0x67, + 0x86, 0xa6, 0x4b, 0x82, 0x93, 0xee, 0x8e, 0xd8, 0x50, 0xcc, 0x05, 0x3d, 0x30, 0x43, 0x65, 0x0c, + 0xc2, 0xa9, 0xec, 0xf2, 0xcf, 0x86, 0x92, 0xf7, 0xe6, 0xc7, 0x38, 0x29, 0xfd, 0xcc, 0xa0, 0x4e, + 0x46, 0x94, 0x76, 0x00, 0x9f, 0x83, 0xf9, 0x8e, 0x83, 0x87, 0x4e, 0xc7, 0x85, 0xd3, 0x2b, 0x43, + 0x9d, 0xf6, 0xbd, 0x17, 0xa3, 0x28, 0xfd, 0xce, 0x6f, 0x76, 0xf1, 0xa2, 0x1e, 0x4f, 0xea, 0x1f, + 0x19, 0x70, 0x48, 0xe3, 0xbf, 0x87, 0x41, 0x6e, 0xa6, 0x06, 0xf9, 0x8d, 0x63, 0x3c, 0x69, 0x03, + 0x07, 0x3b, 0xe9, 0x1a, 0xec, 0xab, 0xc7, 0x71, 0x72, 0xf8, 0xa0, 0xff, 0x3b, 0x03, 0x3e, 0x1e, + 0x0c, 0x4e, 0x06, 0xff, 0xbd, 0xd4, 0xe0, 0xff, 0xa2, 0x6b, 0xf0, 0x9f, 0x1e, 0x81, 0xe2, 0xff, + 0x45, 0xa0, 0x6b, 0x11, 0x78, 0xab, 0x80, 0xd2, 0xe0, 0xbc, 0xbd, 0x87, 0xc5, 0xe0, 0x49, 0x7a, + 0x31, 0xb8, 0x76, 0x8c, 0x2a, 0x1b, 0xb0, 0x28, 0xdc, 0x3a, 0xac, 0xb8, 0xe2, 0x89, 0x3e, 0xc2, + 0x93, 0xfe, 0xeb, 0xa1, 0xb9, 0x12, 0x1b, 0xc8, 0xf5, 0x54, 0x85, 0x9e, 0xed, 0xaa, 0xd0, 0x0f, + 0x53, 0xe8, 0xed, 0x00, 0x07, 0x98, 0x38, 0x76, 0x47, 0x4d, 0x3e, 0x06, 0x93, 0xdf, 0x07, 0x38, + 0x20, 0x8e, 0x2d, 0x3b, 0xfb, 0xf3, 0xa1, 0xe9, 0xd8, 0x0e, 0xed, 0xd3, 0x89, 0x98, 0xe2, 0x77, + 0x2d, 0x35, 0x28, 0xa2, 0x54, 0x5f, 0x2a, 0x60, 0x79, 0x58, 0x8f, 0xc2, 0x1f, 0xfa, 0xcc, 0xd4, + 0xe3, 0xac, 0x4c, 0xa3, 0xcf, 0xd8, 0x17, 0x19, 0x70, 0xa2, 0xdf, 0x69, 0xe0, 0x63, 0x50, 0x34, + 0x19, 0x0b, 0x28, 0xae, 0xae, 0xb9, 0x8e, 0x15, 0x50, 0x7e, 0x5f, 0xfb, 0x95, 0x9a, 0x49, 0x31, + 0x13, 0x89, 0xce, 0x19, 0xcb, 0x92, 0xba, 0xb8, 0x3a, 0xc0, 0x0e, 0x0d, 0x64, 0xe0, 0x4d, 0xc5, + 0x13, 0x84, 0x99, 0xdc, 0xbe, 0xe2, 0xa6, 0x12, 0xf7, 0xc3, 0x90, 0xd4, 0xc2, 0xf3, 0x20, 0x5f, + 0x33, 0x9d, 0x6a, 0x85, 0xfc, 0x18, 0xb6, 0x7a, 0x2e, 0x29, 0xeb, 0xdb, 0x52, 0x8e, 0x62, 0x0b, + 0x78, 0x13, 0xcc, 0x0b, 0xdc, 0x3a, 0x76, 0x6c, 0xbf, 0xb6, 0x4e, 0x1a, 0xc4, 0x17, 0x4d, 0x9b, + 0x4b, 0xe6, 0xcc, 0x76, 0x97, 0x1e, 0xf5, 0x20, 0xd4, 0x7f, 0x14, 0x00, 0xff, 0xcb, 0x0a, 0x71, + 0x0e, 0x14, 0x4c, 0x8f, 0x88, 0x8d, 0x25, 0x6c, 0xac, 0x82, 0x31, 0xd3, 0x6e, 0x95, 0x0b, 0xab, + 0x5b, 0x77, 0x42, 0x21, 0x4a, 0xf4, 0xdc, 0x38, 0x9a, 0xad, 0xe1, 0x0c, 0x95, 0xc6, 0x91, 0x63, + 0x86, 0x12, 0x3d, 0xbc, 0x0a, 0xa6, 0xad, 0x7a, 0xc0, 0x7c, 0x4c, 0x2b, 0x96, 0xeb, 0x61, 0x71, + 0xa6, 0xbc, 0x71, 0x42, 0x9e, 0x69, 0x7a, 0xad, 0x43, 0x87, 0x52, 0x96, 0x50, 0x03, 0x80, 0x77, + 0x11, 0xf3, 0x4c, 0xee, 0x27, 0x27, 0xfc, 0xcc, 0xf2, 0x72, 0xd8, 0x8c, 0xa5, 0xa8, 0xc3, 0x42, + 0x7d, 0x0a, 0x4e, 0x56, 0x30, 0x6d, 0x12, 0x0b, 0xaf, 0x5a, 0x96, 0x1b, 0x38, 0x7e, 0xb4, 0x7b, + 0xe9, 0xa0, 0x10, 0x9b, 0xc9, 0x46, 0xfb, 0x40, 0xfa, 0x2f, 0xc4, 0x5c, 0x28, 0xb1, 0x89, 0x3b, + 0x3b, 0x33, 0xb0, 0xb3, 0x7f, 0xcf, 0x80, 0xc9, 0x84, 0x3e, 0xbb, 0x47, 0x9c, 0xaa, 0x64, 0x3e, + 0x15, 0x59, 0xdf, 0x23, 0x4e, 0xf5, 0x5d, 0xab, 0x3c, 0x25, 0xcd, 0xf8, 0x2f, 0x12, 0x86, 0xf0, + 0x2e, 0xc8, 0x06, 0x0c, 0x53, 0xd9, 0xb1, 0xe7, 0x87, 0xf6, 0xca, 0x03, 0x86, 0x69, 0xb4, 0x54, + 0xe5, 0x39, 0x35, 0x17, 0x20, 0xc1, 0x01, 0x37, 0x41, 0xce, 0xe6, 0xb7, 0x22, 0x87, 0xc9, 0x85, + 0xa1, 0x64, 0x9d, 0x5b, 0x69, 0x58, 0x08, 0x42, 0x82, 0x42, 0x1a, 0x48, 0xc1, 0x2c, 0x4b, 0x25, + 0x51, 0x5c, 0xd8, 0x28, 0x4b, 0x52, 0xdf, 0xdc, 0x1b, 0xb0, 0xdd, 0x2a, 0xcf, 0xa6, 0x55, 0xa8, + 0xcb, 0x83, 0xaa, 0x83, 0xa9, 0x8e, 0x23, 0x0e, 0x7f, 0x57, 0x0d, 0xed, 0xd5, 0x41, 0x69, 0xec, + 0xf5, 0x41, 0x69, 0xec, 0xcd, 0x41, 0x69, 0xec, 0xa7, 0x76, 0x49, 0x79, 0xd5, 0x2e, 0x29, 0xaf, + 0xdb, 0x25, 0xe5, 0x4d, 0xbb, 0xa4, 0xbc, 0x6d, 0x97, 0x94, 0x17, 0x7f, 0x96, 0xc6, 0x1e, 0xe5, + 0xa3, 0xd0, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xc8, 0x30, 0xbf, 0xcc, 0x12, 0x00, 0x00, } func (m *FlowDistinguisherMethod) Marshal() (dAtA []byte, err error) { @@ -1586,9 +1587,17 @@ func (m *ResourcePolicyRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Namespaces[iNdEx]) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Namespaces[iNdEx]))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } } + i-- + if m.ClusterScope { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x20 if len(m.Resources) > 0 { for iNdEx := len(m.Resources) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Resources[iNdEx]) @@ -2068,6 +2077,7 @@ func (m *ResourcePolicyRule) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } + n += 2 if len(m.Namespaces) > 0 { for _, s := range m.Namespaces { l = len(s) @@ -2383,6 +2393,7 @@ func (this *ResourcePolicyRule) String() string { `Verbs:` + fmt.Sprintf("%v", this.Verbs) + `,`, `APIGroups:` + fmt.Sprintf("%v", this.APIGroups) + `,`, `Resources:` + fmt.Sprintf("%v", this.Resources) + `,`, + `ClusterScope:` + fmt.Sprintf("%v", this.ClusterScope) + `,`, `Namespaces:` + fmt.Sprintf("%v", this.Namespaces) + `,`, `}`, }, "") @@ -4861,6 +4872,26 @@ func (m *ResourcePolicyRule) Unmarshal(dAtA []byte) error { m.Resources = append(m.Resources, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ClusterScope", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.ClusterScope = bool(v != 0) + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Namespaces", wireType) } diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto index 3bd427f1960..6134b5e6999 100644 --- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto +++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto @@ -377,31 +377,25 @@ message ResourcePolicyRule { // +listType=set repeated string resources = 3; + // `clusterScope` indicates whether to match requests that do not + // specify a namespace (which happens either because the resource + // is not namespaced or the request targets all namespaces). + // If this field is omitted or false then the `namespaces` field + // must contain a non-empty list. + // +optional + optional bool clusterScope = 4; + // `namespaces` is a list of target namespaces that restricts - // matches. A request that does not specify a target namespace - // (which happens both when the resource is not namespaced and - // when the resource is namespaced and the request is for all - // namespaces) matches only if this list includes "Cluster Scope" - // (this string is not a valid namespace and thus can not be - // confused with an actual namespace). A request that specifies a - // target namespace matches only if either (a) this list contains - // that target namespace or (b) this list contains "*". - // - // This list may not be omitted or empty. If the list contains - // "*" then the only other allowed member is "Cluster Scope". - // Without "*", it is allowed to list "Cluster Scope" along with - // particular namespaces. - // - // Requests will match only if the values in this list are - // appropriate for the resource(s) involved. For example: for a - // cluster scoped resource (i.e., one not namespaced) a request - // can match only if this list contains "Cluster Scope". It is - // entirely up to the client to populate this list with - // appropriate values; the server-performed validation does not - // (at least in this alpha) address this issue. - // + // matches. A request that specifies a target namespace matches + // only if either (a) this list contains that target namespace or + // (b) this list contains "*". Note that "*" matches any + // specified namespace but does not match a request that _does + // not specify_ a namespace (see the `clusterScope` field for + // that). + // This list may be empty, but only if `clusterScope` is true. + // +optional // +listType=set - repeated string namespaces = 4; + repeated string namespaces = 5; } // ServiceAccountSubject holds detailed information for service-account-kind subject. diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go index 136d1cf70d4..41073bdcb14 100644 --- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go +++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go @@ -28,7 +28,7 @@ const ( NonResourceAll = "*" NameAll = "*" - NamespaceEvery = "*" // matches every particular namespace + NamespaceEvery = "*" // matches every particular namespace ) // System preset priority level names @@ -246,7 +246,7 @@ type ResourcePolicyRule struct { // must contain a non-empty list. // +optional ClusterScope bool `json:"clusterScope,omitempty" protobuf:"varint,4,opt,name=clusterScope"` - + // `namespaces` is a list of target namespaces that restricts // matches. A request that specifies a target namespace matches // only if either (a) this list contains that target namespace or diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go index 403cdc24400..08380a1b1c0 100644 --- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go @@ -215,11 +215,12 @@ func (QueuingConfiguration) SwaggerDoc() map[string]string { } var map_ResourcePolicyRule = map[string]string{ - "": "ResourcePolicyRule is a predicate that matches some resource requests, testing the request's verb and the target resource. A ResourcePolicyRule matches a resource request if and only if: (a) at least one member of verbs matches the request, (b) at least one member of apiGroups matches the request, (c) at least one member of resources matches the request, and (d) least one member of namespaces matches the request.", - "verbs": "`verbs` is a list of matching verbs and may not be empty. \"*\" matches all verbs and, if present, must be the only entry. Required.", - "apiGroups": "`apiGroups` is a list of matching API groups and may not be empty. \"*\" matches all API groups and, if present, must be the only entry. Required.", - "resources": "`resources` is a list of matching resources (i.e., lowercase and plural) with, if desired, subresource. For example, [ \"services\", \"nodes/status\" ]. This list may not be empty. \"*\" matches all resources and, if present, must be the only entry. Required.", - "namespaces": "`namespaces` is a list of target namespaces that restricts matches. A request that does not specify a target namespace (which happens both when the resource is not namespaced and when the resource is namespaced and the request is for all namespaces) matches only if this list includes \"Cluster Scope\" (this string is not a valid namespace and thus can not be confused with an actual namespace). A request that specifies a target namespace matches only if either (a) this list contains that target namespace or (b) this list contains \"*\".\n\nThis list may not be omitted or empty. If the list contains \"*\" then the only other allowed member is \"Cluster Scope\". Without \"*\", it is allowed to list \"Cluster Scope\" along with particular namespaces.\n\nRequests will match only if the values in this list are appropriate for the resource(s) involved. For example: for a cluster scoped resource (i.e., one not namespaced) a request can match only if this list contains \"Cluster Scope\". It is entirely up to the client to populate this list with appropriate values; the server-performed validation does not (at least in this alpha) address this issue.", + "": "ResourcePolicyRule is a predicate that matches some resource requests, testing the request's verb and the target resource. A ResourcePolicyRule matches a resource request if and only if: (a) at least one member of verbs matches the request, (b) at least one member of apiGroups matches the request, (c) at least one member of resources matches the request, and (d) least one member of namespaces matches the request.", + "verbs": "`verbs` is a list of matching verbs and may not be empty. \"*\" matches all verbs and, if present, must be the only entry. Required.", + "apiGroups": "`apiGroups` is a list of matching API groups and may not be empty. \"*\" matches all API groups and, if present, must be the only entry. Required.", + "resources": "`resources` is a list of matching resources (i.e., lowercase and plural) with, if desired, subresource. For example, [ \"services\", \"nodes/status\" ]. This list may not be empty. \"*\" matches all resources and, if present, must be the only entry. Required.", + "clusterScope": "`clusterScope` indicates whether to match requests that do not specify a namespace (which happens either because the resource is not namespaced or the request targets all namespaces). If this field is omitted or false then the `namespaces` field must contain a non-empty list.", + "namespaces": "`namespaces` is a list of target namespaces that restricts matches. A request that specifies a target namespace matches only if either (a) this list contains that target namespace or (b) this list contains \"*\". Note that \"*\" matches any specified namespace but does not match a request that _does not specify_ a namespace (see the `clusterScope` field for that). This list may be empty, but only if `clusterScope` is true.", } func (ResourcePolicyRule) SwaggerDoc() map[string]string {