From 1475b59c83acb538632a21edc44fbd7ce3ac500c Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Wed, 31 Jul 2019 16:06:42 -0700 Subject: [PATCH] Update generated --- .../apiextensions_violation_exceptions.list | 2 + .../codegen_violation_exceptions.list | 2 + ...sample_apiserver_violation_exceptions.list | 2 + api/api-rules/violation_exceptions.list | 2 + api/openapi-spec/swagger.json | 2 +- go.sum | 4 +- .../src/k8s.io/apiextensions-apiserver/go.sum | 4 +- .../generated/openapi/zz_generated.openapi.go | 14 +- .../apimachinery/pkg/apis/meta/v1/BUILD | 1 + .../pkg/apis/meta/v1/generated.pb.go | 1004 +++++++++-------- .../pkg/apis/meta/v1/generated.proto | 40 +- .../meta/v1/types_swagger_doc_generated.go | 2 +- .../pkg/apis/meta/v1/zz_generated.deepcopy.go | 38 +- staging/src/k8s.io/apiserver/go.mod | 2 +- staging/src/k8s.io/apiserver/go.sum | 4 +- .../apiserver/openapi/zz_generated.openapi.go | 14 +- staging/src/k8s.io/kube-aggregator/go.sum | 4 +- .../src/k8s.io/legacy-cloud-providers/go.sum | 2 +- staging/src/k8s.io/sample-apiserver/go.sum | 4 +- .../generated/openapi/zz_generated.openapi.go | 14 +- 20 files changed, 661 insertions(+), 500 deletions(-) diff --git a/api/api-rules/apiextensions_violation_exceptions.list b/api/api-rules/apiextensions_violation_exceptions.list index a64b074c158..4916ad72d07 100644 --- a/api/api-rules/apiextensions_violation_exceptions.list +++ b/api/api-rules/apiextensions_violation_exceptions.list @@ -9,6 +9,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items @@ -17,6 +18,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions diff --git a/api/api-rules/codegen_violation_exceptions.list b/api/api-rules/codegen_violation_exceptions.list index 0238a01bbf8..706941307e7 100644 --- a/api/api-rules/codegen_violation_exceptions.list +++ b/api/api-rules/codegen_violation_exceptions.list @@ -8,6 +8,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items @@ -16,6 +17,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions diff --git a/api/api-rules/sample_apiserver_violation_exceptions.list b/api/api-rules/sample_apiserver_violation_exceptions.list index 85693a206a3..5ba84d7d44e 100644 --- a/api/api-rules/sample_apiserver_violation_exceptions.list +++ b/api/api-rules/sample_apiserver_violation_exceptions.list @@ -8,6 +8,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items @@ -16,6 +17,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index f55882430b1..1893a6e1b59 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -381,6 +381,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items @@ -389,6 +390,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun +API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 566f6614c7f..e6f70518a35 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -18176,7 +18176,7 @@ ] }, "io.k8s.apimachinery.pkg.apis.meta.v1.Fields": { - "description": "Fields stores a set of fields in a data structure like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff", + "description": "Fields stores a set of fields in a data structure like a Trie.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff", "type": "object" }, "io.k8s.apimachinery.pkg.apis.meta.v1.GroupVersionForDiscovery": { diff --git a/go.sum b/go.sum index 7dbd9b25002..d44b3c5a1ab 100644 --- a/go.sum +++ b/go.sum @@ -486,8 +486,8 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3 h1:yCY9zAYErawYwXdOYmwEBzcGCr/6eIUujYZE2DIQve8= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648 h1:qukMPS/1fDG5pToYLYSEx5IpwHVJMtTyOMaIIsR2Fas= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc= diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.sum b/staging/src/k8s.io/apiextensions-apiserver/go.sum index 24e8348430f..3cb30269cf3 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.sum +++ b/staging/src/k8s.io/apiextensions-apiserver/go.sum @@ -312,7 +312,7 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3 h1:yCY9zAYErawYwXdOYmwEBzcGCr/6eIUujYZE2DIQve8= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648 h1:qukMPS/1fDG5pToYLYSEx5IpwHVJMtTyOMaIIsR2Fas= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go index 29f71ecb85b..7559d6828a0 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go @@ -81,6 +81,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ProtoFields": schema_pkg_apis_meta_v1_ProtoFields(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), @@ -1384,7 +1385,7 @@ func schema_pkg_apis_meta_v1_Fields(ref common.ReferenceCallback) common.OpenAPI return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "Fields stores a set of fields in a data structure like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff", + Description: "Fields stores a set of fields in a data structure like a Trie.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff", Type: []string{"object"}, }, }, @@ -2351,6 +2352,17 @@ func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common. } } +func schema_pkg_apis_meta_v1_ProtoFields(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ProtoFields is a struct that is equivalent to Fields, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Fields. Do not use in Go structs.", + Type: []string{"object"}, + }, + }, + } +} + func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD index 119e5d166ec..92d0279e8e6 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD @@ -41,6 +41,7 @@ go_library( "deepcopy.go", "doc.go", "duration.go", + "fields_proto.go", "generated.pb.go", "group_version.go", "helpers.go", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go index 83b6c4a807f..f03ded7a4e7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go @@ -307,21 +307,16 @@ func (*Fields) Descriptor() ([]byte, []int) { return fileDescriptor_cf52fa777ced5367, []int{9} } func (m *Fields) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) + return xxx_messageInfo_Fields.Unmarshal(m, b) } func (m *Fields) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil + return xxx_messageInfo_Fields.Marshal(b, m, deterministic) } func (m *Fields) XXX_Merge(src proto.Message) { xxx_messageInfo_Fields.Merge(m, src) } func (m *Fields) XXX_Size() int { - return m.Size() + return xxx_messageInfo_Fields.Size(m) } func (m *Fields) XXX_DiscardUnknown() { xxx_messageInfo_Fields.DiscardUnknown(m) @@ -912,10 +907,38 @@ func (m *Preconditions) XXX_DiscardUnknown() { var xxx_messageInfo_Preconditions proto.InternalMessageInfo +func (m *ProtoFields) Reset() { *m = ProtoFields{} } +func (*ProtoFields) ProtoMessage() {} +func (*ProtoFields) Descriptor() ([]byte, []int) { + return fileDescriptor_cf52fa777ced5367, []int{31} +} +func (m *ProtoFields) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ProtoFields) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *ProtoFields) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProtoFields.Merge(m, src) +} +func (m *ProtoFields) XXX_Size() int { + return m.Size() +} +func (m *ProtoFields) XXX_DiscardUnknown() { + xxx_messageInfo_ProtoFields.DiscardUnknown(m) +} + +var xxx_messageInfo_ProtoFields proto.InternalMessageInfo + func (m *RootPaths) Reset() { *m = RootPaths{} } func (*RootPaths) ProtoMessage() {} func (*RootPaths) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{31} + return fileDescriptor_cf52fa777ced5367, []int{32} } func (m *RootPaths) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -943,7 +966,7 @@ var xxx_messageInfo_RootPaths proto.InternalMessageInfo func (m *ServerAddressByClientCIDR) Reset() { *m = ServerAddressByClientCIDR{} } func (*ServerAddressByClientCIDR) ProtoMessage() {} func (*ServerAddressByClientCIDR) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{32} + return fileDescriptor_cf52fa777ced5367, []int{33} } func (m *ServerAddressByClientCIDR) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -971,7 +994,7 @@ var xxx_messageInfo_ServerAddressByClientCIDR proto.InternalMessageInfo func (m *Status) Reset() { *m = Status{} } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{33} + return fileDescriptor_cf52fa777ced5367, []int{34} } func (m *Status) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -999,7 +1022,7 @@ var xxx_messageInfo_Status proto.InternalMessageInfo func (m *StatusCause) Reset() { *m = StatusCause{} } func (*StatusCause) ProtoMessage() {} func (*StatusCause) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{34} + return fileDescriptor_cf52fa777ced5367, []int{35} } func (m *StatusCause) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1027,7 +1050,7 @@ var xxx_messageInfo_StatusCause proto.InternalMessageInfo func (m *StatusDetails) Reset() { *m = StatusDetails{} } func (*StatusDetails) ProtoMessage() {} func (*StatusDetails) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{35} + return fileDescriptor_cf52fa777ced5367, []int{36} } func (m *StatusDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1055,7 +1078,7 @@ var xxx_messageInfo_StatusDetails proto.InternalMessageInfo func (m *TableOptions) Reset() { *m = TableOptions{} } func (*TableOptions) ProtoMessage() {} func (*TableOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{36} + return fileDescriptor_cf52fa777ced5367, []int{37} } func (m *TableOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1083,7 +1106,7 @@ var xxx_messageInfo_TableOptions proto.InternalMessageInfo func (m *Time) Reset() { *m = Time{} } func (*Time) ProtoMessage() {} func (*Time) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{37} + return fileDescriptor_cf52fa777ced5367, []int{38} } func (m *Time) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Time.Unmarshal(m, b) @@ -1106,7 +1129,7 @@ var xxx_messageInfo_Time proto.InternalMessageInfo func (m *Timestamp) Reset() { *m = Timestamp{} } func (*Timestamp) ProtoMessage() {} func (*Timestamp) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{38} + return fileDescriptor_cf52fa777ced5367, []int{39} } func (m *Timestamp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1134,7 +1157,7 @@ var xxx_messageInfo_Timestamp proto.InternalMessageInfo func (m *TypeMeta) Reset() { *m = TypeMeta{} } func (*TypeMeta) ProtoMessage() {} func (*TypeMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{39} + return fileDescriptor_cf52fa777ced5367, []int{40} } func (m *TypeMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1162,7 +1185,7 @@ var xxx_messageInfo_TypeMeta proto.InternalMessageInfo func (m *UpdateOptions) Reset() { *m = UpdateOptions{} } func (*UpdateOptions) ProtoMessage() {} func (*UpdateOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{40} + return fileDescriptor_cf52fa777ced5367, []int{41} } func (m *UpdateOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1190,7 +1213,7 @@ var xxx_messageInfo_UpdateOptions proto.InternalMessageInfo func (m *Verbs) Reset() { *m = Verbs{} } func (*Verbs) ProtoMessage() {} func (*Verbs) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{41} + return fileDescriptor_cf52fa777ced5367, []int{42} } func (m *Verbs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1218,7 +1241,7 @@ var xxx_messageInfo_Verbs proto.InternalMessageInfo func (m *WatchEvent) Reset() { *m = WatchEvent{} } func (*WatchEvent) ProtoMessage() {} func (*WatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{42} + return fileDescriptor_cf52fa777ced5367, []int{43} } func (m *WatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1279,6 +1302,8 @@ func init() { proto.RegisterType((*Patch)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Patch") proto.RegisterType((*PatchOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.PatchOptions") proto.RegisterType((*Preconditions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Preconditions") + proto.RegisterType((*ProtoFields)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ProtoFields") + proto.RegisterMapType((map[string]Fields)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ProtoFields.MapEntry") proto.RegisterType((*RootPaths)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.RootPaths") proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ServerAddressByClientCIDR") proto.RegisterType((*Status)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Status") @@ -1298,178 +1323,181 @@ func init() { } var fileDescriptor_cf52fa777ced5367 = []byte{ - // 2732 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x39, 0xdd, 0x6f, 0x1c, 0x57, - 0xf5, 0x9e, 0x5d, 0xef, 0x7a, 0xf7, 0xd8, 0x9b, 0xd8, 0x37, 0xc9, 0xef, 0xb7, 0x5d, 0x84, 0xd7, - 0x9d, 0xa2, 0x2a, 0x85, 0x74, 0xdd, 0x04, 0x5a, 0x85, 0x94, 0x16, 0xbc, 0x5e, 0x27, 0x35, 0x8d, - 0x6b, 0xeb, 0x3a, 0x09, 0x22, 0x54, 0xa8, 0xd7, 0x33, 0xd7, 0xeb, 0xc1, 0xb3, 0x33, 0xd3, 0x3b, - 0xb3, 0x4e, 0x16, 0x1e, 0xe8, 0x03, 0x08, 0x90, 0xa0, 0xea, 0x23, 0x4f, 0xa8, 0x15, 0xfc, 0x05, - 0x3c, 0xf1, 0x07, 0x54, 0xa2, 0x2f, 0x48, 0x95, 0x78, 0xa9, 0x04, 0x5a, 0x35, 0xe6, 0x01, 0xde, - 0x10, 0xaf, 0x7e, 0x42, 0xf7, 0x6b, 0x3e, 0x76, 0xbd, 0xf1, 0x2c, 0x29, 0x15, 0x6f, 0x33, 0xe7, - 0xf3, 0x9e, 0x7b, 0xcf, 0x3d, 0x5f, 0x17, 0xb6, 0x0e, 0xaf, 0x87, 0x2d, 0xc7, 0x5f, 0x3d, 0xec, - 0xef, 0x51, 0xe6, 0xd1, 0x88, 0x86, 0xab, 0x47, 0xd4, 0xb3, 0x7d, 0xb6, 0xaa, 0x10, 0x24, 0x70, - 0x7a, 0xc4, 0x3a, 0x70, 0x3c, 0xca, 0x06, 0xab, 0xc1, 0x61, 0x97, 0x03, 0xc2, 0xd5, 0x1e, 0x8d, - 0xc8, 0xea, 0xd1, 0xd5, 0xd5, 0x2e, 0xf5, 0x28, 0x23, 0x11, 0xb5, 0x5b, 0x01, 0xf3, 0x23, 0x1f, - 0x7d, 0x49, 0x72, 0xb5, 0xd2, 0x5c, 0xad, 0xe0, 0xb0, 0xcb, 0x01, 0x61, 0x8b, 0x73, 0xb5, 0x8e, - 0xae, 0x36, 0x9e, 0xef, 0x3a, 0xd1, 0x41, 0x7f, 0xaf, 0x65, 0xf9, 0xbd, 0xd5, 0xae, 0xdf, 0xf5, - 0x57, 0x05, 0xf3, 0x5e, 0x7f, 0x5f, 0xfc, 0x89, 0x1f, 0xf1, 0x25, 0x85, 0x36, 0x26, 0x2e, 0x85, - 0xf5, 0xbd, 0xc8, 0xe9, 0xd1, 0xd1, 0x55, 0x34, 0x5e, 0x3a, 0x8b, 0x21, 0xb4, 0x0e, 0x68, 0x8f, - 0x8c, 0xf2, 0x99, 0x7f, 0x2c, 0x42, 0x65, 0x6d, 0x67, 0xf3, 0x16, 0xf3, 0xfb, 0x01, 0x5a, 0x81, - 0x59, 0x8f, 0xf4, 0x68, 0xdd, 0x58, 0x31, 0x2e, 0x57, 0xdb, 0x0b, 0x1f, 0x0d, 0x9b, 0x33, 0xc7, - 0xc3, 0xe6, 0xec, 0x1b, 0xa4, 0x47, 0xb1, 0xc0, 0x20, 0x17, 0x2a, 0x47, 0x94, 0x85, 0x8e, 0xef, - 0x85, 0xf5, 0xc2, 0x4a, 0xf1, 0xf2, 0xfc, 0xb5, 0x57, 0x5b, 0x79, 0xec, 0x6f, 0x09, 0x05, 0xf7, - 0x24, 0xeb, 0x4d, 0x9f, 0x75, 0x9c, 0xd0, 0xf2, 0x8f, 0x28, 0x1b, 0xb4, 0x17, 0x95, 0x96, 0x8a, - 0x42, 0x86, 0x38, 0xd6, 0x80, 0x7e, 0x62, 0xc0, 0x62, 0xc0, 0xe8, 0x3e, 0x65, 0x8c, 0xda, 0x0a, - 0x5f, 0x2f, 0xae, 0x18, 0x9f, 0x81, 0xda, 0xba, 0x52, 0xbb, 0xb8, 0x33, 0x22, 0x1f, 0x8f, 0x69, - 0x44, 0xbf, 0x35, 0xa0, 0x11, 0x52, 0x76, 0x44, 0xd9, 0x9a, 0x6d, 0x33, 0x1a, 0x86, 0xed, 0xc1, - 0xba, 0xeb, 0x50, 0x2f, 0x5a, 0xdf, 0xec, 0xe0, 0xb0, 0x3e, 0x2b, 0xf6, 0xe1, 0x9b, 0xf9, 0x16, - 0xb4, 0x3b, 0x49, 0x4e, 0xdb, 0x54, 0x2b, 0x6a, 0x4c, 0x24, 0x09, 0xf1, 0x63, 0x96, 0x61, 0xee, - 0xc3, 0x82, 0x3e, 0xc8, 0xdb, 0x4e, 0x18, 0xa1, 0x7b, 0x50, 0xee, 0xf2, 0x9f, 0xb0, 0x6e, 0x88, - 0x05, 0xb6, 0xf2, 0x2d, 0x50, 0xcb, 0x68, 0x9f, 0x53, 0xeb, 0x29, 0x8b, 0xdf, 0x10, 0x2b, 0x69, - 0xe6, 0x2f, 0x66, 0x61, 0x7e, 0x6d, 0x67, 0x13, 0xd3, 0xd0, 0xef, 0x33, 0x8b, 0xe6, 0x70, 0x9a, - 0xeb, 0xb0, 0x10, 0x3a, 0x5e, 0xb7, 0xef, 0x12, 0xc6, 0xa1, 0xf5, 0xb2, 0xa0, 0xbc, 0xa8, 0x28, - 0x17, 0x76, 0x53, 0x38, 0x9c, 0xa1, 0x44, 0xd7, 0x00, 0xb8, 0x84, 0x30, 0x20, 0x16, 0xb5, 0xeb, - 0x85, 0x15, 0xe3, 0x72, 0xa5, 0x8d, 0x14, 0x1f, 0xbc, 0x11, 0x63, 0x70, 0x8a, 0x0a, 0x3d, 0x03, - 0x25, 0xb1, 0xd2, 0x7a, 0x45, 0xa8, 0xa9, 0x29, 0xf2, 0x92, 0x30, 0x03, 0x4b, 0x1c, 0x7a, 0x0e, - 0xe6, 0x94, 0x97, 0xd5, 0xab, 0x82, 0xec, 0xbc, 0x22, 0x9b, 0xd3, 0x6e, 0xa0, 0xf1, 0xdc, 0xbe, - 0x43, 0xc7, 0xb3, 0x85, 0xdf, 0xa5, 0xec, 0x7b, 0xdd, 0xf1, 0x6c, 0x2c, 0x30, 0xe8, 0x36, 0x94, - 0x8e, 0x28, 0xdb, 0xe3, 0x9e, 0xc0, 0x5d, 0xf3, 0x2b, 0xf9, 0x36, 0xfa, 0x1e, 0x67, 0x69, 0x57, - 0xf9, 0xd2, 0xc4, 0x27, 0x96, 0x42, 0x50, 0x0b, 0x20, 0x3c, 0xf0, 0x59, 0x24, 0xcc, 0xab, 0x97, - 0x56, 0x8a, 0x97, 0xab, 0xed, 0x73, 0xdc, 0xde, 0xdd, 0x18, 0x8a, 0x53, 0x14, 0x9c, 0xde, 0x22, - 0x11, 0xed, 0xfa, 0xcc, 0xa1, 0x61, 0x7d, 0x2e, 0xa1, 0x5f, 0x8f, 0xa1, 0x38, 0x45, 0x81, 0xbe, - 0x0d, 0x28, 0x8c, 0x7c, 0x46, 0xba, 0x54, 0x99, 0xfa, 0x1a, 0x09, 0x0f, 0xea, 0x20, 0xac, 0x6b, - 0x28, 0xeb, 0xd0, 0xee, 0x18, 0x05, 0x3e, 0x85, 0xcb, 0xfc, 0xbd, 0x01, 0xe7, 0x53, 0xbe, 0x20, - 0xfc, 0xee, 0x3a, 0x2c, 0x74, 0x53, 0xb7, 0x4e, 0xf9, 0x45, 0x7c, 0xda, 0xe9, 0x1b, 0x89, 0x33, - 0x94, 0x88, 0x42, 0x95, 0x29, 0x49, 0x3a, 0xba, 0x5c, 0xcd, 0xed, 0xb4, 0x7a, 0x0d, 0x89, 0xa6, - 0x14, 0x30, 0xc4, 0x89, 0x64, 0xf3, 0xef, 0x86, 0x70, 0x60, 0x1d, 0x6f, 0xd0, 0xe5, 0x54, 0x4c, - 0x33, 0xc4, 0xf6, 0x2d, 0x4c, 0x88, 0x47, 0x67, 0x04, 0x82, 0xc2, 0xff, 0x44, 0x20, 0xb8, 0x51, - 0xf9, 0xf5, 0xfb, 0xcd, 0x99, 0x77, 0xfe, 0xba, 0x32, 0x63, 0xf6, 0xa0, 0xb6, 0xce, 0x28, 0x89, - 0xe8, 0x76, 0x10, 0x09, 0x03, 0x4c, 0x28, 0xdb, 0x6c, 0x80, 0xfb, 0x9e, 0x32, 0x14, 0xf8, 0xfd, - 0xee, 0x08, 0x08, 0x56, 0x18, 0x7e, 0x7e, 0xfb, 0x0e, 0x75, 0xed, 0x2d, 0xe2, 0x91, 0x2e, 0x65, - 0xca, 0xef, 0xe3, 0x5d, 0xbd, 0x99, 0xc2, 0xe1, 0x0c, 0xa5, 0xf9, 0xb3, 0x22, 0xd4, 0x3a, 0xd4, - 0xa5, 0x89, 0xbe, 0x9b, 0x80, 0xba, 0x8c, 0x58, 0x74, 0x87, 0x32, 0xc7, 0xb7, 0x77, 0xa9, 0xe5, - 0x7b, 0x76, 0x28, 0x3c, 0xa2, 0xd8, 0xfe, 0x3f, 0xee, 0x67, 0xb7, 0xc6, 0xb0, 0xf8, 0x14, 0x0e, - 0xe4, 0x42, 0x2d, 0x60, 0xe2, 0xdb, 0x89, 0x54, 0xee, 0xe1, 0x37, 0xed, 0xab, 0xf9, 0xb6, 0x7a, - 0x27, 0xcd, 0xda, 0x5e, 0x3a, 0x1e, 0x36, 0x6b, 0x19, 0x10, 0xce, 0x0a, 0x47, 0xdf, 0x82, 0x45, - 0x9f, 0x05, 0x07, 0xc4, 0xeb, 0xd0, 0x80, 0x7a, 0x36, 0xf5, 0xa2, 0x50, 0xec, 0x42, 0xa5, 0x7d, - 0x91, 0x67, 0x8c, 0xed, 0x11, 0x1c, 0x1e, 0xa3, 0x46, 0xf7, 0x61, 0x29, 0x60, 0x7e, 0x40, 0xba, - 0x84, 0x4b, 0xdc, 0xf1, 0x5d, 0xc7, 0x1a, 0x88, 0xe8, 0x50, 0x6d, 0x5f, 0x39, 0x1e, 0x36, 0x97, - 0x76, 0x46, 0x91, 0x27, 0xc3, 0xe6, 0x05, 0xb1, 0x75, 0x1c, 0x92, 0x20, 0xf1, 0xb8, 0x98, 0xd4, - 0x19, 0x96, 0x26, 0x9d, 0xa1, 0xb9, 0x09, 0x95, 0x4e, 0x9f, 0x09, 0x2e, 0xf4, 0x0a, 0x54, 0x6c, - 0xf5, 0xad, 0x76, 0xfe, 0x69, 0x9d, 0x72, 0x35, 0xcd, 0xc9, 0xb0, 0x59, 0xe3, 0x45, 0x42, 0x4b, - 0x03, 0x70, 0xcc, 0x62, 0xbe, 0x09, 0xb5, 0x8d, 0x87, 0x81, 0xcf, 0x22, 0x7d, 0xa6, 0xcf, 0x42, - 0x99, 0x0a, 0x80, 0x90, 0x56, 0x49, 0xf2, 0x84, 0x24, 0xc3, 0x0a, 0xcb, 0xe3, 0x30, 0x7d, 0x48, - 0xac, 0x48, 0x85, 0xed, 0x38, 0x0e, 0x6f, 0x70, 0x20, 0x96, 0x38, 0xf3, 0x43, 0x03, 0xca, 0xc2, - 0xa3, 0x42, 0x74, 0x07, 0x8a, 0x3d, 0x12, 0xa8, 0x64, 0xf5, 0x62, 0xbe, 0x93, 0x95, 0xac, 0xad, - 0x2d, 0x12, 0x6c, 0x78, 0x11, 0x1b, 0xb4, 0xe7, 0x95, 0x92, 0xe2, 0x16, 0x09, 0x30, 0x17, 0xd7, - 0xb0, 0xa1, 0xa2, 0xb1, 0x68, 0x11, 0x8a, 0x87, 0x74, 0x20, 0x03, 0x12, 0xe6, 0x9f, 0xa8, 0x0d, - 0xa5, 0x23, 0xe2, 0xf6, 0xa9, 0xf2, 0xa7, 0x2b, 0xd3, 0x68, 0xc5, 0x92, 0xf5, 0x46, 0xe1, 0xba, - 0x61, 0x6e, 0x03, 0xdc, 0xa2, 0xf1, 0x0e, 0xad, 0xc1, 0x79, 0x1d, 0x6d, 0xb2, 0x41, 0xf0, 0xff, - 0xd5, 0xf2, 0xce, 0xe3, 0x2c, 0x1a, 0x8f, 0xd2, 0x9b, 0x6f, 0x42, 0x55, 0x04, 0x4a, 0x9e, 0x65, - 0x92, 0x8c, 0x66, 0x3c, 0x26, 0xa3, 0xe9, 0x34, 0x55, 0x98, 0x94, 0xa6, 0x52, 0x71, 0xc1, 0x85, - 0x9a, 0xe4, 0xd5, 0x39, 0x3c, 0x97, 0x86, 0x2b, 0x50, 0xd1, 0xcb, 0x54, 0x5a, 0xe2, 0xda, 0x4d, - 0x0b, 0xc2, 0x31, 0x45, 0x4a, 0xdb, 0x01, 0x64, 0x82, 0x7e, 0x3e, 0x65, 0xa9, 0x04, 0x5d, 0x78, - 0x7c, 0x82, 0x4e, 0x69, 0xfa, 0x31, 0xd4, 0x27, 0x15, 0x7c, 0x4f, 0x90, 0x96, 0xf2, 0x2f, 0xc5, - 0x7c, 0xd7, 0x80, 0xc5, 0xb4, 0xa4, 0xfc, 0xc7, 0x97, 0x5f, 0xc9, 0xd9, 0x05, 0x49, 0x6a, 0x47, - 0x7e, 0x63, 0xc0, 0xc5, 0x8c, 0x69, 0x53, 0x9d, 0xf8, 0x14, 0x8b, 0x4a, 0x3b, 0x47, 0x71, 0x0a, - 0xe7, 0xf8, 0x73, 0x01, 0x6a, 0xb7, 0xc9, 0x1e, 0x75, 0x77, 0xa9, 0x4b, 0xad, 0xc8, 0x67, 0xe8, - 0x47, 0x30, 0xdf, 0x23, 0x91, 0x75, 0x20, 0xa0, 0xba, 0x78, 0xed, 0xe4, 0xbb, 0x99, 0x19, 0x49, - 0xad, 0xad, 0x44, 0x8c, 0x0c, 0x0f, 0x17, 0xd4, 0x92, 0xe6, 0x53, 0x18, 0x9c, 0xd6, 0x26, 0x3a, - 0x0e, 0xf1, 0xbf, 0xf1, 0x30, 0xe0, 0x99, 0x75, 0xfa, 0x46, 0x27, 0xb3, 0x04, 0x4c, 0xdf, 0xee, - 0x3b, 0x8c, 0xf6, 0xa8, 0x17, 0x25, 0x1d, 0xc7, 0xd6, 0x88, 0x7c, 0x3c, 0xa6, 0xb1, 0xf1, 0x2a, - 0x2c, 0x8e, 0x2e, 0xfe, 0x94, 0xe8, 0x75, 0x31, 0x1d, 0xbd, 0xaa, 0xe9, 0x78, 0xf4, 0x3b, 0x03, - 0xea, 0x93, 0x16, 0x82, 0xbe, 0x98, 0x12, 0x94, 0x44, 0xcc, 0xd7, 0xe9, 0x40, 0x4a, 0xdd, 0x80, - 0x8a, 0x1f, 0xf0, 0x1e, 0xd1, 0x67, 0xea, 0xd4, 0x9f, 0xd3, 0x27, 0xb9, 0xad, 0xe0, 0x27, 0xc3, - 0xe6, 0xa5, 0x8c, 0x78, 0x8d, 0xc0, 0x31, 0x2b, 0x4f, 0x53, 0x62, 0x3d, 0x3c, 0x75, 0xc6, 0x69, - 0xea, 0x9e, 0x80, 0x60, 0x85, 0x31, 0xff, 0x60, 0xc0, 0xac, 0xa8, 0x19, 0xdf, 0x84, 0x0a, 0xdf, - 0x3f, 0x9b, 0x44, 0x44, 0xac, 0x2b, 0x77, 0xb7, 0xc2, 0xb9, 0xb7, 0x68, 0x44, 0x12, 0x6f, 0xd3, - 0x10, 0x1c, 0x4b, 0x44, 0x18, 0x4a, 0x4e, 0x44, 0x7b, 0xfa, 0x20, 0x9f, 0x9f, 0x28, 0x5a, 0xf5, - 0xca, 0x2d, 0x4c, 0x1e, 0x6c, 0x3c, 0x8c, 0xa8, 0xc7, 0x0f, 0x23, 0xb9, 0x1a, 0x9b, 0x5c, 0x06, - 0x96, 0xa2, 0xcc, 0x7f, 0x19, 0x10, 0xab, 0xe2, 0xce, 0x1f, 0x52, 0x77, 0xff, 0xb6, 0xe3, 0x1d, - 0xaa, 0x6d, 0x8d, 0x97, 0xb3, 0xab, 0xe0, 0x38, 0xa6, 0x38, 0x2d, 0x3d, 0x14, 0xa6, 0x4b, 0x0f, - 0x5c, 0xa1, 0xe5, 0x7b, 0x91, 0xe3, 0xf5, 0xc7, 0x6e, 0xdb, 0xba, 0x82, 0xe3, 0x98, 0x82, 0x57, - 0x61, 0x8c, 0xf6, 0x88, 0xe3, 0x39, 0x5e, 0x97, 0x1b, 0xb1, 0xee, 0xf7, 0xbd, 0x48, 0x94, 0x23, - 0xaa, 0x0a, 0xc3, 0x63, 0x58, 0x7c, 0x0a, 0x87, 0xf9, 0xa7, 0x22, 0xcc, 0x73, 0x9b, 0x75, 0x9e, - 0x7b, 0x19, 0x6a, 0x6e, 0xda, 0x0b, 0x94, 0xed, 0x97, 0xd4, 0x52, 0xb2, 0xf7, 0x1a, 0x67, 0x69, - 0x39, 0xb3, 0x28, 0x1e, 0x63, 0xe6, 0x42, 0x96, 0xf9, 0x66, 0x1a, 0x89, 0xb3, 0xb4, 0x3c, 0x7a, - 0x3d, 0xe0, 0xf7, 0x43, 0x95, 0x65, 0xf1, 0x11, 0x7d, 0x87, 0x03, 0xb1, 0xc4, 0xa1, 0x2d, 0xb8, - 0x40, 0x5c, 0xd7, 0x7f, 0x20, 0x80, 0x6d, 0xdf, 0x3f, 0xec, 0x11, 0x76, 0x18, 0x8a, 0x7e, 0xaf, - 0xd2, 0xfe, 0x82, 0x62, 0xb9, 0xb0, 0x36, 0x4e, 0x82, 0x4f, 0xe3, 0x3b, 0xed, 0xd8, 0x66, 0xa7, - 0x3c, 0xb6, 0x1b, 0x70, 0x8e, 0xfb, 0x97, 0xdf, 0x8f, 0x74, 0x29, 0x5c, 0x12, 0x87, 0x80, 0x8e, - 0x87, 0xcd, 0x73, 0x77, 0x32, 0x18, 0x3c, 0x42, 0xc9, 0x4d, 0x76, 0x9d, 0x9e, 0x13, 0xd5, 0xe7, - 0x04, 0x4b, 0x6c, 0xf2, 0x6d, 0x0e, 0xc4, 0x12, 0x97, 0xf1, 0x8b, 0xca, 0x59, 0x7e, 0x61, 0xfe, - 0xa3, 0x00, 0x48, 0xd6, 0xee, 0xb6, 0x2c, 0x69, 0x64, 0xa0, 0x79, 0x0e, 0xe6, 0x7a, 0xaa, 0xf6, - 0x37, 0xb2, 0x51, 0x5f, 0x97, 0xfd, 0x1a, 0x8f, 0xb6, 0xa0, 0x2a, 0x2f, 0x7c, 0xe2, 0xc4, 0xab, - 0x8a, 0xb8, 0xba, 0xad, 0x11, 0x27, 0xc3, 0x66, 0x23, 0xa3, 0x26, 0xc6, 0xdc, 0x19, 0x04, 0x14, - 0x27, 0x12, 0x78, 0xbb, 0x4f, 0x02, 0x27, 0x3d, 0xe8, 0xa9, 0x26, 0xed, 0x7e, 0xd2, 0xb2, 0xe1, - 0x14, 0x15, 0x7a, 0x0d, 0x66, 0xf9, 0x4e, 0xa9, 0xde, 0xfb, 0xcb, 0xf9, 0xc2, 0x06, 0xdf, 0xeb, - 0x76, 0x85, 0x67, 0x4d, 0xfe, 0x85, 0x85, 0x04, 0x74, 0x1f, 0xca, 0xc2, 0xcb, 0xe4, 0xa9, 0x4c, - 0x59, 0x0d, 0x8a, 0xd6, 0x40, 0x95, 0xb2, 0x27, 0xf1, 0x17, 0x56, 0x12, 0xcd, 0xb7, 0xa1, 0xba, - 0xe5, 0x58, 0xcc, 0xe7, 0xea, 0xf8, 0x06, 0x87, 0x99, 0x56, 0x28, 0xde, 0x60, 0x7d, 0xf8, 0x1a, - 0xcf, 0x4f, 0xdd, 0x23, 0x9e, 0x2f, 0x1b, 0x9e, 0x52, 0x72, 0xea, 0x6f, 0x70, 0x20, 0x96, 0xb8, - 0x1b, 0x17, 0x79, 0x36, 0xfd, 0xf9, 0x07, 0xcd, 0x99, 0xf7, 0x3e, 0x68, 0xce, 0xbc, 0xff, 0x81, - 0xca, 0xac, 0x27, 0x00, 0xb0, 0xbd, 0xf7, 0x03, 0x6a, 0xc9, 0x18, 0x95, 0x6b, 0x4c, 0xa3, 0xa7, - 0x83, 0x62, 0x4c, 0x53, 0x18, 0xa9, 0x90, 0x52, 0x38, 0x9c, 0xa1, 0x44, 0xab, 0x50, 0x8d, 0x07, - 0x30, 0xea, 0xd8, 0x96, 0xb4, 0x1b, 0xc4, 0x53, 0x1a, 0x9c, 0xd0, 0x64, 0x02, 0xe6, 0xec, 0x99, - 0x01, 0xb3, 0x0d, 0xc5, 0xbe, 0x63, 0x8b, 0x53, 0xa9, 0xb6, 0x5f, 0xd0, 0x09, 0xeb, 0xee, 0x66, - 0xe7, 0x64, 0xd8, 0x7c, 0x7a, 0xd2, 0xdc, 0x33, 0x1a, 0x04, 0x34, 0x6c, 0xdd, 0xdd, 0xec, 0x60, - 0xce, 0x7c, 0xda, 0xed, 0x2d, 0x4f, 0x79, 0x7b, 0xaf, 0x01, 0x28, 0xab, 0x39, 0xb7, 0xbc, 0x86, - 0xb1, 0x77, 0xde, 0x8a, 0x31, 0x38, 0x45, 0x85, 0x42, 0x58, 0xb2, 0x78, 0x07, 0xce, 0x9d, 0xdd, - 0xe9, 0xd1, 0x30, 0x22, 0x3d, 0x39, 0x98, 0x9a, 0xce, 0x55, 0x9f, 0x52, 0x6a, 0x96, 0xd6, 0x47, - 0x85, 0xe1, 0x71, 0xf9, 0xc8, 0x87, 0x25, 0x5b, 0xf5, 0x92, 0x89, 0xd2, 0xea, 0xd4, 0x4a, 0x2f, - 0x71, 0x85, 0x9d, 0x51, 0x41, 0x78, 0x5c, 0x36, 0xfa, 0x3e, 0x34, 0x34, 0x70, 0xbc, 0xa1, 0x17, - 0xa3, 0xa5, 0x62, 0x7b, 0xf9, 0x78, 0xd8, 0x6c, 0x74, 0x26, 0x52, 0xe1, 0xc7, 0x48, 0x40, 0x36, - 0x94, 0x5d, 0x59, 0x0d, 0xce, 0x8b, 0x0c, 0xfe, 0x8d, 0x7c, 0x56, 0x24, 0xde, 0xdf, 0x4a, 0x57, - 0x81, 0x71, 0xc3, 0xaa, 0x0a, 0x40, 0x25, 0x1b, 0x3d, 0x84, 0x79, 0xe2, 0x79, 0x7e, 0x44, 0xe4, - 0x88, 0x61, 0x41, 0xa8, 0x5a, 0x9b, 0x5a, 0xd5, 0x5a, 0x22, 0x63, 0xa4, 0xea, 0x4c, 0x61, 0x70, - 0x5a, 0x15, 0x7a, 0x00, 0xe7, 0xfd, 0x07, 0x1e, 0x65, 0x98, 0xee, 0x53, 0x46, 0x3d, 0x8b, 0x86, - 0xf5, 0x9a, 0xd0, 0xfe, 0xb5, 0x9c, 0xda, 0x33, 0xcc, 0x89, 0x4b, 0x67, 0xe1, 0x21, 0x1e, 0xd5, - 0x82, 0x5a, 0x00, 0xfb, 0x8e, 0x47, 0x5c, 0xe7, 0x87, 0x94, 0x85, 0xf5, 0x73, 0xc9, 0xec, 0xf0, - 0x66, 0x0c, 0xc5, 0x29, 0x0a, 0xf4, 0x22, 0xcc, 0x5b, 0x6e, 0x3f, 0x8c, 0xa8, 0x1c, 0xe4, 0x9e, - 0x17, 0x37, 0x28, 0xb6, 0x6f, 0x3d, 0x41, 0xe1, 0x34, 0x1d, 0xea, 0x43, 0xad, 0x97, 0x4e, 0x00, - 0xf5, 0x25, 0x61, 0xdd, 0xf5, 0x7c, 0xd6, 0x8d, 0xa7, 0xa8, 0xa4, 0x4a, 0xc8, 0xe0, 0x70, 0x56, - 0x4b, 0xe3, 0xeb, 0x30, 0xff, 0x1f, 0x16, 0xd0, 0xbc, 0x00, 0x1f, 0x3d, 0xc7, 0xa9, 0x0a, 0xf0, - 0x0f, 0x0b, 0x70, 0x2e, 0xbb, 0xfb, 0x23, 0xc9, 0xad, 0x94, 0x2b, 0xb9, 0xe9, 0x56, 0xcf, 0x98, - 0x38, 0x7b, 0xd6, 0x61, 0xbd, 0x38, 0x31, 0xac, 0xab, 0xe8, 0x39, 0xfb, 0x24, 0xd1, 0xb3, 0x05, - 0xc0, 0xab, 0x06, 0xe6, 0xbb, 0x2e, 0x65, 0x22, 0x70, 0x56, 0xd4, 0x8c, 0x39, 0x86, 0xe2, 0x14, - 0x05, 0xaf, 0x38, 0xf7, 0x5c, 0xdf, 0x3a, 0x14, 0x5b, 0xa0, 0x2f, 0xbd, 0x08, 0x99, 0x15, 0x59, - 0x71, 0xb6, 0xc7, 0xb0, 0xf8, 0x14, 0x0e, 0x73, 0x00, 0x97, 0x76, 0x08, 0x8b, 0x1c, 0xe2, 0x26, - 0x17, 0x4c, 0x94, 0xf4, 0x6f, 0x8d, 0x35, 0x0c, 0x2f, 0x4c, 0x7b, 0x51, 0x93, 0xcd, 0x4f, 0x60, - 0x49, 0xd3, 0x60, 0xfe, 0xc5, 0x80, 0xa7, 0x4e, 0xd5, 0xfd, 0x39, 0x34, 0x2c, 0x6f, 0x65, 0x1b, - 0x96, 0x97, 0x73, 0x8e, 0x39, 0x4f, 0x5b, 0xed, 0x84, 0xf6, 0x65, 0x0e, 0x4a, 0x3b, 0xbc, 0xbc, - 0x35, 0x7f, 0x65, 0xc0, 0x82, 0xf8, 0x9a, 0x66, 0x44, 0xdc, 0x84, 0xd2, 0xbe, 0xaf, 0xc7, 0x40, - 0x15, 0xf9, 0x86, 0x71, 0x93, 0x03, 0xb0, 0x84, 0x3f, 0xc1, 0x0c, 0xf9, 0x5d, 0x03, 0xb2, 0xc3, - 0x59, 0xf4, 0xaa, 0xf4, 0x5f, 0x23, 0x9e, 0x9e, 0x4e, 0xe9, 0xbb, 0xaf, 0x4c, 0x6a, 0xb7, 0x2e, - 0xe4, 0x9a, 0xc4, 0x5d, 0x81, 0x2a, 0xf6, 0xfd, 0x68, 0x87, 0x44, 0x07, 0x21, 0x37, 0x3c, 0xe0, - 0x1f, 0x6a, 0x6f, 0x84, 0xe1, 0x02, 0x83, 0x25, 0xdc, 0xfc, 0xa5, 0x01, 0x4f, 0x4d, 0x1c, 0xdb, - 0xf3, 0x10, 0x60, 0xc5, 0x7f, 0xca, 0xa2, 0xd8, 0x0b, 0x13, 0x3a, 0x9c, 0xa2, 0xe2, 0x7d, 0x52, - 0x66, 0xd6, 0x3f, 0xda, 0x27, 0x65, 0xb4, 0xe1, 0x2c, 0xad, 0xf9, 0xcf, 0x02, 0x94, 0x77, 0x23, - 0x12, 0xf5, 0xc3, 0xff, 0xb2, 0xc7, 0x3e, 0x0b, 0xe5, 0x50, 0xe8, 0x51, 0xcb, 0x8b, 0x73, 0xac, - 0xd4, 0x8e, 0x15, 0x56, 0xf4, 0x16, 0x34, 0x0c, 0x49, 0x57, 0x47, 0xac, 0xa4, 0xb7, 0x90, 0x60, - 0xac, 0xf1, 0xe8, 0x25, 0x28, 0x33, 0x4a, 0xc2, 0xb8, 0xcd, 0x5a, 0xd6, 0x22, 0xb1, 0x80, 0x9e, - 0x0c, 0x9b, 0x0b, 0x4a, 0xb8, 0xf8, 0xc7, 0x8a, 0x1a, 0xdd, 0x87, 0x39, 0x9b, 0x46, 0xc4, 0x71, - 0x75, 0x1d, 0x9f, 0xf3, 0x95, 0x40, 0x0a, 0xeb, 0x48, 0xd6, 0xf6, 0x3c, 0x5f, 0x93, 0xfa, 0xc1, - 0x5a, 0x20, 0x8f, 0xb6, 0x96, 0x6f, 0xcb, 0x17, 0xcc, 0x52, 0x12, 0x6d, 0xd7, 0x7d, 0x9b, 0x62, - 0x81, 0x31, 0xdf, 0x33, 0x60, 0x5e, 0x4a, 0x5a, 0x27, 0xfd, 0x90, 0xa2, 0xab, 0xb1, 0x15, 0xf2, - 0xb8, 0x75, 0x25, 0x37, 0xcb, 0x7b, 0x9f, 0x93, 0x61, 0xb3, 0x2a, 0xc8, 0x44, 0x23, 0xa4, 0x0d, - 0x48, 0xed, 0x51, 0xe1, 0x8c, 0x3d, 0x7a, 0x06, 0x4a, 0xe2, 0xf6, 0xa8, 0xcd, 0x8c, 0xef, 0xba, - 0xb8, 0x60, 0x58, 0xe2, 0xcc, 0x4f, 0x0b, 0x50, 0xcb, 0x18, 0x97, 0xa3, 0x17, 0x88, 0xc7, 0x83, - 0x85, 0x1c, 0x23, 0xe7, 0xc9, 0x2f, 0xa3, 0x2a, 0xf7, 0x94, 0x9f, 0x24, 0xf7, 0x7c, 0x17, 0xca, - 0x16, 0xdf, 0x23, 0xfd, 0xd0, 0x7e, 0x75, 0x9a, 0xe3, 0x14, 0xbb, 0x9b, 0x78, 0xa3, 0xf8, 0x0d, - 0xb1, 0x12, 0x88, 0x6e, 0xc1, 0x12, 0xa3, 0x11, 0x1b, 0xac, 0xed, 0x47, 0x94, 0xa5, 0x5b, 0xf2, - 0x52, 0x52, 0x71, 0xe3, 0x51, 0x02, 0x3c, 0xce, 0x63, 0xee, 0xc1, 0xc2, 0x1d, 0xb2, 0xe7, 0xc6, - 0xef, 0x5e, 0x18, 0x6a, 0x8e, 0x67, 0xb9, 0x7d, 0x9b, 0xca, 0x68, 0xac, 0xa3, 0x97, 0xbe, 0xb4, - 0x9b, 0x69, 0xe4, 0xc9, 0xb0, 0x79, 0x21, 0x03, 0x90, 0x0f, 0x3d, 0x38, 0x2b, 0xc2, 0x74, 0x61, - 0xf6, 0x73, 0xec, 0x1e, 0xbf, 0x07, 0xd5, 0xa4, 0xbe, 0xff, 0x8c, 0x55, 0x9a, 0x6f, 0x41, 0x85, - 0x7b, 0xbc, 0xee, 0x4b, 0xcf, 0x28, 0x71, 0xb2, 0x85, 0x53, 0x21, 0x4f, 0xe1, 0x64, 0xf6, 0xa0, - 0x76, 0x37, 0xb0, 0x9f, 0xf0, 0xe5, 0xb3, 0x90, 0x3b, 0x6b, 0x5d, 0x03, 0xf9, 0x86, 0xcf, 0x13, - 0x84, 0xcc, 0xdc, 0xa9, 0x04, 0x91, 0x4e, 0xbc, 0xa9, 0xc9, 0xf7, 0x4f, 0x0d, 0x00, 0x31, 0x62, - 0xda, 0x38, 0xa2, 0x5e, 0xc4, 0xf7, 0x81, 0x3b, 0xfe, 0xe8, 0x3e, 0x88, 0xc8, 0x20, 0x30, 0xe8, - 0x2e, 0x94, 0x7d, 0xe9, 0x4d, 0xf2, 0xb5, 0x6a, 0xca, 0x39, 0x66, 0x7c, 0x09, 0xa4, 0x3f, 0x61, - 0x25, 0xac, 0x7d, 0xf9, 0xa3, 0x47, 0xcb, 0x33, 0x1f, 0x3f, 0x5a, 0x9e, 0xf9, 0xe4, 0xd1, 0xf2, - 0xcc, 0x3b, 0xc7, 0xcb, 0xc6, 0x47, 0xc7, 0xcb, 0xc6, 0xc7, 0xc7, 0xcb, 0xc6, 0x27, 0xc7, 0xcb, - 0xc6, 0xa7, 0xc7, 0xcb, 0xc6, 0x7b, 0x7f, 0x5b, 0x9e, 0xb9, 0x5f, 0x38, 0xba, 0xfa, 0xef, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x6d, 0x6a, 0x61, 0x07, 0x39, 0x25, 0x00, 0x00, + // 2779 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x1a, 0xcf, 0x6f, 0x1c, 0x57, + 0xd9, 0xb3, 0xeb, 0x5d, 0xef, 0x7e, 0xeb, 0x4d, 0xec, 0x97, 0x04, 0x36, 0x46, 0x78, 0xdd, 0x29, + 0xaa, 0x52, 0x48, 0xd7, 0x4d, 0xa0, 0x55, 0x48, 0x69, 0xc1, 0x6b, 0x3b, 0xa9, 0x69, 0x5c, 0x5b, + 0xcf, 0x49, 0x50, 0x43, 0x85, 0xfa, 0x3c, 0xf3, 0xbc, 0x1e, 0x3c, 0x3b, 0x33, 0x7d, 0x33, 0x6b, + 0x67, 0xe1, 0x40, 0x0f, 0x20, 0x40, 0x82, 0xaa, 0x47, 0x4e, 0xa8, 0x15, 0xfc, 0x05, 0x9c, 0xf8, + 0x03, 0x90, 0xe8, 0x05, 0xa9, 0x12, 0x97, 0x4a, 0xa0, 0x55, 0x6b, 0x0e, 0xc0, 0x09, 0x71, 0xe0, + 0xe2, 0x13, 0x7a, 0xbf, 0xe6, 0xc7, 0xae, 0x37, 0x9e, 0x25, 0xa5, 0xea, 0x6d, 0xe6, 0xfb, 0xf9, + 0xde, 0xfb, 0xbe, 0xf7, 0xfd, 0x9a, 0x81, 0xcd, 0x83, 0x1b, 0x61, 0xcb, 0xf1, 0x97, 0x0f, 0x7a, + 0xbb, 0x94, 0x79, 0x34, 0xa2, 0xe1, 0xf2, 0x21, 0xf5, 0x6c, 0x9f, 0x2d, 0x2b, 0x04, 0x09, 0x9c, + 0x2e, 0xb1, 0xf6, 0x1d, 0x8f, 0xb2, 0xfe, 0x72, 0x70, 0xd0, 0xe1, 0x80, 0x70, 0xb9, 0x4b, 0x23, + 0xb2, 0x7c, 0x78, 0x6d, 0xb9, 0x43, 0x3d, 0xca, 0x48, 0x44, 0xed, 0x56, 0xc0, 0xfc, 0xc8, 0x47, + 0x5f, 0x92, 0x5c, 0xad, 0x34, 0x57, 0x2b, 0x38, 0xe8, 0x70, 0x40, 0xd8, 0xe2, 0x5c, 0xad, 0xc3, + 0x6b, 0x0b, 0xcf, 0x74, 0x9c, 0x68, 0xbf, 0xb7, 0xdb, 0xb2, 0xfc, 0xee, 0x72, 0xc7, 0xef, 0xf8, + 0xcb, 0x82, 0x79, 0xb7, 0xb7, 0x27, 0xde, 0xc4, 0x8b, 0x78, 0x92, 0x42, 0x17, 0xc6, 0x2e, 0x85, + 0xf5, 0xbc, 0xc8, 0xe9, 0xd2, 0xe1, 0x55, 0x2c, 0x3c, 0x7f, 0x16, 0x43, 0x68, 0xed, 0xd3, 0x2e, + 0x19, 0xe6, 0x33, 0xff, 0x58, 0x84, 0xca, 0xca, 0xf6, 0xc6, 0x6d, 0xe6, 0xf7, 0x02, 0xb4, 0x04, + 0xd3, 0x1e, 0xe9, 0xd2, 0x86, 0xb1, 0x64, 0x5c, 0xa9, 0xb6, 0x67, 0xdf, 0x1f, 0x34, 0xa7, 0x8e, + 0x07, 0xcd, 0xe9, 0x57, 0x49, 0x97, 0x62, 0x81, 0x41, 0x2e, 0x54, 0x0e, 0x29, 0x0b, 0x1d, 0xdf, + 0x0b, 0x1b, 0x85, 0xa5, 0xe2, 0x95, 0xda, 0xf5, 0x97, 0x5a, 0x79, 0xf6, 0xdf, 0x12, 0x0a, 0xee, + 0x4b, 0xd6, 0x5b, 0x3e, 0x5b, 0x73, 0x42, 0xcb, 0x3f, 0xa4, 0xac, 0xdf, 0x9e, 0x53, 0x5a, 0x2a, + 0x0a, 0x19, 0xe2, 0x58, 0x03, 0xfa, 0xb1, 0x01, 0x73, 0x01, 0xa3, 0x7b, 0x94, 0x31, 0x6a, 0x2b, + 0x7c, 0xa3, 0xb8, 0x64, 0x7c, 0x02, 0x6a, 0x1b, 0x4a, 0xed, 0xdc, 0xf6, 0x90, 0x7c, 0x3c, 0xa2, + 0x11, 0xfd, 0xc6, 0x80, 0x85, 0x90, 0xb2, 0x43, 0xca, 0x56, 0x6c, 0x9b, 0xd1, 0x30, 0x6c, 0xf7, + 0x57, 0x5d, 0x87, 0x7a, 0xd1, 0xea, 0xc6, 0x1a, 0x0e, 0x1b, 0xd3, 0xe2, 0x1c, 0xbe, 0x99, 0x6f, + 0x41, 0x3b, 0xe3, 0xe4, 0xb4, 0x4d, 0xb5, 0xa2, 0x85, 0xb1, 0x24, 0x21, 0x7e, 0xc4, 0x32, 0xcc, + 0x3d, 0x98, 0xd5, 0x86, 0xbc, 0xe3, 0x84, 0x11, 0xba, 0x0f, 0xe5, 0x0e, 0x7f, 0x09, 0x1b, 0x86, + 0x58, 0x60, 0x2b, 0xdf, 0x02, 0xb5, 0x8c, 0xf6, 0x39, 0xb5, 0x9e, 0xb2, 0x78, 0x0d, 0xb1, 0x92, + 0x66, 0xfe, 0x7c, 0x1a, 0x6a, 0x2b, 0xdb, 0x1b, 0x98, 0x86, 0x7e, 0x8f, 0x59, 0x34, 0x87, 0xd3, + 0xdc, 0x80, 0xd9, 0xd0, 0xf1, 0x3a, 0x3d, 0x97, 0x30, 0x0e, 0x6d, 0x94, 0x05, 0xe5, 0x45, 0x45, + 0x39, 0xbb, 0x93, 0xc2, 0xe1, 0x0c, 0x25, 0xba, 0x0e, 0xc0, 0x25, 0x84, 0x01, 0xb1, 0xa8, 0xdd, + 0x28, 0x2c, 0x19, 0x57, 0x2a, 0x6d, 0xa4, 0xf8, 0xe0, 0xd5, 0x18, 0x83, 0x53, 0x54, 0xe8, 0x49, + 0x28, 0x89, 0x95, 0x36, 0x2a, 0x42, 0x4d, 0x5d, 0x91, 0x97, 0xc4, 0x36, 0xb0, 0xc4, 0xa1, 0xa7, + 0x61, 0x46, 0x79, 0x59, 0xa3, 0x2a, 0xc8, 0xce, 0x2b, 0xb2, 0x19, 0xed, 0x06, 0x1a, 0xcf, 0xf7, + 0x77, 0xe0, 0x78, 0xb6, 0xf0, 0xbb, 0xd4, 0xfe, 0x5e, 0x71, 0x3c, 0x1b, 0x0b, 0x0c, 0xba, 0x03, + 0xa5, 0x43, 0xca, 0x76, 0xb9, 0x27, 0x70, 0xd7, 0xfc, 0x4a, 0xbe, 0x83, 0xbe, 0xcf, 0x59, 0xda, + 0x55, 0xbe, 0x34, 0xf1, 0x88, 0xa5, 0x10, 0xd4, 0x02, 0x08, 0xf7, 0x7d, 0x16, 0x89, 0xed, 0x35, + 0x4a, 0x4b, 0xc5, 0x2b, 0xd5, 0xf6, 0x39, 0xbe, 0xdf, 0x9d, 0x18, 0x8a, 0x53, 0x14, 0x9c, 0xde, + 0x22, 0x11, 0xed, 0xf8, 0xcc, 0xa1, 0x61, 0x63, 0x26, 0xa1, 0x5f, 0x8d, 0xa1, 0x38, 0x45, 0x81, + 0xbe, 0x0d, 0x28, 0x8c, 0x7c, 0x46, 0x3a, 0x54, 0x6d, 0xf5, 0x65, 0x12, 0xee, 0x37, 0x40, 0xec, + 0x6e, 0x41, 0xed, 0x0e, 0xed, 0x8c, 0x50, 0xe0, 0x53, 0xb8, 0xcc, 0xdf, 0x19, 0x70, 0x3e, 0xe5, + 0x0b, 0xc2, 0xef, 0x6e, 0xc0, 0x6c, 0x27, 0x75, 0xeb, 0x94, 0x5f, 0xc4, 0xd6, 0x4e, 0xdf, 0x48, + 0x9c, 0xa1, 0x44, 0x14, 0xaa, 0x4c, 0x49, 0xd2, 0xd1, 0xe5, 0x5a, 0x6e, 0xa7, 0xd5, 0x6b, 0x48, + 0x34, 0xa5, 0x80, 0x21, 0x4e, 0x24, 0x9b, 0x7f, 0x37, 0x84, 0x03, 0xeb, 0x78, 0x83, 0xae, 0xa4, + 0x62, 0x9a, 0x21, 0x8e, 0x6f, 0x76, 0x4c, 0x3c, 0x3a, 0x23, 0x10, 0x14, 0x3e, 0x13, 0x81, 0xe0, + 0x66, 0xe5, 0x57, 0xef, 0x36, 0xa7, 0xde, 0xfa, 0xeb, 0xd2, 0x94, 0xd9, 0x85, 0xfa, 0x2a, 0xa3, + 0x24, 0xa2, 0x5b, 0x41, 0x24, 0x36, 0x60, 0x42, 0xd9, 0x66, 0x7d, 0xdc, 0xf3, 0xd4, 0x46, 0x81, + 0xdf, 0xef, 0x35, 0x01, 0xc1, 0x0a, 0xc3, 0xed, 0xb7, 0xe7, 0x50, 0xd7, 0xde, 0x24, 0x1e, 0xe9, + 0x50, 0xa6, 0xfc, 0x3e, 0x3e, 0xd5, 0x5b, 0x29, 0x1c, 0xce, 0x50, 0x9a, 0x3f, 0x2d, 0x42, 0x7d, + 0x8d, 0xba, 0x34, 0xd1, 0x77, 0x0b, 0x50, 0x87, 0x11, 0x8b, 0x6e, 0x53, 0xe6, 0xf8, 0xf6, 0x0e, + 0xb5, 0x7c, 0xcf, 0x0e, 0x85, 0x47, 0x14, 0xdb, 0x9f, 0xe3, 0x7e, 0x76, 0x7b, 0x04, 0x8b, 0x4f, + 0xe1, 0x40, 0x2e, 0xd4, 0x03, 0x26, 0x9e, 0x9d, 0x48, 0xe5, 0x1e, 0x7e, 0xd3, 0xbe, 0x9a, 0xef, + 0xa8, 0xb7, 0xd3, 0xac, 0xed, 0xf9, 0xe3, 0x41, 0xb3, 0x9e, 0x01, 0xe1, 0xac, 0x70, 0xf4, 0x2d, + 0x98, 0xf3, 0x59, 0xb0, 0x4f, 0xbc, 0x35, 0x1a, 0x50, 0xcf, 0xa6, 0x5e, 0x14, 0x8a, 0x53, 0xa8, + 0xb4, 0x2f, 0xf2, 0x8c, 0xb1, 0x35, 0x84, 0xc3, 0x23, 0xd4, 0xe8, 0x01, 0xcc, 0x07, 0xcc, 0x0f, + 0x48, 0x87, 0x70, 0x89, 0xdb, 0xbe, 0xeb, 0x58, 0x7d, 0x11, 0x1d, 0xaa, 0xed, 0xab, 0xc7, 0x83, + 0xe6, 0xfc, 0xf6, 0x30, 0xf2, 0x64, 0xd0, 0xbc, 0x20, 0x8e, 0x8e, 0x43, 0x12, 0x24, 0x1e, 0x15, + 0x93, 0xb2, 0x61, 0x69, 0x9c, 0x0d, 0xcd, 0x0d, 0xa8, 0xac, 0xf5, 0x98, 0xe0, 0x42, 0x2f, 0x42, + 0xc5, 0x56, 0xcf, 0xea, 0xe4, 0x9f, 0xd0, 0x29, 0x57, 0xd3, 0x9c, 0x0c, 0x9a, 0x75, 0x5e, 0x24, + 0xb4, 0x34, 0x00, 0xc7, 0x2c, 0xe6, 0xeb, 0x50, 0x5f, 0x7f, 0x18, 0xf8, 0x2c, 0xd2, 0x36, 0x7d, + 0x0a, 0xca, 0x54, 0x00, 0x84, 0xb4, 0x4a, 0x92, 0x27, 0x24, 0x19, 0x56, 0x58, 0x1e, 0x87, 0xe9, + 0x43, 0x62, 0x45, 0x2a, 0x6c, 0xc7, 0x71, 0x78, 0x9d, 0x03, 0xb1, 0xc4, 0x99, 0xff, 0x31, 0xa0, + 0x2c, 0x3c, 0x2a, 0x44, 0x77, 0xa1, 0xd8, 0x25, 0x81, 0x4a, 0x56, 0xcf, 0xe5, 0xb3, 0xac, 0x64, + 0x6d, 0x6d, 0x92, 0x60, 0xdd, 0x8b, 0x58, 0xbf, 0x5d, 0x53, 0x4a, 0x8a, 0x9b, 0x24, 0xc0, 0x5c, + 0x1c, 0xba, 0x0c, 0x45, 0x46, 0x8e, 0xc4, 0x1a, 0x66, 0xdb, 0x33, 0x1c, 0x85, 0xc9, 0x11, 0xe6, + 0xb0, 0x05, 0x1b, 0x2a, 0x9a, 0x11, 0xcd, 0x41, 0xf1, 0x80, 0xf6, 0x65, 0xac, 0xc2, 0xfc, 0x11, + 0xb5, 0xa1, 0x74, 0x48, 0xdc, 0x1e, 0x55, 0xae, 0x76, 0x75, 0x92, 0x05, 0x61, 0xc9, 0x7a, 0xb3, + 0x70, 0xc3, 0xb8, 0x79, 0x91, 0xdf, 0xc6, 0x9f, 0xbd, 0xd7, 0x9c, 0x7a, 0xe7, 0xbd, 0xe6, 0xd4, + 0xbb, 0xef, 0xa9, 0x9b, 0xb9, 0x05, 0x70, 0x9b, 0xc6, 0x47, 0xba, 0x02, 0xe7, 0x75, 0x78, 0xca, + 0x46, 0xcd, 0xcf, 0xab, 0xfd, 0x9c, 0xc7, 0x59, 0x34, 0x1e, 0xa6, 0x37, 0x5f, 0x87, 0xaa, 0x88, + 0xac, 0x3c, 0x2d, 0x25, 0x29, 0xd0, 0x78, 0x44, 0x0a, 0xd4, 0x79, 0xad, 0x30, 0x2e, 0xaf, 0xa5, + 0x02, 0x89, 0x0b, 0x75, 0xc9, 0xab, 0x93, 0x7e, 0x2e, 0x0d, 0x57, 0xa1, 0xa2, 0x97, 0xa9, 0xb4, + 0xc4, 0xc5, 0x9e, 0x16, 0x84, 0x63, 0x8a, 0x94, 0xb6, 0x7d, 0xc8, 0x64, 0x89, 0x7c, 0xca, 0x52, + 0x19, 0xbd, 0xf0, 0xe8, 0x8c, 0x9e, 0xd2, 0xf4, 0x23, 0x68, 0x8c, 0xab, 0x10, 0x1f, 0x23, 0x8f, + 0xe5, 0x5f, 0x8a, 0xf9, 0xb6, 0x01, 0x73, 0x69, 0x49, 0xf9, 0xcd, 0x97, 0x5f, 0xc9, 0xd9, 0x15, + 0x4c, 0xea, 0x44, 0x7e, 0x6d, 0xc0, 0xc5, 0xcc, 0xd6, 0x26, 0xb2, 0xf8, 0x04, 0x8b, 0x4a, 0x3b, + 0x47, 0x71, 0x02, 0xe7, 0xf8, 0x73, 0x01, 0xea, 0x77, 0xc8, 0x2e, 0x75, 0x77, 0xa8, 0x4b, 0xad, + 0xc8, 0x67, 0xe8, 0x87, 0x50, 0xeb, 0x92, 0xc8, 0xda, 0x17, 0x50, 0x5d, 0xed, 0xae, 0xe5, 0xbb, + 0xaf, 0x19, 0x49, 0xad, 0xcd, 0x44, 0x8c, 0x8c, 0x27, 0x17, 0xd4, 0x92, 0x6a, 0x29, 0x0c, 0x4e, + 0x6b, 0x13, 0x2d, 0x8a, 0x78, 0x5f, 0x7f, 0x18, 0xf0, 0x54, 0x3c, 0x79, 0x67, 0x94, 0x59, 0x02, + 0xa6, 0x6f, 0xf6, 0x1c, 0x46, 0xbb, 0xd4, 0x8b, 0x92, 0x16, 0x65, 0x73, 0x48, 0x3e, 0x1e, 0xd1, + 0xb8, 0xf0, 0x12, 0xcc, 0x0d, 0x2f, 0xfe, 0x94, 0x98, 0x76, 0x31, 0x1d, 0xd3, 0xaa, 0xa9, 0x28, + 0x65, 0xfe, 0xd6, 0x80, 0xc6, 0xb8, 0x85, 0xa0, 0x2f, 0xa6, 0x04, 0x25, 0x21, 0xf6, 0x15, 0xda, + 0x97, 0x52, 0xd7, 0xa1, 0xe2, 0x07, 0xbc, 0xa9, 0xf4, 0x99, 0xb2, 0xfa, 0xd3, 0xda, 0x92, 0x5b, + 0x0a, 0x7e, 0x32, 0x68, 0x5e, 0xca, 0x88, 0xd7, 0x08, 0x1c, 0xb3, 0xf2, 0xbc, 0x26, 0xd6, 0xc3, + 0x73, 0x6d, 0x9c, 0xd7, 0xee, 0x0b, 0x08, 0x56, 0x18, 0xf3, 0xf7, 0x06, 0x4c, 0x8b, 0x22, 0xf3, + 0x75, 0xa8, 0xf0, 0xf3, 0xb3, 0x49, 0x44, 0xc4, 0xba, 0x72, 0xb7, 0x37, 0x9c, 0x7b, 0x93, 0x46, + 0x24, 0xf1, 0x36, 0x0d, 0xc1, 0xb1, 0x44, 0x84, 0xa1, 0xe4, 0x44, 0xb4, 0xab, 0x0d, 0xf9, 0xcc, + 0x58, 0xd1, 0xaa, 0xb9, 0x6e, 0x61, 0x72, 0xb4, 0xfe, 0x30, 0xa2, 0x1e, 0x37, 0x46, 0x72, 0x35, + 0x36, 0xb8, 0x0c, 0x2c, 0x45, 0x99, 0xff, 0x36, 0x20, 0x56, 0xc5, 0x9d, 0x3f, 0xa4, 0xee, 0xde, + 0x1d, 0xc7, 0x3b, 0x50, 0xc7, 0x1a, 0x2f, 0x67, 0x47, 0xc1, 0x71, 0x4c, 0x71, 0x5a, 0x7a, 0x28, + 0x4c, 0x96, 0x1e, 0xb8, 0x42, 0xcb, 0xf7, 0x22, 0xc7, 0xeb, 0x8d, 0xdc, 0xb6, 0x55, 0x05, 0xc7, + 0x31, 0x05, 0x2f, 0xdb, 0x18, 0xed, 0x12, 0xc7, 0x73, 0xbc, 0x0e, 0xdf, 0xc4, 0xaa, 0xdf, 0xf3, + 0x22, 0x51, 0xbf, 0xa8, 0xb2, 0x0d, 0x8f, 0x60, 0xf1, 0x29, 0x1c, 0xe6, 0x9f, 0x8a, 0x50, 0xe3, + 0x7b, 0xd6, 0x79, 0xee, 0x05, 0xa8, 0xbb, 0x69, 0x2f, 0x50, 0x7b, 0xbf, 0xa4, 0x96, 0x92, 0xbd, + 0xd7, 0x38, 0x4b, 0xcb, 0x99, 0x45, 0xb5, 0x19, 0x33, 0x17, 0xb2, 0xcc, 0xb7, 0xd2, 0x48, 0x9c, + 0xa5, 0xe5, 0xd1, 0xeb, 0x88, 0xdf, 0x0f, 0x55, 0xc7, 0xc5, 0x26, 0xfa, 0x0e, 0x07, 0x62, 0x89, + 0x43, 0x9b, 0x70, 0x81, 0xb8, 0xae, 0x7f, 0x24, 0x80, 0x6d, 0xdf, 0x3f, 0xe8, 0x12, 0x76, 0x10, + 0x8a, 0x06, 0xb1, 0xd2, 0xfe, 0x82, 0x62, 0xb9, 0xb0, 0x32, 0x4a, 0x82, 0x4f, 0xe3, 0x3b, 0xcd, + 0x6c, 0xd3, 0x13, 0x9a, 0xed, 0x26, 0x9c, 0xe3, 0xfe, 0xe5, 0xf7, 0x22, 0x5d, 0x3b, 0x97, 0x84, + 0x11, 0xd0, 0xf1, 0xa0, 0x79, 0xee, 0x6e, 0x06, 0x83, 0x87, 0x28, 0xf9, 0x96, 0x5d, 0xa7, 0xeb, + 0x44, 0x8d, 0x19, 0xc1, 0x12, 0x6f, 0xf9, 0x0e, 0x07, 0x62, 0x89, 0xcb, 0xf8, 0x45, 0xe5, 0x2c, + 0xbf, 0x30, 0xff, 0x51, 0x00, 0x24, 0x8b, 0x7d, 0x5b, 0x16, 0x3a, 0x32, 0xd0, 0x3c, 0x0d, 0x33, + 0x5d, 0xd5, 0x2c, 0x18, 0xd9, 0xa8, 0xaf, 0xfb, 0x04, 0x8d, 0x47, 0x9b, 0x50, 0x95, 0x17, 0x3e, + 0x71, 0xe2, 0x65, 0x45, 0x5c, 0xdd, 0xd2, 0x88, 0x93, 0x41, 0x73, 0x21, 0xa3, 0x26, 0xc6, 0xdc, + 0xed, 0x07, 0x14, 0x27, 0x12, 0xd0, 0x75, 0x00, 0x12, 0x38, 0xe9, 0xc9, 0x50, 0x35, 0x99, 0x0f, + 0x24, 0x3d, 0x1e, 0x4e, 0x51, 0xa1, 0x97, 0x61, 0x9a, 0x9f, 0x94, 0x6a, 0xd6, 0xbf, 0x9c, 0x2f, + 0x6c, 0xf0, 0xb3, 0x6e, 0x57, 0x78, 0xd6, 0xe4, 0x4f, 0x58, 0x48, 0x40, 0x0f, 0xa0, 0x2c, 0xbc, + 0x4c, 0x5a, 0x65, 0xc2, 0x1a, 0x51, 0xf4, 0x12, 0xaa, 0xf6, 0x3d, 0x89, 0x9f, 0xb0, 0x92, 0x68, + 0xbe, 0x09, 0xd5, 0x4d, 0xc7, 0x62, 0x3e, 0x57, 0xc7, 0x0f, 0x38, 0xcc, 0xf4, 0x4e, 0xf1, 0x01, + 0x6b, 0xe3, 0x6b, 0x3c, 0xb7, 0xba, 0x47, 0x3c, 0x5f, 0x76, 0x48, 0xa5, 0xc4, 0xea, 0xaf, 0x72, + 0x20, 0x96, 0xb8, 0x31, 0x35, 0xe9, 0x09, 0x00, 0x6c, 0xed, 0x7e, 0x9f, 0x5a, 0x32, 0x46, 0xe5, + 0x9a, 0xeb, 0xe8, 0x71, 0xa2, 0x98, 0xeb, 0x14, 0x86, 0x2a, 0xa4, 0x14, 0x0e, 0x67, 0x28, 0xd1, + 0x32, 0x54, 0xe3, 0x89, 0x8d, 0x32, 0xdb, 0xbc, 0x76, 0x83, 0x78, 0xac, 0x83, 0x13, 0x9a, 0x4c, + 0xc0, 0x9c, 0x3e, 0x33, 0x60, 0xb6, 0xa1, 0xd8, 0x73, 0x6c, 0x61, 0x95, 0x6a, 0xfb, 0x59, 0x9d, + 0xb0, 0xee, 0x6d, 0xac, 0x9d, 0x0c, 0x9a, 0x4f, 0x8c, 0x1b, 0x94, 0x46, 0xfd, 0x80, 0x86, 0xad, + 0x7b, 0x1b, 0x6b, 0x98, 0x33, 0x9f, 0x76, 0x7b, 0xcb, 0x13, 0xde, 0xde, 0xeb, 0x00, 0x6a, 0xd7, + 0x9c, 0x5b, 0x5e, 0xc3, 0xd8, 0x3b, 0x6f, 0xc7, 0x18, 0x9c, 0xa2, 0x42, 0x21, 0xcc, 0x5b, 0xbc, + 0x65, 0xe7, 0xce, 0xee, 0x74, 0x69, 0x18, 0x91, 0xae, 0x9c, 0x64, 0x4d, 0xe6, 0xaa, 0x97, 0x95, + 0x9a, 0xf9, 0xd5, 0x61, 0x61, 0x78, 0x54, 0x3e, 0xf2, 0x61, 0xde, 0x56, 0xcd, 0x67, 0xa2, 0xb4, + 0x3a, 0xb1, 0xd2, 0x4b, 0x5c, 0xe1, 0xda, 0xb0, 0x20, 0x3c, 0x2a, 0x1b, 0x7d, 0x0f, 0x16, 0x34, + 0x70, 0x74, 0x02, 0x20, 0x66, 0x51, 0xc5, 0xf6, 0xe2, 0xf1, 0xa0, 0xb9, 0xb0, 0x36, 0x96, 0x0a, + 0x3f, 0x42, 0x02, 0xb2, 0xa1, 0xec, 0xca, 0x6a, 0xb0, 0x26, 0x32, 0xf8, 0x37, 0xf2, 0xed, 0x22, + 0xf1, 0xfe, 0x56, 0xba, 0x0a, 0x8c, 0x3b, 0x5c, 0x55, 0x00, 0x2a, 0xd9, 0xe8, 0x21, 0xd4, 0x88, + 0xe7, 0xf9, 0x11, 0x91, 0x33, 0x89, 0x59, 0xa1, 0x6a, 0x65, 0x62, 0x55, 0x2b, 0x89, 0x8c, 0xa1, + 0xaa, 0x33, 0x85, 0xc1, 0x69, 0x55, 0xe8, 0x08, 0xce, 0xfb, 0x47, 0x1e, 0x65, 0x98, 0xee, 0x51, + 0x46, 0x3d, 0x8b, 0x86, 0x8d, 0xba, 0xd0, 0xfe, 0xb5, 0x9c, 0xda, 0x33, 0xcc, 0x89, 0x4b, 0x67, + 0xe1, 0x21, 0x1e, 0xd6, 0x82, 0x5a, 0x00, 0x7b, 0x8e, 0x47, 0x5c, 0xe7, 0x07, 0x94, 0x85, 0x8d, + 0x73, 0xc9, 0xb0, 0xf1, 0x56, 0x0c, 0xc5, 0x29, 0x0a, 0xf4, 0x1c, 0xd4, 0x2c, 0xb7, 0x17, 0x46, + 0x54, 0x4e, 0x7e, 0xcf, 0x8b, 0x1b, 0x14, 0xef, 0x6f, 0x35, 0x41, 0xe1, 0x34, 0x1d, 0xea, 0x41, + 0xbd, 0x9b, 0x4e, 0x00, 0x8d, 0x79, 0xb1, 0xbb, 0x1b, 0xf9, 0x76, 0x37, 0x9a, 0xa2, 0x92, 0x2a, + 0x21, 0x83, 0xc3, 0x59, 0x2d, 0x0b, 0x5f, 0x87, 0xda, 0xff, 0x58, 0x40, 0xf3, 0x02, 0x7c, 0xd8, + 0x8e, 0x13, 0x15, 0xe0, 0x7f, 0x28, 0xc0, 0xb9, 0xec, 0xe9, 0x0f, 0x25, 0xb7, 0x52, 0xae, 0xe4, + 0xa6, 0x5b, 0x3d, 0x63, 0xec, 0xb0, 0x5a, 0x87, 0xf5, 0xe2, 0xd8, 0xb0, 0xae, 0xa2, 0xe7, 0xf4, + 0xe3, 0x44, 0xcf, 0x16, 0x00, 0xaf, 0x1a, 0x98, 0xef, 0xba, 0x94, 0x89, 0xc0, 0x59, 0x51, 0x43, + 0xe9, 0x18, 0x8a, 0x53, 0x14, 0xbc, 0xe2, 0xdc, 0x75, 0x7d, 0xeb, 0x40, 0x1c, 0x81, 0xbe, 0xf4, + 0x22, 0x64, 0x56, 0x64, 0xc5, 0xd9, 0x1e, 0xc1, 0xe2, 0x53, 0x38, 0xcc, 0x3e, 0x5c, 0xda, 0x26, + 0x2c, 0x72, 0x88, 0x9b, 0x5c, 0x30, 0x51, 0xd2, 0xbf, 0x31, 0xd2, 0x30, 0x3c, 0x3b, 0xe9, 0x45, + 0x4d, 0x0e, 0x3f, 0x81, 0x25, 0x4d, 0x83, 0xf9, 0x17, 0x03, 0x2e, 0x9f, 0xaa, 0xfb, 0x53, 0x68, + 0x58, 0xde, 0xc8, 0x36, 0x2c, 0x2f, 0xe4, 0x9c, 0x8b, 0x9e, 0xb6, 0xda, 0x31, 0xed, 0xcb, 0x0c, + 0x94, 0xb6, 0x79, 0x79, 0x6b, 0xfe, 0xd2, 0x80, 0x59, 0xf1, 0x34, 0xc9, 0x4c, 0xb9, 0x09, 0xa5, + 0x3d, 0x5f, 0x8f, 0x81, 0x2a, 0xf2, 0xa3, 0xc7, 0x2d, 0x0e, 0xc0, 0x12, 0xfe, 0x18, 0x43, 0xe7, + 0xb7, 0x0d, 0xc8, 0x4e, 0x73, 0xd1, 0x4b, 0xd2, 0x7f, 0x8d, 0x78, 0xdc, 0x3a, 0xa1, 0xef, 0xbe, + 0x38, 0xae, 0xdd, 0xba, 0x90, 0x6b, 0x12, 0xf7, 0x4f, 0x03, 0x6a, 0xdb, 0xcc, 0x8f, 0x7c, 0x35, + 0xd7, 0x7c, 0x2d, 0x3d, 0xd7, 0xbc, 0x99, 0x77, 0x62, 0x1d, 0xf3, 0x7f, 0x96, 0x87, 0x9b, 0xe6, + 0x55, 0xa8, 0x62, 0xdf, 0x8f, 0xb6, 0x49, 0xb4, 0x1f, 0x72, 0x23, 0x07, 0xfc, 0x41, 0xf9, 0x81, + 0x30, 0xb2, 0xc0, 0x60, 0x09, 0x37, 0x7f, 0x61, 0xc0, 0xe5, 0xb1, 0xdf, 0x34, 0x78, 0xb8, 0xb3, + 0xe2, 0x37, 0x65, 0xbd, 0xf8, 0xc6, 0x25, 0x74, 0x38, 0x45, 0xc5, 0x7b, 0xc2, 0xcc, 0x87, 0x90, + 0xe1, 0x9e, 0x30, 0xa3, 0x0d, 0x67, 0x69, 0xcd, 0x7f, 0x15, 0xa0, 0xbc, 0x13, 0x91, 0xa8, 0x17, + 0xfe, 0x9f, 0x6f, 0xe7, 0x53, 0x50, 0x0e, 0x85, 0x1e, 0xb5, 0xbc, 0xb8, 0x9e, 0x90, 0xda, 0xb1, + 0xc2, 0x8a, 0x3e, 0x8a, 0x86, 0x21, 0xe9, 0xe8, 0xe8, 0x9c, 0xf4, 0x51, 0x12, 0x8c, 0x35, 0x1e, + 0x3d, 0x0f, 0x65, 0x46, 0x49, 0x18, 0xb7, 0x94, 0x8b, 0x5a, 0x24, 0x16, 0xd0, 0x93, 0x41, 0x73, + 0x56, 0x09, 0x17, 0xef, 0x58, 0x51, 0xa3, 0x07, 0x30, 0x63, 0xd3, 0x88, 0x38, 0xae, 0xee, 0x59, + 0x72, 0x7e, 0x42, 0x91, 0xc2, 0xd6, 0x24, 0x6b, 0xbb, 0xc6, 0xd7, 0xa4, 0x5e, 0xb0, 0x16, 0xc8, + 0x33, 0x8b, 0xe5, 0xdb, 0xf2, 0xf3, 0x6e, 0x29, 0xc9, 0x2c, 0xab, 0xbe, 0x4d, 0xb1, 0xc0, 0x98, + 0xef, 0x18, 0x50, 0x93, 0x92, 0x56, 0x49, 0x2f, 0xa4, 0xe8, 0x5a, 0xbc, 0x0b, 0x69, 0x6e, 0x5d, + 0xb5, 0x4e, 0xf3, 0x3e, 0xef, 0x64, 0xd0, 0xac, 0x0a, 0x32, 0xd1, 0xf4, 0xe9, 0x0d, 0xa4, 0xce, + 0xa8, 0x70, 0xc6, 0x19, 0x3d, 0x09, 0x25, 0x11, 0x29, 0xd4, 0x61, 0xc6, 0x71, 0x4d, 0xb8, 0x31, + 0x96, 0x38, 0xf3, 0xa3, 0x02, 0xd4, 0x33, 0x9b, 0xcb, 0xd1, 0xf7, 0xc4, 0xa3, 0xd0, 0x42, 0x8e, + 0xf1, 0xfa, 0xf8, 0xcf, 0xc6, 0x2a, 0xcf, 0x96, 0x1f, 0x27, 0xcf, 0xbe, 0x06, 0x65, 0x8b, 0x9f, + 0x91, 0xfe, 0x0b, 0xe1, 0xda, 0x24, 0xe6, 0x14, 0xa7, 0x9b, 0x78, 0xa3, 0x78, 0x0d, 0xb1, 0x12, + 0x88, 0x6e, 0xc3, 0x3c, 0xa3, 0x11, 0xeb, 0xaf, 0xec, 0x45, 0x94, 0xa5, 0xc7, 0x0f, 0xa5, 0xa4, + 0xbb, 0xc0, 0xc3, 0x04, 0x78, 0x94, 0xc7, 0xdc, 0x85, 0xd9, 0xbb, 0x64, 0xd7, 0x8d, 0x3f, 0x0a, + 0x62, 0xa8, 0x3b, 0x9e, 0xe5, 0xf6, 0x6c, 0x2a, 0x33, 0x8f, 0x8e, 0xd4, 0xfa, 0xd2, 0x6e, 0xa4, + 0x91, 0x27, 0x83, 0xe6, 0x85, 0x0c, 0x40, 0x7e, 0x05, 0xc3, 0x59, 0x11, 0xa6, 0x0b, 0xd3, 0x9f, + 0x62, 0xa7, 0xfc, 0x5d, 0xa8, 0x26, 0xbd, 0xcc, 0x27, 0xac, 0xd2, 0x7c, 0x03, 0x2a, 0xdc, 0xe3, + 0x75, 0x0f, 0x7e, 0x46, 0x39, 0x97, 0x2d, 0x12, 0x0b, 0x79, 0x8a, 0x44, 0xb3, 0x0b, 0xf5, 0x7b, + 0x81, 0xfd, 0x98, 0x9f, 0x85, 0x0b, 0xb9, 0x33, 0xf4, 0x75, 0x90, 0x3f, 0x38, 0xf0, 0x04, 0x21, + 0xab, 0x94, 0x54, 0x82, 0x48, 0x17, 0x19, 0xa9, 0x29, 0xff, 0x4f, 0x0c, 0x00, 0x31, 0x4e, 0x5b, + 0x3f, 0xa4, 0x5e, 0xc4, 0xcf, 0x81, 0x3b, 0xfe, 0xf0, 0x39, 0x88, 0xc8, 0x20, 0x30, 0xe8, 0x1e, + 0x94, 0x7d, 0xe9, 0x4d, 0x32, 0xa5, 0x4d, 0x38, 0xb3, 0x8d, 0x2f, 0x81, 0xf4, 0x27, 0xac, 0x84, + 0xb5, 0xaf, 0xbc, 0xff, 0xf1, 0xe2, 0xd4, 0x07, 0x1f, 0x2f, 0x4e, 0x7d, 0xf8, 0xf1, 0xe2, 0xd4, + 0x5b, 0xc7, 0x8b, 0xc6, 0xfb, 0xc7, 0x8b, 0xc6, 0x07, 0xc7, 0x8b, 0xc6, 0x87, 0xc7, 0x8b, 0xc6, + 0x47, 0xc7, 0x8b, 0xc6, 0x3b, 0x7f, 0x5b, 0x9c, 0x7a, 0x50, 0x38, 0xbc, 0xf6, 0xdf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xe2, 0xeb, 0x45, 0x81, 0x56, 0x26, 0x00, 0x00, } func (m *APIGroup) Marshal() (dAtA []byte, err error) { @@ -1922,58 +1950,6 @@ func (m *ExportOptions) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Fields) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Fields) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Fields) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Map) > 0 { - keysForMap := make([]string, 0, len(m.Map)) - for k := range m.Map { - keysForMap = append(keysForMap, string(k)) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMap) - for iNdEx := len(keysForMap) - 1; iNdEx >= 0; iNdEx-- { - v := m.Map[string(keysForMap[iNdEx])] - baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - i -= len(keysForMap[iNdEx]) - copy(dAtA[i:], keysForMap[iNdEx]) - i = encodeVarintGenerated(dAtA, i, uint64(len(keysForMap[iNdEx]))) - i-- - dAtA[i] = 0xa - i = encodeVarintGenerated(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func (m *GetOptions) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2957,6 +2933,65 @@ func (m *Preconditions) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ProtoFields) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ProtoFields) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProtoFields) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Raw != nil { + i -= len(m.Raw) + copy(dAtA[i:], m.Raw) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Raw))) + i-- + dAtA[i] = 0x12 + } + if len(m.Map) > 0 { + keysForMap := make([]string, 0, len(m.Map)) + for k := range m.Map { + keysForMap = append(keysForMap, string(k)) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForMap) + for iNdEx := len(keysForMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.Map[string(keysForMap[iNdEx])] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + i -= len(keysForMap[iNdEx]) + copy(dAtA[i:], keysForMap[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(keysForMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintGenerated(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *RootPaths) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3574,24 +3609,6 @@ func (m *ExportOptions) Size() (n int) { return n } -func (m *Fields) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Map) > 0 { - for k, v := range m.Map { - _ = k - _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + l + sovGenerated(uint64(l)) - n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) - } - } - return n -} - func (m *GetOptions) Size() (n int) { if m == nil { return 0 @@ -3972,6 +3989,28 @@ func (m *Preconditions) Size() (n int) { return n } +func (m *ProtoFields) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Map) > 0 { + for k, v := range m.Map { + _ = k + _ = v + l = v.Size() + mapEntrySize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + l + sovGenerated(uint64(l)) + n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) + } + } + if m.Raw != nil { + l = len(m.Raw) + n += 1 + l + sovGenerated(uint64(l)) + } + return n +} + func (m *RootPaths) Size() (n int) { if m == nil { return 0 @@ -4266,26 +4305,6 @@ func (this *ExportOptions) String() string { }, "") return s } -func (this *Fields) String() string { - if this == nil { - return "nil" - } - keysForMap := make([]string, 0, len(this.Map)) - for k := range this.Map { - keysForMap = append(keysForMap, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMap) - mapStringForMap := "map[string]Fields{" - for _, k := range keysForMap { - mapStringForMap += fmt.Sprintf("%v: %v,", k, this.Map[k]) - } - mapStringForMap += "}" - s := strings.Join([]string{`&Fields{`, - `Map:` + mapStringForMap + `,`, - `}`, - }, "") - return s -} func (this *GetOptions) String() string { if this == nil { return "nil" @@ -4400,7 +4419,7 @@ func (this *ManagedFieldsEntry) String() string { `Operation:` + fmt.Sprintf("%v", this.Operation) + `,`, `APIVersion:` + fmt.Sprintf("%v", this.APIVersion) + `,`, `Time:` + strings.Replace(fmt.Sprintf("%v", this.Time), "Time", "Time", 1) + `,`, - `Fields:` + strings.Replace(this.Fields.String(), "Fields", "Fields", 1) + `,`, + `Fields:` + strings.Replace(fmt.Sprintf("%v", this.Fields), "Fields", "Fields", 1) + `,`, `}`, }, "") return s @@ -4533,6 +4552,27 @@ func (this *Preconditions) String() string { }, "") return s } +func (this *ProtoFields) String() string { + if this == nil { + return "nil" + } + keysForMap := make([]string, 0, len(this.Map)) + for k := range this.Map { + keysForMap = append(keysForMap, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForMap) + mapStringForMap := "map[string]Fields{" + for _, k := range keysForMap { + mapStringForMap += fmt.Sprintf("%v: %v,", k, this.Map[k]) + } + mapStringForMap += "}" + s := strings.Join([]string{`&ProtoFields{`, + `Map:` + mapStringForMap + `,`, + `Raw:` + valueToStringGenerated(this.Raw) + `,`, + `}`, + }, "") + return s +} func (this *RootPaths) String() string { if this == nil { return "nil" @@ -6016,188 +6056,6 @@ func (m *ExportOptions) Unmarshal(dAtA []byte) error { } return nil } -func (m *Fields) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Fields: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Fields: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Map", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenerated - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Map == nil { - m.Map = make(map[string]Fields) - } - var mapkey string - mapvalue := &Fields{} - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthGenerated - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthGenerated - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthGenerated - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthGenerated - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &Fields{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Map[mapkey] = *mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *GetOptions) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9660,6 +9518,222 @@ func (m *Preconditions) Unmarshal(dAtA []byte) error { } return nil } +func (m *ProtoFields) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ProtoFields: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ProtoFields: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Map", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Map == nil { + m.Map = make(map[string]Fields) + } + var mapkey string + mapvalue := &Fields{} + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthGenerated + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapmsglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapmsglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if mapmsglen < 0 { + return ErrInvalidLengthGenerated + } + postmsgIndex := iNdEx + mapmsglen + if postmsgIndex < 0 { + return ErrInvalidLengthGenerated + } + if postmsgIndex > l { + return io.ErrUnexpectedEOF + } + mapvalue = &Fields{} + if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { + return err + } + iNdEx = postmsgIndex + } else { + iNdEx = entryPreIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.Map[mapkey] = *mapvalue + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Raw", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Raw = append(m.Raw[:0], dAtA[iNdEx:postIndex]...) + if m.Raw == nil { + m.Raw = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *RootPaths) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto index 0064f59fe61..a2388fb0919 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto @@ -213,20 +213,25 @@ message ExportOptions { } // Fields stores a set of fields in a data structure like a Trie. -// To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff +// +// Each key is either a '.' representing the field itself, and will always map to an empty set, +// or a string representing a sub-field or item. The string will follow one of these four formats: +// 'f:', where is the name of a field in a struct, or key in a map +// 'v:', where is the exact json formatted value of a list item +// 'i:', where is position of a item in a list +// 'k:', where is a map of a list item's key fields to their unique values +// If a key maps to an empty Fields value, the field that key represents is part of the set. +// +// The exact format is defined in sigs.k8s.io/structured-merge-diff +// +protobuf.options.marshal=false +// +protobuf.as=ProtoFields +// +protobuf.options.(gogoproto.goproto_stringer)=false message Fields { - // Map stores a set of fields in a data structure like a Trie. - // - // Each key is either a '.' representing the field itself, and will always map to an empty set, - // or a string representing a sub-field or item. The string will follow one of these four formats: - // 'f:', where is the name of a field in a struct, or key in a map - // 'v:', where is the exact json formatted value of a list item - // 'i:', where is position of a item in a list - // 'k:', where is a map of a list item's key fields to their unique values - // If a key maps to an empty Fields value, the field that key represents is part of the set. - // - // The exact format is defined in k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal + // Map is the representation used in the alpha version of this API map map = 1; + + // Raw is the underlying serialization of this object. + optional bytes raw = 2; } // GetOptions is the standard query options to the standard REST get call. @@ -777,6 +782,17 @@ message Preconditions { optional string resourceVersion = 2; } +// ProtoFields is a struct that is equivalent to Fields, but intended for +// protobuf marshalling/unmarshalling. It is generated into a serialization +// that matches Fields. Do not use in Go structs. +message ProtoFields { + // Map is the representation used in the alpha version of this API + map map = 1; + + // Raw is the underlying serialization of this object. + optional bytes raw = 2; +} + // RootPaths lists the paths available at root. // For example: "/healthz", "/apis". message RootPaths { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go index ff95221c99b..e5496a95aee 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go @@ -120,7 +120,7 @@ func (ExportOptions) SwaggerDoc() map[string]string { } var map_Fields = map[string]string{ - "": "Fields stores a set of fields in a data structure like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff", + "": "Fields stores a set of fields in a data structure like a Trie.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff", } func (Fields) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go index e1246b1a079..eddbbe33894 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go @@ -315,12 +315,10 @@ func (in *ExportOptions) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Fields) DeepCopyInto(out *Fields) { *out = *in - if in.Map != nil { - in, out := &in.Map, &out.Map - *out = make(map[string]Fields, len(*in)) - for key, val := range *in { - (*out)[key] = *val.DeepCopy() - } + if in.Raw != nil { + in, out := &in.Raw, &out.Raw + *out = make([]byte, len(*in)) + copy(*out, *in) } return } @@ -866,6 +864,34 @@ func (in *Preconditions) DeepCopy() *Preconditions { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProtoFields) DeepCopyInto(out *ProtoFields) { + *out = *in + if in.Map != nil { + in, out := &in.Map, &out.Map + *out = make(map[string]Fields, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + if in.Raw != nil { + in, out := &in.Raw, &out.Raw + *out = make([]byte, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProtoFields. +func (in *ProtoFields) DeepCopy() *ProtoFields { + if in == nil { + return nil + } + out := new(ProtoFields) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RootPaths) DeepCopyInto(out *RootPaths) { *out = *in diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index bc194c61433..ef6741b8c3e 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -59,7 +59,7 @@ require ( k8s.io/klog v0.3.1 k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a - sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3 + sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648 sigs.k8s.io/yaml v1.1.0 ) diff --git a/staging/src/k8s.io/apiserver/go.sum b/staging/src/k8s.io/apiserver/go.sum index 80c15e5fb7d..568b4959297 100644 --- a/staging/src/k8s.io/apiserver/go.sum +++ b/staging/src/k8s.io/apiserver/go.sum @@ -231,7 +231,7 @@ k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a h1:2jUDc9gJja832Ftp+QbDV0tVhQHMI k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3 h1:yCY9zAYErawYwXdOYmwEBzcGCr/6eIUujYZE2DIQve8= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648 h1:qukMPS/1fDG5pToYLYSEx5IpwHVJMtTyOMaIIsR2Fas= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go b/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go index d4786bbb0b5..aa35e7cab9d 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go @@ -62,6 +62,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ProtoFields": schema_pkg_apis_meta_v1_ProtoFields(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), @@ -590,7 +591,7 @@ func schema_pkg_apis_meta_v1_Fields(ref common.ReferenceCallback) common.OpenAPI return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "Fields stores a set of fields in a data structure like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff", + Description: "Fields stores a set of fields in a data structure like a Trie.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff", Type: []string{"object"}, }, }, @@ -1557,6 +1558,17 @@ func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common. } } +func schema_pkg_apis_meta_v1_ProtoFields(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ProtoFields is a struct that is equivalent to Fields, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Fields. Do not use in Go structs.", + Type: []string{"object"}, + }, + }, + } +} + func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/staging/src/k8s.io/kube-aggregator/go.sum b/staging/src/k8s.io/kube-aggregator/go.sum index 721d3954b9c..8f01be1b190 100644 --- a/staging/src/k8s.io/kube-aggregator/go.sum +++ b/staging/src/k8s.io/kube-aggregator/go.sum @@ -268,7 +268,7 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3 h1:yCY9zAYErawYwXdOYmwEBzcGCr/6eIUujYZE2DIQve8= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648 h1:qukMPS/1fDG5pToYLYSEx5IpwHVJMtTyOMaIIsR2Fas= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.sum b/staging/src/k8s.io/legacy-cloud-providers/go.sum index edd81c398c4..92c72b3ac75 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.sum +++ b/staging/src/k8s.io/legacy-cloud-providers/go.sum @@ -211,6 +211,6 @@ k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod h1:nfDlWeOsu3pUf4y k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a h1:2jUDc9gJja832Ftp+QbDV0tVhQHMISFn01els+2ZAcw= k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/staging/src/k8s.io/sample-apiserver/go.sum b/staging/src/k8s.io/sample-apiserver/go.sum index c1f8473d35d..e8e3f0b84ef 100644 --- a/staging/src/k8s.io/sample-apiserver/go.sum +++ b/staging/src/k8s.io/sample-apiserver/go.sum @@ -265,7 +265,7 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3 h1:yCY9zAYErawYwXdOYmwEBzcGCr/6eIUujYZE2DIQve8= -sigs.k8s.io/structured-merge-diff v0.0.0-20190719182312-e94e05bfbbe3/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648 h1:qukMPS/1fDG5pToYLYSEx5IpwHVJMtTyOMaIIsR2Fas= +sigs.k8s.io/structured-merge-diff v0.0.0-20190724202554-0c1d754dd648/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go b/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go index 776592209a1..b1d27358d93 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go @@ -62,6 +62,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ProtoFields": schema_pkg_apis_meta_v1_ProtoFields(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), @@ -594,7 +595,7 @@ func schema_pkg_apis_meta_v1_Fields(ref common.ReferenceCallback) common.OpenAPI return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "Fields stores a set of fields in a data structure like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff", + Description: "Fields stores a set of fields in a data structure like a Trie.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff", Type: []string{"object"}, }, }, @@ -1561,6 +1562,17 @@ func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common. } } +func schema_pkg_apis_meta_v1_ProtoFields(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ProtoFields is a struct that is equivalent to Fields, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Fields. Do not use in Go structs.", + Type: []string{"object"}, + }, + }, + } +} + func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{