From 4d85e48528267d902a0421359567d130fc88b85f Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Tue, 13 Sep 2016 22:08:03 +0800 Subject: [PATCH] CRI: remove name from ContainerFilter and PodSandboxFilter --- .../api/testing/fake_runtime_service.go | 6 - pkg/kubelet/api/v1alpha1/runtime/api.pb.go | 388 +++++++++--------- pkg/kubelet/api/v1alpha1/runtime/api.proto | 18 +- pkg/kubelet/dockershim/docker_container.go | 6 +- pkg/kubelet/dockershim/docker_sandbox.go | 6 - 5 files changed, 193 insertions(+), 231 deletions(-) diff --git a/pkg/kubelet/api/testing/fake_runtime_service.go b/pkg/kubelet/api/testing/fake_runtime_service.go index 7af555accfa..c612299af12 100644 --- a/pkg/kubelet/api/testing/fake_runtime_service.go +++ b/pkg/kubelet/api/testing/fake_runtime_service.go @@ -188,9 +188,6 @@ func (r *FakeRuntimeService) ListPodSandbox(filter *runtimeApi.PodSandboxFilter) if filter.Id != nil && filter.GetId() != id { continue } - if filter.Name != nil && filter.GetName() != s.Metadata.GetName() { - continue - } if filter.State != nil && filter.GetState() != s.GetState() { continue } @@ -304,9 +301,6 @@ func (r *FakeRuntimeService) ListContainers(filter *runtimeApi.ContainerFilter) if filter.Id != nil && filter.GetId() != s.GetId() { continue } - if filter.Name != nil && filter.GetName() != s.Metadata.GetName() { - continue - } if filter.PodSandboxId != nil && filter.GetPodSandboxId() != s.SandboxID { continue } diff --git a/pkg/kubelet/api/v1alpha1/runtime/api.pb.go b/pkg/kubelet/api/v1alpha1/runtime/api.pb.go index 52000258e8a..6505a229407 100644 --- a/pkg/kubelet/api/v1alpha1/runtime/api.pb.go +++ b/pkg/kubelet/api/v1alpha1/runtime/api.pb.go @@ -914,16 +914,14 @@ func (m *PodSandboxStatusResponse) GetStatus() *PodSandboxStatus { // PodSandboxFilter is used to filter a list of PodSandboxes. // All those fields are combined with 'AND' type PodSandboxFilter struct { - // Name of the sandbox. - Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` // ID of the sandbox. - Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` + Id *string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` // State of the sandbox. - State *PodSandBoxState `protobuf:"varint,3,opt,name=state,enum=runtime.PodSandBoxState" json:"state,omitempty"` + State *PodSandBoxState `protobuf:"varint,2,opt,name=state,enum=runtime.PodSandBoxState" json:"state,omitempty"` // LabelSelector to select matches. // Only api.MatchLabels is supported for now and the requirements // are ANDed. MatchExpressions is not supported yet. - LabelSelector map[string]string `protobuf:"bytes,4,rep,name=label_selector,json=labelSelector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + LabelSelector map[string]string `protobuf:"bytes,3,rep,name=label_selector,json=labelSelector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` XXX_unrecognized []byte `json:"-"` } @@ -932,13 +930,6 @@ func (m *PodSandboxFilter) String() string { return proto.CompactText func (*PodSandboxFilter) ProtoMessage() {} func (*PodSandboxFilter) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{21} } -func (m *PodSandboxFilter) GetName() string { - if m != nil && m.Name != nil { - return *m.Name - } - return "" -} - func (m *PodSandboxFilter) GetId() string { if m != nil && m.Id != nil { return *m.Id @@ -1662,18 +1653,16 @@ func (*RemoveContainerResponse) Descriptor() ([]byte, []int) { return fileDescri // ContainerFilter is used to filter containers. // All those fields are combined with 'AND' type ContainerFilter struct { - // Name of the container. - Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` // ID of the container. - Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` + Id *string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` // State of the container. - State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"` + State *ContainerState `protobuf:"varint,2,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"` // The id of the pod sandbox - PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"` + PodSandboxId *string `protobuf:"bytes,3,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"` // LabelSelector to select matches. // Only api.MatchLabels is supported for now and the requirements // are ANDed. MatchExpressions is not supported yet. - LabelSelector map[string]string `protobuf:"bytes,5,rep,name=label_selector,json=labelSelector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + LabelSelector map[string]string `protobuf:"bytes,4,rep,name=label_selector,json=labelSelector" json:"label_selector,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` XXX_unrecognized []byte `json:"-"` } @@ -1682,13 +1671,6 @@ func (m *ContainerFilter) String() string { return proto.CompactTextS func (*ContainerFilter) ProtoMessage() {} func (*ContainerFilter) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{42} } -func (m *ContainerFilter) GetName() string { - if m != nil && m.Name != nil { - return *m.Name - } - return "" -} - func (m *ContainerFilter) GetId() string { if m != nil && m.Id != nil { return *m.Id @@ -3115,182 +3097,182 @@ var _ImageService_serviceDesc = grpc.ServiceDesc{ } var fileDescriptorApi = []byte{ - // 2826 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x5a, 0x4f, 0x73, 0xdb, 0xc6, - 0x15, 0x37, 0x45, 0x51, 0x22, 0x1f, 0x45, 0x8a, 0x5a, 0xcb, 0x12, 0x4d, 0x3b, 0xb6, 0x8c, 0x24, - 0xad, 0xad, 0x24, 0x1a, 0x57, 0xed, 0xd8, 0xb5, 0x93, 0x38, 0x51, 0x24, 0xd5, 0xa3, 0xd8, 0x96, - 0x55, 0xd0, 0x76, 0xe3, 0x13, 0x06, 0x26, 0x56, 0x12, 0x6c, 0x12, 0x40, 0x00, 0x50, 0xb5, 0x7a, - 0xed, 0x27, 0xe8, 0xad, 0xc7, 0x1e, 0x32, 0xd3, 0x53, 0x2f, 0x9d, 0xe9, 0xa5, 0xb7, 0x4e, 0x8f, - 0x9d, 0x7e, 0x9e, 0xf6, 0xd2, 0x99, 0xbe, 0xfd, 0x83, 0xc5, 0xe2, 0x0f, 0x65, 0xc9, 0x99, 0x49, - 0x7c, 0xc3, 0xbe, 0xf7, 0x76, 0xf7, 0xed, 0x7b, 0x6f, 0xdf, 0xbe, 0xdf, 0x2e, 0xa0, 0x61, 0x07, - 0xee, 0x5a, 0x10, 0xfa, 0xb1, 0x4f, 0x66, 0xc3, 0xb1, 0x17, 0xbb, 0x23, 0x6a, 0xac, 0x42, 0xfb, - 0x19, 0x0d, 0x23, 0xd7, 0xf7, 0x4c, 0xfa, 0xed, 0x98, 0x46, 0x31, 0xe9, 0xc2, 0xec, 0x91, 0xa0, - 0x74, 0x2b, 0x2b, 0x95, 0xeb, 0x0d, 0x33, 0x69, 0x1a, 0x7f, 0xae, 0xc0, 0xbc, 0x12, 0x8e, 0x02, - 0xdf, 0x8b, 0xe8, 0x64, 0x69, 0x72, 0x0d, 0xe6, 0xe4, 0x24, 0x96, 0x67, 0x8f, 0x68, 0x77, 0x8a, - 0xb3, 0x9b, 0x92, 0xb6, 0x8b, 0x24, 0xf2, 0x53, 0x98, 0x4f, 0x44, 0x92, 0x41, 0xaa, 0x5c, 0xaa, - 0x2d, 0xc9, 0x72, 0x36, 0xb2, 0x06, 0xe7, 0x13, 0x41, 0x5c, 0x83, 0x12, 0x9e, 0xe6, 0xc2, 0x0b, - 0x92, 0xb5, 0x11, 0xb8, 0x52, 0xde, 0xd8, 0x80, 0xc6, 0xd6, 0x6e, 0xff, 0x71, 0x10, 0xb3, 0xce, - 0xa8, 0x62, 0x44, 0x43, 0xd6, 0x07, 0x55, 0xac, 0x32, 0x15, 0x65, 0x93, 0xf4, 0xa0, 0x1e, 0x51, - 0x3b, 0x1c, 0x1c, 0xd2, 0x08, 0xd5, 0x63, 0x2c, 0xd5, 0x36, 0xfe, 0x52, 0x81, 0xe6, 0x9e, 0x1f, - 0xc6, 0x8f, 0xec, 0x20, 0x70, 0xbd, 0x03, 0x42, 0x60, 0x9a, 0x2f, 0x43, 0xac, 0x92, 0x7f, 0x93, - 0x4f, 0xa0, 0xce, 0xcd, 0x39, 0xf0, 0x87, 0x7c, 0x79, 0xed, 0xf5, 0x85, 0x35, 0xa9, 0xcc, 0xda, - 0x9e, 0x64, 0x98, 0x4a, 0x84, 0x7c, 0x08, 0xed, 0x81, 0xef, 0xc5, 0xb6, 0xeb, 0xd1, 0xd0, 0x0a, - 0x70, 0x6c, 0xbe, 0xda, 0x9a, 0xd9, 0x52, 0x54, 0x36, 0x21, 0xb9, 0x04, 0x8d, 0x43, 0x3f, 0x8a, - 0x85, 0xc4, 0x34, 0x97, 0xa8, 0x33, 0x02, 0x67, 0x2e, 0xc3, 0x2c, 0x67, 0xba, 0x41, 0xb7, 0xc6, - 0x35, 0x99, 0x61, 0xcd, 0x9d, 0xc0, 0xf8, 0xae, 0x02, 0xb5, 0x47, 0x3e, 0x4e, 0x5e, 0xaa, 0x69, - 0x76, 0x6a, 0x3b, 0x3e, 0x94, 0xee, 0xd0, 0xa6, 0x46, 0x62, 0x3a, 0x35, 0x93, 0x10, 0xae, 0x10, - 0x53, 0x33, 0x26, 0x5a, 0x2b, 0xa4, 0xb6, 0xe3, 0x7b, 0xc3, 0x63, 0xae, 0x56, 0xdd, 0x54, 0x6d, - 0xe6, 0xc9, 0x88, 0x0e, 0x5d, 0x6f, 0xfc, 0xda, 0x0a, 0xe9, 0xd0, 0x7e, 0x41, 0x87, 0x5c, 0xbd, - 0xba, 0xd9, 0x96, 0x64, 0x53, 0x50, 0x8d, 0x97, 0x30, 0xcf, 0x5c, 0x1f, 0x05, 0xf6, 0x80, 0x4a, - 0xff, 0x60, 0xa0, 0xf0, 0x49, 0x3d, 0x1a, 0xff, 0xd6, 0x0f, 0x5f, 0x71, 0xbd, 0xeb, 0x66, 0x93, - 0xd1, 0x76, 0x05, 0x89, 0x5c, 0x84, 0xba, 0xd0, 0xcb, 0x75, 0xb8, 0xe2, 0x75, 0x93, 0x5b, 0x61, - 0xcf, 0x75, 0x14, 0xcb, 0x0d, 0x06, 0x5c, 0x63, 0xc9, 0xda, 0x09, 0x06, 0xc6, 0xef, 0x2b, 0x70, - 0xe1, 0x21, 0x9b, 0x7c, 0xcf, 0x77, 0xfa, 0xb6, 0xe7, 0xbc, 0xf0, 0x5f, 0x6f, 0xfa, 0xde, 0xbe, - 0x7b, 0x40, 0xde, 0x87, 0xd6, 0xe0, 0x20, 0xf4, 0xc7, 0x01, 0xae, 0x34, 0xa4, 0x5e, 0x2c, 0x6d, - 0x35, 0x27, 0x88, 0x7b, 0x9c, 0x46, 0xb6, 0x61, 0xc1, 0x4b, 0x54, 0xb5, 0x7c, 0xae, 0x6b, 0xc4, - 0x67, 0x6f, 0xae, 0x77, 0x95, 0x9b, 0x73, 0x8b, 0x31, 0x3b, 0x5e, 0x96, 0x10, 0x19, 0x21, 0x90, - 0x74, 0xfe, 0x47, 0x34, 0xb6, 0x1d, 0x3b, 0xb6, 0x4b, 0x9d, 0xd4, 0x81, 0xea, 0x58, 0x2e, 0xb0, - 0x61, 0xb2, 0x4f, 0x72, 0x19, 0x1a, 0x6a, 0x3c, 0xe9, 0x8f, 0x94, 0xc0, 0x02, 0xdb, 0x8e, 0x63, - 0x3a, 0x0a, 0x44, 0x98, 0xb4, 0xcc, 0xa4, 0x69, 0xfc, 0x7d, 0x1a, 0x3a, 0x85, 0x45, 0xdf, 0x86, - 0xfa, 0x48, 0x4e, 0xcf, 0xa7, 0x6d, 0xae, 0x5f, 0x4a, 0xa3, 0xb5, 0xa0, 0xa1, 0xa9, 0x84, 0x99, - 0xe3, 0x99, 0x49, 0xb5, 0x5d, 0xac, 0xda, 0xcc, 0x92, 0x43, 0xff, 0xc0, 0x72, 0xdc, 0x90, 0x0e, - 0x62, 0x3f, 0x3c, 0x96, 0x5a, 0xce, 0x21, 0x71, 0x2b, 0xa1, 0x91, 0x9f, 0x43, 0xd3, 0xf1, 0x22, - 0x65, 0xc3, 0x69, 0x3e, 0x39, 0x51, 0x93, 0xab, 0xad, 0x6a, 0x02, 0x8a, 0x49, 0xbb, 0x91, 0x3b, - 0xd0, 0x62, 0x3b, 0xc0, 0x1a, 0x89, 0x0d, 0x18, 0x61, 0x40, 0x55, 0xb1, 0xdb, 0xa2, 0xa6, 0xb3, - 0xda, 0x9d, 0xe6, 0x5c, 0x90, 0x36, 0x22, 0xf2, 0x39, 0xcc, 0xf0, 0x68, 0x8b, 0xba, 0x33, 0xbc, - 0xcf, 0x87, 0x25, 0xeb, 0x14, 0x46, 0x59, 0x7b, 0xc8, 0xe5, 0xb6, 0xbd, 0x38, 0x3c, 0x36, 0x65, - 0x27, 0xf2, 0x10, 0x9a, 0xb6, 0xe7, 0xf9, 0xb1, 0x2d, 0xd4, 0x9d, 0xe5, 0x63, 0xac, 0x4e, 0x1e, - 0x63, 0x23, 0x15, 0x16, 0x03, 0xe9, 0xdd, 0xc9, 0x2f, 0xa0, 0xc6, 0x77, 0x40, 0xb7, 0xce, 0x97, - 0x7d, 0x45, 0x8d, 0x53, 0x1a, 0x9a, 0xa6, 0x10, 0xee, 0xdd, 0x81, 0xa6, 0xa6, 0x1a, 0x0b, 0x8d, - 0x57, 0xf4, 0x58, 0x46, 0x0b, 0xfb, 0x24, 0x8b, 0x50, 0x3b, 0xb2, 0x87, 0xe3, 0xc4, 0x23, 0xa2, - 0x71, 0x77, 0xea, 0x97, 0x95, 0xde, 0x3d, 0xe8, 0xe4, 0x35, 0x3a, 0x4b, 0x7f, 0x63, 0x07, 0x16, - 0xcd, 0xb1, 0x97, 0x2a, 0x96, 0x1c, 0x0c, 0x3f, 0x83, 0x99, 0x01, 0xd7, 0x51, 0x46, 0xcf, 0xc5, - 0x89, 0x16, 0x31, 0xa5, 0xa0, 0xf1, 0x39, 0x5c, 0xc8, 0x0d, 0x25, 0x8f, 0x8d, 0x0f, 0xa0, 0x1d, - 0xf8, 0x8e, 0x15, 0x09, 0xb2, 0x85, 0x51, 0x2f, 0x77, 0x60, 0xa0, 0x64, 0x77, 0x1c, 0xd6, 0xbd, - 0x1f, 0xfb, 0x41, 0x51, 0x95, 0xd3, 0x75, 0xef, 0xc2, 0x52, 0xbe, 0xbb, 0x98, 0xde, 0xf8, 0x02, - 0x96, 0x4d, 0x3a, 0xf2, 0x8f, 0xe8, 0xdb, 0x0e, 0xdd, 0x83, 0x6e, 0x71, 0x80, 0x74, 0xf0, 0x94, - 0xda, 0x47, 0x37, 0x8c, 0xa3, 0xb3, 0x0d, 0x7e, 0x43, 0x1f, 0x40, 0xa6, 0x40, 0x31, 0x0e, 0x69, - 0xc3, 0x14, 0x66, 0x7e, 0xd1, 0x09, 0xbf, 0x8c, 0xe7, 0xd0, 0xd8, 0xd5, 0xf3, 0x81, 0x9e, 0x43, - 0xf1, 0xa0, 0x93, 0x4d, 0xb2, 0x0e, 0xb3, 0xa7, 0x4d, 0x60, 0x89, 0xa0, 0xf1, 0xa0, 0x90, 0x3c, - 0xa5, 0x0e, 0xeb, 0x00, 0x2a, 0x07, 0x45, 0x32, 0x16, 0x48, 0x71, 0x3c, 0x53, 0x93, 0x32, 0xbe, - 0xcb, 0x24, 0x24, 0x6d, 0x31, 0x8e, 0x5a, 0x8c, 0x93, 0x49, 0x50, 0x53, 0x67, 0x49, 0x50, 0x6b, - 0x50, 0x8b, 0x70, 0x48, 0x91, 0x22, 0xdb, 0xda, 0xe2, 0x64, 0xaf, 0xaf, 0xc4, 0x94, 0xd4, 0x14, - 0x62, 0xe4, 0x3d, 0x80, 0x01, 0x1e, 0x5d, 0x31, 0x75, 0x2c, 0x5b, 0xe4, 0xce, 0xaa, 0xd9, 0x90, - 0x94, 0x8d, 0x98, 0xdc, 0x4d, 0xed, 0x58, 0xe3, 0x6a, 0xac, 0x94, 0xa8, 0x91, 0xf1, 0x4b, 0x6a, - 0x69, 0xb5, 0xdb, 0x67, 0x4e, 0xde, 0xed, 0xb2, 0x9f, 0x10, 0xd6, 0x12, 0xd6, 0xec, 0xc4, 0x84, - 0x25, 0x7a, 0x9c, 0x26, 0x61, 0xd5, 0x27, 0x26, 0x2c, 0x39, 0xc6, 0x89, 0x09, 0xeb, 0xc7, 0x4c, - 0x3d, 0x8f, 0xa0, 0x5b, 0xdc, 0x3a, 0x32, 0x65, 0x60, 0xfa, 0x89, 0x38, 0xe5, 0x84, 0xf4, 0x23, - 0xbb, 0x48, 0x41, 0xe3, 0x7f, 0x15, 0x3d, 0xea, 0x7e, 0xe5, 0x0e, 0x63, 0x1a, 0x96, 0x9e, 0xbc, - 0x22, 0x12, 0xa7, 0x54, 0x24, 0x9e, 0x35, 0xa0, 0xfa, 0xd0, 0xe6, 0xae, 0xb0, 0xb0, 0xda, 0xe1, - 0x67, 0x1e, 0x06, 0x15, 0xf3, 0xc1, 0xc7, 0x25, 0x3a, 0x0a, 0x35, 0x84, 0x1f, 0xfb, 0x52, 0x5c, - 0x78, 0xa1, 0x35, 0xd4, 0x69, 0xbd, 0x2f, 0x81, 0x14, 0x85, 0xce, 0x64, 0xce, 0xaf, 0xd9, 0x16, - 0x66, 0x85, 0x63, 0x49, 0x2a, 0xdf, 0xe7, 0x6a, 0x9c, 0x60, 0x4b, 0xa1, 0xa7, 0x29, 0x05, 0x8d, - 0x3f, 0x4e, 0x01, 0xa4, 0xcc, 0x77, 0x76, 0xef, 0xde, 0x56, 0x3b, 0x49, 0x94, 0x0b, 0x57, 0x4b, - 0xb4, 0x28, 0xdb, 0x43, 0xdf, 0x23, 0xea, 0x8d, 0x4d, 0x58, 0xca, 0x9b, 0x59, 0xc6, 0xec, 0x0d, - 0xa8, 0xb9, 0x58, 0x91, 0x09, 0xe0, 0xd1, 0x5c, 0x3f, 0x5f, 0xa2, 0x8c, 0x29, 0x24, 0x8c, 0x6b, - 0xd0, 0xd8, 0x19, 0xd9, 0x07, 0xb4, 0x1f, 0xd0, 0x01, 0x9b, 0xcb, 0x65, 0x0d, 0x39, 0xbf, 0x68, - 0x18, 0xeb, 0x50, 0x7f, 0x40, 0x8f, 0x9f, 0xb1, 0x79, 0x4f, 0xab, 0x9f, 0xf1, 0xaf, 0x0a, 0x2c, - 0xf3, 0xd4, 0xb3, 0x99, 0x14, 0xfa, 0xa8, 0x9c, 0x3f, 0x0e, 0x31, 0x29, 0x73, 0x53, 0x06, 0x63, - 0x2b, 0xa0, 0xa1, 0xeb, 0x0b, 0x5f, 0x32, 0x53, 0x06, 0xe3, 0x3d, 0x4e, 0x60, 0x60, 0x80, 0xb1, - 0xbf, 0x1d, 0xfb, 0xd2, 0xa7, 0x55, 0xb3, 0x8e, 0x84, 0x5f, 0xb3, 0x76, 0xd2, 0x37, 0x3a, 0xc4, - 0x5a, 0x39, 0xe2, 0xbe, 0x13, 0x7d, 0xfb, 0x9c, 0x80, 0x01, 0x76, 0x61, 0x84, 0xe7, 0x63, 0x78, - 0x6c, 0x0d, 0xdd, 0x91, 0x8b, 0xd5, 0xb9, 0x67, 0xbd, 0x38, 0x8e, 0x69, 0x24, 0x1d, 0x46, 0x04, - 0xf3, 0x21, 0xe3, 0xed, 0x78, 0x5f, 0x31, 0x0e, 0x31, 0xa0, 0xe5, 0xfb, 0x23, 0x2b, 0x1a, 0xf8, - 0x21, 0xa2, 0x3c, 0xe7, 0x25, 0xcf, 0xbd, 0x55, 0xb3, 0x89, 0xc4, 0x3e, 0xa3, 0x6d, 0x38, 0x2f, - 0x0d, 0x1b, 0x5a, 0xfd, 0x6d, 0xbe, 0x1c, 0x89, 0x1d, 0x70, 0x33, 0x8f, 0x23, 0x19, 0xc6, 0xb8, - 0x99, 0xd9, 0x37, 0xa3, 0x85, 0xfe, 0x30, 0xb1, 0x03, 0xff, 0x66, 0xb4, 0xf8, 0x38, 0x48, 0x6a, - 0x68, 0xfe, 0xcd, 0x0c, 0x36, 0xa4, 0x47, 0x88, 0x54, 0x04, 0x8c, 0x14, 0x0d, 0xc3, 0x01, 0xd8, - 0xb4, 0x03, 0xfb, 0x85, 0x3b, 0x74, 0xe3, 0x63, 0x74, 0x60, 0xc7, 0x76, 0x1c, 0x6b, 0x90, 0x50, - 0x5c, 0x9a, 0x80, 0xc8, 0x79, 0xa4, 0x6f, 0x6a, 0x64, 0xf2, 0x11, 0x2c, 0x38, 0xa1, 0x1f, 0x64, - 0x65, 0x05, 0xaa, 0xec, 0x30, 0x86, 0x2e, 0x6c, 0xfc, 0xb7, 0x02, 0x8b, 0x59, 0xb7, 0xc8, 0x22, - 0xfd, 0x1e, 0x34, 0xc2, 0xc4, 0x41, 0x72, 0x73, 0xae, 0x64, 0xcf, 0x90, 0xa2, 0x23, 0xcd, 0xb4, - 0x0b, 0xc6, 0xff, 0x5c, 0x4e, 0x81, 0x4a, 0x26, 0xf0, 0xd2, 0xb5, 0x99, 0x19, 0x41, 0xf2, 0x45, - 0x8a, 0xe0, 0x92, 0x52, 0xa1, 0xca, 0xfb, 0x2e, 0xa9, 0xbe, 0x19, 0xd3, 0x2b, 0x64, 0x97, 0xd4, - 0xeb, 0x3f, 0x91, 0xae, 0xc8, 0x57, 0xf7, 0xbc, 0xcf, 0x53, 0xe4, 0x08, 0xf7, 0x18, 0xdf, 0x40, - 0x43, 0x91, 0x12, 0xc8, 0x23, 0x62, 0x8f, 0x43, 0x1e, 0xa4, 0x1c, 0xc8, 0x5c, 0x8c, 0x14, 0xfc, - 0x64, 0xd8, 0x12, 0x6d, 0xed, 0xb2, 0x59, 0xec, 0xa1, 0x85, 0x14, 0xa6, 0x59, 0x15, 0xb9, 0xed, - 0x94, 0x7c, 0x1f, 0xa9, 0x88, 0xfa, 0x17, 0x94, 0x71, 0x4e, 0x04, 0x5a, 0x1a, 0x70, 0x9a, 0xca, - 0x02, 0xa7, 0xff, 0xd4, 0x60, 0x3e, 0xef, 0x92, 0x5b, 0x05, 0xdc, 0xd4, 0x4b, 0xcd, 0x99, 0x9f, - 0x4f, 0xcb, 0x6c, 0xd7, 0x93, 0x4d, 0x3c, 0x95, 0xb3, 0x88, 0xda, 0xe7, 0x72, 0x63, 0x33, 0x7d, - 0x06, 0xfe, 0x68, 0x84, 0x09, 0x81, 0xaf, 0x0c, 0x0b, 0x37, 0xd9, 0x64, 0xda, 0xdb, 0xe1, 0x41, - 0xc4, 0x8f, 0x13, 0xd4, 0x9e, 0x7d, 0x93, 0xab, 0xd0, 0x64, 0xa5, 0x06, 0x22, 0x1d, 0x06, 0xbb, - 0xe4, 0x35, 0x00, 0x48, 0x12, 0x82, 0x2e, 0x04, 0xfb, 0xd3, 0xd4, 0x3b, 0x4a, 0xc0, 0x4f, 0x7a, - 0x25, 0x91, 0x24, 0x0f, 0x93, 0xb3, 0xd1, 0x61, 0x33, 0x23, 0x76, 0x61, 0x90, 0x14, 0x1d, 0x6d, - 0x25, 0xc8, 0xef, 0x11, 0x4c, 0xc9, 0x25, 0x9f, 0xa9, 0x94, 0x2a, 0x0a, 0x8b, 0x0f, 0x8a, 0xab, - 0x3f, 0x01, 0x4c, 0x3d, 0xc8, 0xd6, 0x26, 0x0d, 0x3e, 0xc4, 0x8d, 0x89, 0x43, 0x9c, 0x8c, 0xa5, - 0xae, 0x00, 0x04, 0xa1, 0x7b, 0xe4, 0x0e, 0xe9, 0x01, 0x75, 0xba, 0xc0, 0xe1, 0xbe, 0x46, 0xe1, - 0x17, 0x4a, 0xf2, 0x4a, 0xc2, 0x0a, 0x7d, 0x3f, 0xde, 0x8f, 0xba, 0x4d, 0x71, 0x0d, 0x91, 0x90, - 0x4d, 0x4e, 0x65, 0xb7, 0x06, 0x0c, 0xb6, 0xf2, 0x7b, 0x8e, 0x39, 0x51, 0x2b, 0x63, 0x9b, 0x5f, - 0x73, 0x2c, 0xb2, 0x03, 0xc9, 0x71, 0xbd, 0x6e, 0x8b, 0xf7, 0x14, 0x0d, 0x96, 0xef, 0xf8, 0x87, - 0xe5, 0x7b, 0x08, 0xc5, 0xdb, 0x9c, 0xd5, 0xe0, 0x94, 0xc7, 0x48, 0x60, 0x51, 0x1b, 0xc7, 0xc7, - 0xdd, 0x79, 0x4e, 0x67, 0x9f, 0x88, 0x79, 0x65, 0x21, 0xd8, 0xe1, 0xde, 0x7f, 0x6f, 0xc2, 0x26, - 0x7e, 0x67, 0x50, 0xdf, 0x5f, 0x2b, 0xb0, 0xb4, 0xc9, 0x8f, 0x51, 0x2d, 0xc1, 0x9c, 0x01, 0xb5, - 0x90, 0x9b, 0x0a, 0x1e, 0xe6, 0x21, 0x46, 0x7e, 0xb1, 0x52, 0x8e, 0x7c, 0x09, 0xed, 0x64, 0x4c, - 0xd9, 0xb3, 0xfa, 0x26, 0x60, 0xd9, 0x8a, 0xf4, 0xa6, 0xf1, 0x19, 0x2c, 0x17, 0x74, 0x96, 0x47, - 0xef, 0x35, 0x4c, 0x84, 0xea, 0xc6, 0x4b, 0xa9, 0xdc, 0x54, 0x34, 0xc4, 0x59, 0x77, 0x19, 0xbc, - 0xb4, 0xc3, 0xb8, 0xb0, 0xe0, 0x53, 0xf4, 0xe5, 0xd8, 0x32, 0xdb, 0x57, 0xc2, 0xbf, 0x3e, 0x2c, - 0x32, 0xd4, 0xf9, 0x16, 0x83, 0xb2, 0x3c, 0xc0, 0x96, 0xed, 0x8f, 0x63, 0x99, 0xff, 0x92, 0xa6, - 0xb1, 0x2c, 0x90, 0x70, 0x71, 0xb6, 0x4f, 0x61, 0x49, 0x00, 0xd1, 0xb7, 0x59, 0xc4, 0xc5, 0x04, - 0x06, 0x17, 0xc7, 0xfd, 0xd3, 0x94, 0x96, 0x08, 0xcf, 0x50, 0x39, 0x7f, 0x92, 0x2d, 0xe7, 0x96, - 0x8b, 0x41, 0x90, 0xa9, 0xe6, 0x8a, 0xa1, 0x35, 0x5d, 0x12, 0x5a, 0x66, 0xa1, 0xbc, 0x16, 0xc5, - 0xdd, 0x47, 0xc5, 0xd1, 0x7f, 0xc0, 0xea, 0x7a, 0x47, 0x54, 0xd7, 0x6a, 0x6a, 0x85, 0xf2, 0x6f, - 0xe6, 0xaa, 0xeb, 0xee, 0x24, 0x35, 0x55, 0x71, 0xfd, 0xcf, 0x2a, 0x34, 0x14, 0xaf, 0x50, 0x5b, - 0xdf, 0x2a, 0xd4, 0xd6, 0x67, 0x3c, 0x80, 0xaa, 0x6f, 0x3a, 0x80, 0xb0, 0xd4, 0xe3, 0x1f, 0x56, - 0x48, 0xf7, 0xa5, 0x07, 0xea, 0x9c, 0x60, 0xd2, 0xfd, 0xd4, 0xa5, 0xb5, 0x53, 0xb9, 0xf4, 0x56, - 0xee, 0xf2, 0xed, 0x4a, 0x51, 0xbe, 0xf4, 0xa0, 0xd8, 0x2e, 0xbb, 0x75, 0x7b, 0xbf, 0xa4, 0xf3, - 0x3b, 0x8b, 0x5e, 0x1f, 0x0a, 0x1c, 0xa0, 0x07, 0x84, 0x4c, 0x46, 0xeb, 0x58, 0x2d, 0x2b, 0xaa, - 0x04, 0x03, 0xa4, 0xb8, 0x34, 0x53, 0x93, 0x62, 0x3b, 0x3b, 0x63, 0xe0, 0xf4, 0x16, 0xe9, 0x14, - 0x3b, 0xfb, 0x0f, 0x7a, 0x1d, 0x33, 0xe1, 0xba, 0xe5, 0x6d, 0xc3, 0xea, 0x8c, 0x5b, 0xfc, 0x0d, - 0x80, 0x8d, 0x1f, 0xac, 0x98, 0x48, 0x05, 0x5b, 0xd4, 0xfc, 0x0d, 0x49, 0x41, 0x36, 0x16, 0x3b, - 0xfb, 0xae, 0xe7, 0x46, 0x87, 0x82, 0x3f, 0xc3, 0xf9, 0x90, 0x90, 0x36, 0xf8, 0x6b, 0x09, 0x7d, - 0x8d, 0x08, 0x63, 0xe0, 0x3b, 0x14, 0x83, 0x86, 0xbf, 0x96, 0x30, 0xc2, 0x26, 0xb6, 0xd3, 0x1d, - 0x50, 0x3f, 0xd3, 0x0e, 0x68, 0xe4, 0x76, 0xc0, 0x12, 0xcc, 0xa0, 0xbe, 0x91, 0xef, 0xf1, 0x92, - 0xa3, 0x61, 0xca, 0x96, 0x56, 0x19, 0x35, 0x27, 0x55, 0x46, 0x27, 0xdc, 0xda, 0xe4, 0x2a, 0xa3, - 0xb9, 0x49, 0x95, 0xd1, 0x69, 0x2e, 0x6d, 0xb4, 0x62, 0xae, 0x75, 0x52, 0x31, 0xf7, 0x63, 0x6e, - 0x8f, 0x07, 0x78, 0x58, 0xe7, 0x03, 0x5a, 0xee, 0x8f, 0x9b, 0xb9, 0xbb, 0x9d, 0xee, 0x24, 0x2b, - 0xa8, 0xab, 0x9d, 0x97, 0xd0, 0xdc, 0x7e, 0x8d, 0xee, 0x3b, 0xfd, 0xe1, 0x8a, 0xaa, 0x0e, 0x46, - 0x8e, 0x44, 0x64, 0xec, 0x33, 0x29, 0xda, 0xaa, 0x69, 0xd1, 0xa6, 0x6a, 0x3f, 0x16, 0xa6, 0x73, - 0xb2, 0xf6, 0x33, 0xee, 0xc1, 0x9c, 0x98, 0x4b, 0x6a, 0xbb, 0xc4, 0xb4, 0x75, 0xd8, 0x29, 0x5d, - 0xe1, 0x62, 0xb2, 0x25, 0xe9, 0x34, 0x0c, 0xf9, 0xda, 0x05, 0x1d, 0x5b, 0xc6, 0x6d, 0x68, 0xf2, - 0x78, 0x93, 0xc7, 0xe8, 0x75, 0x1d, 0xdc, 0x9f, 0x14, 0x94, 0x0c, 0xd0, 0xb0, 0x84, 0xc2, 0xe9, - 0x6a, 0xf7, 0x7f, 0x9c, 0x3b, 0x5d, 0x16, 0xb3, 0xfd, 0x73, 0x27, 0xcb, 0x2b, 0xa8, 0x71, 0x72, - 0x61, 0xf7, 0x5f, 0x62, 0x40, 0x33, 0xf0, 0xad, 0xd8, 0x3e, 0x50, 0x8f, 0x9f, 0x8c, 0xf0, 0x04, - 0xdb, 0xfc, 0xed, 0x96, 0x31, 0x1d, 0x17, 0x27, 0x8e, 0x23, 0x89, 0x4a, 0x9a, 0x8c, 0xb6, 0x25, - 0x48, 0xac, 0x18, 0x88, 0xdc, 0xdf, 0x51, 0x6e, 0xa9, 0x69, 0x93, 0x7f, 0x63, 0x39, 0x46, 0x74, - 0x7d, 0xa5, 0xb9, 0x30, 0x34, 0xf9, 0x72, 0x92, 0xc4, 0xd7, 0xce, 0x2a, 0x6c, 0x4a, 0x2e, 0x9a, - 0x99, 0x08, 0x0b, 0x64, 0x92, 0xdd, 0xe9, 0xad, 0xf5, 0x29, 0x9c, 0xcf, 0xf4, 0x57, 0x4f, 0x0d, - 0x99, 0x01, 0xf2, 0xb3, 0xcb, 0xce, 0xff, 0xae, 0x00, 0x6c, 0x8c, 0xe3, 0x43, 0x89, 0xf9, 0x7a, - 0x50, 0x67, 0x60, 0x55, 0x2b, 0x77, 0x54, 0x9b, 0xf1, 0x02, 0x3b, 0x8a, 0x10, 0x70, 0x25, 0x85, - 0x8f, 0x6a, 0x73, 0xbc, 0x36, 0x56, 0x6f, 0xa7, 0xfc, 0x9b, 0xbd, 0xbd, 0x8a, 0x07, 0x67, 0x0b, - 0xf1, 0x2a, 0x22, 0xf5, 0x48, 0x9e, 0xb0, 0x2d, 0x41, 0xdd, 0x10, 0x44, 0x26, 0xe6, 0x3a, 0x14, - 0x55, 0x8b, 0x8f, 0xad, 0xd8, 0x7f, 0x45, 0x3d, 0x89, 0xec, 0x5a, 0x09, 0xf5, 0x09, 0x23, 0x32, - 0xb1, 0x90, 0x1e, 0xa0, 0x95, 0xc3, 0x44, 0x6c, 0x46, 0x88, 0x25, 0x54, 0x2e, 0xc6, 0xde, 0xea, - 0x3b, 0x7b, 0xe3, 0xe1, 0x50, 0x2c, 0xf2, 0xac, 0xb6, 0x44, 0x20, 0x25, 0xd6, 0x91, 0xbf, 0x3e, - 0x48, 0x4d, 0x24, 0x17, 0xf7, 0xfd, 0x6b, 0xf8, 0xf3, 0xb0, 0xa0, 0x29, 0x2a, 0xcb, 0x4f, 0x8c, - 0x05, 0x51, 0x99, 0xbe, 0x9d, 0xfe, 0xc6, 0x05, 0x38, 0x9f, 0xe9, 0x2f, 0x86, 0x5d, 0xbd, 0x0c, - 0xf5, 0xe4, 0x5d, 0x9e, 0xcc, 0x42, 0xf5, 0xc9, 0xe6, 0x5e, 0xe7, 0x1c, 0xfb, 0x78, 0xba, 0xb5, - 0xd7, 0xa9, 0xac, 0xae, 0xc2, 0x7c, 0xee, 0xd2, 0x91, 0x34, 0xa0, 0x66, 0x6e, 0x6f, 0x6c, 0x3d, - 0x47, 0xb1, 0x39, 0xa8, 0xef, 0x3e, 0x7e, 0x22, 0x5a, 0x95, 0xd5, 0x4d, 0x68, 0x67, 0x8f, 0x3b, - 0xd2, 0x84, 0xd9, 0x4d, 0xe4, 0x3e, 0xd9, 0xde, 0x42, 0x61, 0x6c, 0x98, 0x4f, 0x77, 0x77, 0x77, - 0x76, 0xef, 0x77, 0x2a, 0x04, 0x60, 0x66, 0xfb, 0x9b, 0x1d, 0xc6, 0x98, 0x62, 0x8c, 0xa7, 0xbb, - 0x0f, 0x76, 0x1f, 0xff, 0x66, 0xb7, 0x53, 0x5d, 0xff, 0x47, 0x1d, 0xda, 0xa6, 0x58, 0x42, 0x1f, - 0x63, 0xc1, 0x45, 0x20, 0x79, 0x0f, 0x66, 0x93, 0x9f, 0x1e, 0xd2, 0x83, 0x35, 0xfb, 0x87, 0x46, - 0xaf, 0x5b, 0x64, 0x48, 0xb3, 0x9d, 0x23, 0x7b, 0xd0, 0xca, 0xbc, 0xb8, 0x91, 0x14, 0x78, 0x96, - 0x3d, 0xea, 0xf5, 0xae, 0x4c, 0x62, 0xab, 0x11, 0xfb, 0xd0, 0xce, 0xbe, 0xa2, 0x91, 0xb4, 0x4f, - 0xe9, 0xeb, 0x5c, 0xef, 0xea, 0x44, 0xbe, 0x1a, 0xf4, 0x39, 0x74, 0xf2, 0xef, 0x67, 0x24, 0xbd, - 0xe7, 0x9a, 0xf0, 0x36, 0xd7, 0xbb, 0x76, 0x82, 0x84, 0x3e, 0x74, 0xe1, 0xa5, 0x69, 0x65, 0xf2, - 0x5b, 0x41, 0x61, 0xe8, 0x49, 0x0f, 0x10, 0xc2, 0x14, 0xd9, 0x8b, 0x5e, 0xa2, 0xbf, 0xef, 0x94, - 0x5c, 0xb4, 0x6b, 0xa6, 0x28, 0xbf, 0x21, 0xc6, 0x41, 0x9f, 0x61, 0xa5, 0x96, 0xc5, 0xb0, 0x24, - 0xed, 0x55, 0x8e, 0xc8, 0x7b, 0x2b, 0x93, 0x05, 0xb2, 0x7e, 0xd3, 0x11, 0x6a, 0xc6, 0x6f, 0x25, - 0xb0, 0x37, 0xe3, 0xb7, 0x52, 0x68, 0xcb, 0xc3, 0x2b, 0x83, 0x43, 0xb5, 0xf0, 0x2a, 0x03, 0xbd, - 0xbd, 0x2b, 0x93, 0xd8, 0xfa, 0xf2, 0x73, 0x18, 0x54, 0x5b, 0x7e, 0x39, 0xb4, 0xed, 0xad, 0x4c, - 0x16, 0xc8, 0xfb, 0x2a, 0x2d, 0xc6, 0x73, 0xbe, 0x2a, 0xc0, 0xb6, 0x9c, 0xaf, 0x8a, 0x55, 0xbc, - 0xf4, 0x55, 0xae, 0xaa, 0xbe, 0x3a, 0xb1, 0x54, 0x29, 0xfa, 0xaa, 0xbc, 0xfa, 0xc1, 0x71, 0xef, - 0xc0, 0x34, 0xab, 0x30, 0x48, 0x7a, 0x96, 0x6b, 0xc5, 0x4d, 0xef, 0x42, 0x8e, 0x9a, 0x74, 0xbb, - 0x5e, 0xb9, 0x59, 0x59, 0xff, 0xdb, 0x14, 0xcc, 0x89, 0xf4, 0x27, 0x33, 0xc8, 0x7d, 0x80, 0xf4, - 0x10, 0x26, 0xbd, 0xcc, 0xa2, 0x32, 0x95, 0x44, 0xef, 0x52, 0x29, 0x4f, 0x29, 0xf5, 0xb5, 0x2c, - 0x5b, 0xe4, 0x42, 0x2f, 0xe5, 0xb2, 0x6d, 0x66, 0x91, 0x97, 0xcb, 0x99, 0x6a, 0xac, 0x2d, 0x68, - 0xa8, 0x24, 0x4f, 0xb4, 0xb3, 0x21, 0x77, 0x42, 0xf5, 0x7a, 0x65, 0x2c, 0x5d, 0x23, 0x2d, 0xab, - 0x6b, 0x1a, 0x15, 0xcf, 0x0a, 0x4d, 0xa3, 0x92, 0x83, 0xc0, 0x38, 0xf7, 0xff, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xce, 0xf1, 0x39, 0x6f, 0x0d, 0x27, 0x00, 0x00, + // 2828 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x72, 0x1b, 0xc7, + 0xf1, 0x17, 0x08, 0x82, 0x04, 0x1a, 0x04, 0x08, 0x8e, 0x28, 0x12, 0x82, 0x64, 0x89, 0x5a, 0xdb, + 0xff, 0xbf, 0x44, 0x5b, 0x2c, 0x85, 0x49, 0x49, 0x91, 0x6c, 0xcb, 0xa6, 0x49, 0x46, 0x45, 0x4b, + 0xa2, 0x98, 0x85, 0xa4, 0x58, 0x27, 0xd4, 0x0a, 0x3b, 0x24, 0x57, 0x02, 0x76, 0xd7, 0xbb, 0x0b, + 0x46, 0xcc, 0x35, 0xd7, 0x5c, 0x72, 0xcb, 0x03, 0xb8, 0x2a, 0xa7, 0x5c, 0x52, 0x95, 0x4b, 0x6e, + 0xa9, 0x1c, 0x53, 0x79, 0x90, 0x3c, 0x41, 0x72, 0x4c, 0xcf, 0xc7, 0xce, 0xce, 0x7e, 0x51, 0xa4, + 0x5c, 0x15, 0xeb, 0xb6, 0xd3, 0xdd, 0x33, 0xd3, 0xd3, 0xdd, 0xd3, 0xd3, 0xbf, 0x99, 0x85, 0x86, + 0xe5, 0x3b, 0x6b, 0x7e, 0xe0, 0x45, 0x1e, 0x99, 0x0d, 0x26, 0x6e, 0xe4, 0x8c, 0xa9, 0xb1, 0x0a, + 0xed, 0xe7, 0x34, 0x08, 0x1d, 0xcf, 0x35, 0xe9, 0x77, 0x13, 0x1a, 0x46, 0xa4, 0x0b, 0xb3, 0x47, + 0x82, 0xd2, 0xad, 0xac, 0x54, 0xae, 0x37, 0xcc, 0xb8, 0x69, 0xfc, 0xb1, 0x02, 0xf3, 0x4a, 0x38, + 0xf4, 0x3d, 0x37, 0xa4, 0xe5, 0xd2, 0xe4, 0x1a, 0xcc, 0xc9, 0x49, 0x06, 0xae, 0x35, 0xa6, 0xdd, + 0x29, 0xce, 0x6e, 0x4a, 0xda, 0x2e, 0x92, 0xc8, 0xff, 0xc3, 0x7c, 0x2c, 0x12, 0x0f, 0x52, 0xe5, + 0x52, 0x6d, 0x49, 0x96, 0xb3, 0x91, 0x35, 0x38, 0x1f, 0x0b, 0xe2, 0x1a, 0x94, 0xf0, 0x34, 0x17, + 0x5e, 0x90, 0xac, 0x0d, 0xdf, 0x91, 0xf2, 0xc6, 0x06, 0x34, 0xb6, 0x76, 0xfb, 0x4f, 0xfc, 0x88, + 0x75, 0x46, 0x15, 0x43, 0x1a, 0xb0, 0x3e, 0xa8, 0x62, 0x95, 0xa9, 0x28, 0x9b, 0xa4, 0x07, 0xf5, + 0x90, 0x5a, 0xc1, 0xf0, 0x90, 0x86, 0xa8, 0x1e, 0x63, 0xa9, 0xb6, 0xf1, 0xa7, 0x0a, 0x34, 0xf7, + 0xbc, 0x20, 0x7a, 0x6c, 0xf9, 0xbe, 0xe3, 0x1e, 0x10, 0x02, 0xd3, 0x7c, 0x19, 0x62, 0x95, 0xfc, + 0x9b, 0xdc, 0x84, 0x3a, 0x37, 0xe7, 0xd0, 0x1b, 0xf1, 0xe5, 0xb5, 0xd7, 0x17, 0xd6, 0xa4, 0x32, + 0x6b, 0x7b, 0x92, 0x61, 0x2a, 0x11, 0xf2, 0x31, 0xb4, 0x87, 0x9e, 0x1b, 0x59, 0x8e, 0x4b, 0x83, + 0x81, 0x8f, 0x63, 0xf3, 0xd5, 0xd6, 0xcc, 0x96, 0xa2, 0xb2, 0x09, 0xc9, 0x25, 0x68, 0x1c, 0x7a, + 0x61, 0x24, 0x24, 0xa6, 0xb9, 0x44, 0x9d, 0x11, 0x38, 0x73, 0x19, 0x66, 0x39, 0xd3, 0xf1, 0xbb, + 0x35, 0xae, 0xc9, 0x0c, 0x6b, 0xee, 0xf8, 0xc6, 0xf7, 0x15, 0xa8, 0x3d, 0xf6, 0x70, 0xf2, 0x42, + 0x4d, 0xd3, 0x53, 0x5b, 0xd1, 0xa1, 0x74, 0x87, 0x36, 0x35, 0x12, 0x93, 0xa9, 0x99, 0x84, 0x70, + 0x85, 0x98, 0x9a, 0x31, 0xd1, 0x5a, 0x01, 0xb5, 0x6c, 0xcf, 0x1d, 0x1d, 0x73, 0xb5, 0xea, 0xa6, + 0x6a, 0x33, 0x4f, 0x86, 0x74, 0xe4, 0xb8, 0x93, 0x37, 0x83, 0x80, 0x8e, 0xac, 0x97, 0x74, 0xc4, + 0xd5, 0xab, 0x9b, 0x6d, 0x49, 0x36, 0x05, 0xd5, 0x78, 0x05, 0xf3, 0xcc, 0xf5, 0xa1, 0x6f, 0x0d, + 0xa9, 0xf4, 0x0f, 0x06, 0x0a, 0x9f, 0xd4, 0xa5, 0xd1, 0xaf, 0xbd, 0xe0, 0x35, 0xd7, 0xbb, 0x6e, + 0x36, 0x19, 0x6d, 0x57, 0x90, 0xc8, 0x45, 0xa8, 0x0b, 0xbd, 0x1c, 0x9b, 0x2b, 0x5e, 0x37, 0xb9, + 0x15, 0xf6, 0x1c, 0x5b, 0xb1, 0x1c, 0x7f, 0xc8, 0x35, 0x96, 0xac, 0x1d, 0x7f, 0x68, 0xfc, 0xb6, + 0x02, 0x17, 0x1e, 0xb1, 0xc9, 0xf7, 0x3c, 0xbb, 0x6f, 0xb9, 0xf6, 0x4b, 0xef, 0xcd, 0xa6, 0xe7, + 0xee, 0x3b, 0x07, 0xe4, 0x43, 0x68, 0x0d, 0x0f, 0x02, 0x6f, 0xe2, 0xe3, 0x4a, 0x03, 0xea, 0x46, + 0xd2, 0x56, 0x73, 0x82, 0xb8, 0xc7, 0x69, 0x64, 0x1b, 0x16, 0xdc, 0x58, 0xd5, 0x81, 0xc7, 0x75, + 0x0d, 0xf9, 0xec, 0xcd, 0xf5, 0xae, 0x72, 0x73, 0x66, 0x31, 0x66, 0xc7, 0x4d, 0x13, 0x42, 0x23, + 0x00, 0x92, 0xcc, 0xff, 0x98, 0x46, 0x96, 0x6d, 0x45, 0x56, 0xa1, 0x93, 0x3a, 0x50, 0x9d, 0xc8, + 0x05, 0x36, 0x4c, 0xf6, 0x49, 0x2e, 0x43, 0x43, 0x8d, 0x27, 0xfd, 0x91, 0x10, 0x58, 0x60, 0x5b, + 0x51, 0x44, 0xc7, 0xbe, 0x08, 0x93, 0x96, 0x19, 0x37, 0x8d, 0xbf, 0x4e, 0x43, 0x27, 0xb7, 0xe8, + 0x3b, 0x50, 0x1f, 0xcb, 0xe9, 0xf9, 0xb4, 0xcd, 0xf5, 0x4b, 0x49, 0xb4, 0xe6, 0x34, 0x34, 0x95, + 0x30, 0x73, 0x3c, 0x33, 0xa9, 0xb6, 0x8b, 0x55, 0x9b, 0x59, 0x72, 0xe4, 0x1d, 0x0c, 0x6c, 0x27, + 0xa0, 0xc3, 0xc8, 0x0b, 0x8e, 0xa5, 0x96, 0x73, 0x48, 0xdc, 0x8a, 0x69, 0xe4, 0xa7, 0xd0, 0xb4, + 0xdd, 0x50, 0xd9, 0x70, 0x9a, 0x4f, 0x4e, 0xd4, 0xe4, 0x6a, 0xab, 0x9a, 0x80, 0x62, 0xd2, 0x6e, + 0xe4, 0x2e, 0xb4, 0xd8, 0x0e, 0x18, 0x8c, 0xc5, 0x06, 0x0c, 0x31, 0xa0, 0xaa, 0xd8, 0x6d, 0x51, + 0xd3, 0x59, 0xed, 0x4e, 0x73, 0xce, 0x4f, 0x1a, 0x21, 0xf9, 0x02, 0x66, 0x78, 0xb4, 0x85, 0xdd, + 0x19, 0xde, 0xe7, 0xe3, 0x82, 0x75, 0x0a, 0xa3, 0xac, 0x3d, 0xe2, 0x72, 0xdb, 0x6e, 0x14, 0x1c, + 0x9b, 0xb2, 0x13, 0x79, 0x04, 0x4d, 0xcb, 0x75, 0xbd, 0xc8, 0x12, 0xea, 0xce, 0xf2, 0x31, 0x56, + 0xcb, 0xc7, 0xd8, 0x48, 0x84, 0xc5, 0x40, 0x7a, 0x77, 0xf2, 0x33, 0xa8, 0xf1, 0x1d, 0xd0, 0xad, + 0xf3, 0x65, 0x5f, 0x51, 0xe3, 0x14, 0x86, 0xa6, 0x29, 0x84, 0x7b, 0x77, 0xa1, 0xa9, 0xa9, 0xc6, + 0x42, 0xe3, 0x35, 0x3d, 0x96, 0xd1, 0xc2, 0x3e, 0xc9, 0x22, 0xd4, 0x8e, 0xac, 0xd1, 0x24, 0xf6, + 0x88, 0x68, 0xdc, 0x9b, 0xfa, 0x79, 0xa5, 0x77, 0x1f, 0x3a, 0x59, 0x8d, 0xce, 0xd2, 0xdf, 0xd8, + 0x81, 0x45, 0x73, 0xe2, 0x26, 0x8a, 0xc5, 0x07, 0xc3, 0x4f, 0x60, 0x66, 0xc8, 0x75, 0x94, 0xd1, + 0x73, 0xb1, 0xd4, 0x22, 0xa6, 0x14, 0x34, 0xbe, 0x80, 0x0b, 0x99, 0xa1, 0xe4, 0xb1, 0xf1, 0x11, + 0xb4, 0x7d, 0xcf, 0x1e, 0x84, 0x82, 0x3c, 0xc0, 0xa8, 0x97, 0x3b, 0xd0, 0x57, 0xb2, 0x3b, 0x36, + 0xeb, 0xde, 0x8f, 0x3c, 0x3f, 0xaf, 0xca, 0xe9, 0xba, 0x77, 0x61, 0x29, 0xdb, 0x5d, 0x4c, 0x6f, + 0x7c, 0x09, 0xcb, 0x26, 0x1d, 0x7b, 0x47, 0xf4, 0x5d, 0x87, 0xee, 0x41, 0x37, 0x3f, 0x40, 0x32, + 0x78, 0x42, 0xed, 0xa3, 0x1b, 0x26, 0xe1, 0xd9, 0x06, 0xbf, 0xa1, 0x0f, 0x20, 0x53, 0xa0, 0x18, + 0x87, 0xb4, 0x61, 0x0a, 0x33, 0xbf, 0xe8, 0x84, 0x5f, 0xc6, 0x0b, 0x68, 0xec, 0xea, 0xf9, 0x40, + 0xcf, 0xa1, 0x78, 0xd0, 0xc9, 0x26, 0x59, 0x87, 0xd9, 0xd3, 0x26, 0xb0, 0x58, 0xd0, 0x78, 0x98, + 0x4b, 0x9e, 0x52, 0x87, 0x75, 0x00, 0x95, 0x83, 0x42, 0x19, 0x0b, 0x24, 0x3f, 0x9e, 0xa9, 0x49, + 0x19, 0xdf, 0xa7, 0x12, 0x92, 0xb6, 0x18, 0x5b, 0x2d, 0xc6, 0x4e, 0x25, 0xa8, 0xa9, 0xb3, 0x24, + 0xa8, 0x35, 0xa8, 0x85, 0x38, 0xa4, 0x48, 0x91, 0x6d, 0x6d, 0x71, 0xb2, 0xd7, 0xd7, 0x62, 0x4a, + 0x6a, 0x0a, 0x31, 0xf2, 0x01, 0xc0, 0x10, 0x8f, 0xae, 0x88, 0xda, 0x03, 0x4b, 0xe4, 0xce, 0xaa, + 0xd9, 0x90, 0x94, 0x8d, 0x88, 0xdc, 0x4b, 0xec, 0x58, 0xe3, 0x6a, 0xac, 0x14, 0xa8, 0x91, 0xf2, + 0x4b, 0x62, 0x69, 0xb5, 0xdb, 0x67, 0x4e, 0xde, 0xed, 0xb2, 0x9f, 0x10, 0xd6, 0x12, 0xd6, 0x6c, + 0x69, 0xc2, 0x12, 0x3d, 0x4e, 0x93, 0xb0, 0xea, 0xa5, 0x09, 0x4b, 0x8e, 0x71, 0x62, 0xc2, 0xfa, + 0x31, 0x53, 0xcf, 0x63, 0xe8, 0xe6, 0xb7, 0x8e, 0x4c, 0x19, 0x98, 0x7e, 0x42, 0x4e, 0x39, 0x21, + 0xfd, 0xc8, 0x2e, 0x52, 0xd0, 0xf8, 0x57, 0x45, 0x8f, 0xba, 0x5f, 0x38, 0xa3, 0x88, 0x06, 0xb9, + 0xa8, 0x53, 0xc1, 0x33, 0x75, 0xba, 0xe0, 0xe9, 0x43, 0x9b, 0x9b, 0x7d, 0x80, 0x95, 0x0d, 0x3f, + 0xdf, 0x30, 0xea, 0x98, 0xbd, 0x3f, 0x2d, 0xd0, 0x47, 0x4c, 0x29, 0x7c, 0xd6, 0x97, 0xe2, 0xc2, + 0xe2, 0xad, 0x91, 0x4e, 0xeb, 0x7d, 0x05, 0x24, 0x2f, 0x74, 0x26, 0xd3, 0x7d, 0xc3, 0xb6, 0x2b, + 0x2b, 0x12, 0x0b, 0xd2, 0xf6, 0x3e, 0x57, 0xe3, 0x04, 0xbb, 0x09, 0x3d, 0x4d, 0x29, 0x68, 0xfc, + 0x61, 0x0a, 0x20, 0x61, 0xbe, 0xb7, 0xfb, 0xf4, 0x8e, 0xda, 0x35, 0xa2, 0x34, 0xb8, 0x5a, 0xa0, + 0x45, 0xd1, 0x7e, 0xf9, 0x01, 0x11, 0x6e, 0x6c, 0xc2, 0x52, 0xd6, 0xcc, 0x32, 0x3e, 0x6f, 0x40, + 0xcd, 0xc1, 0xea, 0x4b, 0x80, 0x8c, 0xe6, 0xfa, 0xf9, 0x02, 0x65, 0x4c, 0x21, 0x61, 0x5c, 0x83, + 0xc6, 0xce, 0xd8, 0x3a, 0xa0, 0x7d, 0x9f, 0x0e, 0xd9, 0x5c, 0x0e, 0x6b, 0xc8, 0xf9, 0x45, 0xc3, + 0x58, 0x87, 0xfa, 0x43, 0x7a, 0xfc, 0x9c, 0xcd, 0x7b, 0x5a, 0xfd, 0x8c, 0x7f, 0x54, 0x60, 0x99, + 0xa7, 0x99, 0xcd, 0xb8, 0xa8, 0x47, 0xe5, 0xbc, 0x49, 0x80, 0x09, 0x98, 0x9b, 0xd2, 0x9f, 0x0c, + 0x7c, 0x1a, 0x38, 0x9e, 0xf0, 0x25, 0x33, 0xa5, 0x3f, 0xd9, 0xe3, 0x04, 0x56, 0xf8, 0x33, 0xf6, + 0x77, 0x13, 0x4f, 0xfa, 0xb4, 0x6a, 0xd6, 0x91, 0xf0, 0x4b, 0xd6, 0x8e, 0xfb, 0x86, 0x87, 0x58, + 0x17, 0x87, 0xdc, 0x77, 0xa2, 0x6f, 0x9f, 0x13, 0x30, 0xc0, 0x2e, 0x8c, 0xf1, 0x2c, 0x0c, 0x8e, + 0x07, 0x23, 0x67, 0xec, 0x60, 0x25, 0xee, 0x0e, 0x5e, 0x1e, 0x47, 0x34, 0x94, 0x0e, 0x23, 0x82, + 0xf9, 0x88, 0xf1, 0x76, 0xdc, 0xaf, 0x19, 0x87, 0x18, 0xd0, 0xf2, 0xbc, 0xf1, 0x20, 0x1c, 0x7a, + 0x01, 0x22, 0x3a, 0xfb, 0x15, 0xcf, 0xb3, 0x55, 0xb3, 0x89, 0xc4, 0x3e, 0xa3, 0x6d, 0xd8, 0xaf, + 0x0c, 0x0b, 0x5a, 0xfd, 0x6d, 0xbe, 0x1c, 0x89, 0x13, 0xb0, 0x64, 0x9e, 0x84, 0x32, 0x8c, 0xb1, + 0x64, 0x66, 0xdf, 0x8c, 0x16, 0x78, 0xa3, 0xd8, 0x0e, 0xfc, 0x9b, 0xd1, 0xa2, 0x63, 0x3f, 0xae, + 0x97, 0xf9, 0x37, 0x33, 0xd8, 0x88, 0x1e, 0x21, 0x2a, 0x11, 0x90, 0x51, 0x34, 0x0c, 0x1b, 0x60, + 0xd3, 0xf2, 0xad, 0x97, 0xce, 0xc8, 0x89, 0x8e, 0xd1, 0x81, 0x1d, 0xcb, 0xb6, 0x07, 0xc3, 0x98, + 0xe2, 0xd0, 0x18, 0x30, 0xce, 0x23, 0x7d, 0x53, 0x23, 0x93, 0x4f, 0x60, 0xc1, 0x0e, 0x3c, 0x3f, + 0x2d, 0x2b, 0x10, 0x64, 0x87, 0x31, 0x74, 0x61, 0xe3, 0x3f, 0x15, 0x58, 0x4c, 0xbb, 0x45, 0x16, + 0xe4, 0xf7, 0xa1, 0x11, 0xc4, 0x0e, 0x92, 0x9b, 0x73, 0x25, 0x7d, 0x5e, 0xe4, 0x1d, 0x69, 0x26, + 0x5d, 0x30, 0xfe, 0xe7, 0x32, 0x0a, 0x54, 0x52, 0x81, 0x97, 0xac, 0xcd, 0x4c, 0x09, 0x92, 0x2f, + 0x13, 0xb4, 0x16, 0x97, 0x05, 0x55, 0xde, 0x77, 0x49, 0xf5, 0x4d, 0x99, 0x5e, 0xa1, 0xb8, 0xb8, + 0x36, 0xff, 0x3f, 0xe9, 0x8a, 0x6c, 0x25, 0xcf, 0xfb, 0x3c, 0x43, 0x8e, 0x70, 0x8f, 0xf1, 0x2d, + 0x34, 0x14, 0x29, 0x86, 0x37, 0x22, 0xf6, 0x38, 0xbc, 0x41, 0xca, 0x81, 0x04, 0x3c, 0x48, 0xc1, + 0x4f, 0x86, 0x23, 0xd1, 0xd6, 0x0e, 0x9b, 0xc5, 0x1a, 0x0d, 0x90, 0x12, 0xf2, 0xec, 0x5a, 0x35, + 0xdb, 0x09, 0xf9, 0x01, 0x52, 0x11, 0xe1, 0x2f, 0x28, 0xe3, 0x9c, 0x08, 0xaa, 0x34, 0x90, 0x34, + 0x95, 0x06, 0x49, 0xff, 0xae, 0xc1, 0x7c, 0xd6, 0x25, 0xb7, 0x73, 0x18, 0xa9, 0x97, 0x98, 0x33, + 0x3b, 0x9f, 0x96, 0xd9, 0xae, 0xc7, 0x9b, 0x78, 0x2a, 0x63, 0x11, 0xb5, 0xcf, 0xe5, 0xc6, 0x66, + 0xfa, 0x0c, 0xbd, 0xf1, 0x18, 0x13, 0x02, 0x5f, 0x19, 0x16, 0x69, 0xb2, 0xc9, 0xb4, 0xb7, 0x82, + 0x03, 0xb6, 0x6d, 0x18, 0x99, 0x7f, 0x93, 0xab, 0xd0, 0x64, 0x65, 0x05, 0xa2, 0x1a, 0x06, 0xb1, + 0x24, 0xe4, 0x07, 0x49, 0x42, 0x80, 0x85, 0xc0, 0x7e, 0x9a, 0xba, 0x47, 0x31, 0xd0, 0x49, 0xae, + 0x1f, 0xe2, 0xe4, 0x61, 0x72, 0x36, 0x3a, 0x6c, 0x66, 0xcc, 0x2e, 0x07, 0xe2, 0x02, 0xa3, 0xad, + 0x04, 0xf9, 0x9d, 0x81, 0x29, 0xb9, 0xe4, 0x73, 0x95, 0x52, 0x45, 0x11, 0xf1, 0x51, 0x7e, 0xf5, + 0x27, 0x00, 0xa7, 0x87, 0xe9, 0x3a, 0xa4, 0xc1, 0x87, 0xb8, 0x51, 0x3a, 0xc4, 0xc9, 0xb8, 0xe9, + 0x0a, 0x80, 0x1f, 0x38, 0x47, 0xce, 0x88, 0x1e, 0x50, 0xbb, 0x0b, 0x1c, 0xda, 0x6b, 0x14, 0x7e, + 0x79, 0x24, 0xaf, 0x1f, 0x06, 0x81, 0xe7, 0x45, 0xfb, 0x61, 0xb7, 0x29, 0xae, 0x1c, 0x62, 0xb2, + 0xc9, 0xa9, 0xec, 0x86, 0x80, 0x41, 0x54, 0x7e, 0xa7, 0x31, 0x27, 0xea, 0x62, 0x6c, 0xf3, 0x2b, + 0x8d, 0x45, 0x76, 0x20, 0xd9, 0x8e, 0xdb, 0x6d, 0xf1, 0x9e, 0xa2, 0xc1, 0xf2, 0x1d, 0xff, 0x18, + 0x78, 0x2e, 0xc2, 0xee, 0x36, 0x67, 0x35, 0x38, 0xe5, 0x09, 0x12, 0x58, 0xd4, 0x46, 0xd1, 0x71, + 0x77, 0x9e, 0xd3, 0xd9, 0x27, 0xe2, 0x5b, 0x59, 0xf4, 0x75, 0xb8, 0xf7, 0x3f, 0x28, 0xd9, 0xc4, + 0xef, 0x0d, 0xc2, 0xfb, 0x73, 0x05, 0x96, 0x36, 0xf9, 0x31, 0xaa, 0x25, 0x98, 0x33, 0x20, 0x14, + 0x72, 0x4b, 0x41, 0xc1, 0x2c, 0x9c, 0xc8, 0x2e, 0x56, 0xca, 0x91, 0xaf, 0xa0, 0x1d, 0x8f, 0x29, + 0x7b, 0x56, 0xdf, 0x06, 0x22, 0x5b, 0xa1, 0xde, 0x34, 0x3e, 0x87, 0xe5, 0x9c, 0xce, 0xf2, 0xe8, + 0xbd, 0x86, 0x89, 0x50, 0xdd, 0x6e, 0x29, 0x95, 0x9b, 0x8a, 0x86, 0x98, 0xea, 0x1e, 0x83, 0x92, + 0x56, 0x10, 0xe5, 0x16, 0x7c, 0x8a, 0xbe, 0x1c, 0x47, 0xa6, 0xfb, 0x4a, 0xa8, 0xd7, 0x87, 0x45, + 0x86, 0x30, 0xdf, 0x61, 0x50, 0x96, 0x07, 0xd8, 0xb2, 0xbd, 0x49, 0x24, 0xf3, 0x5f, 0xdc, 0x34, + 0x96, 0x05, 0xea, 0xcd, 0xcf, 0xf6, 0x19, 0x2c, 0x09, 0xd0, 0xf9, 0x2e, 0x8b, 0xb8, 0x18, 0x43, + 0xde, 0xfc, 0xb8, 0xbf, 0x9b, 0xd2, 0x12, 0x61, 0x49, 0x95, 0x7c, 0x33, 0x5d, 0x25, 0x2f, 0xe7, + 0x1d, 0x9e, 0xaa, 0xdc, 0xf2, 0x61, 0x54, 0x2d, 0x08, 0x23, 0x33, 0x57, 0x4a, 0x4f, 0xf3, 0x94, + 0xf1, 0x49, 0x7e, 0xf4, 0xff, 0x61, 0x25, 0xbd, 0x23, 0x2a, 0x69, 0x35, 0xb5, 0x42, 0xef, 0xb7, + 0x32, 0x95, 0x74, 0xb7, 0x4c, 0x4d, 0x55, 0x48, 0xff, 0xbd, 0x0a, 0x0d, 0xc5, 0xcb, 0xd9, 0xf4, + 0x76, 0xae, 0x8e, 0x3e, 0xe3, 0x61, 0x53, 0x7d, 0xdb, 0x61, 0x83, 0x65, 0x1d, 0xff, 0x18, 0x04, + 0x74, 0x5f, 0x96, 0x3e, 0x75, 0x4e, 0x30, 0xe9, 0x7e, 0xe2, 0xd2, 0xda, 0xa9, 0x5c, 0x7a, 0x3b, + 0x73, 0xa9, 0x76, 0x25, 0x2f, 0x5f, 0x78, 0x28, 0x6c, 0x17, 0xdd, 0xa6, 0x7d, 0x58, 0xd0, 0xf9, + 0xbd, 0x45, 0xa5, 0x8f, 0x44, 0xcd, 0xaf, 0x07, 0x84, 0x4c, 0x3c, 0xeb, 0x58, 0x19, 0x2b, 0xaa, + 0x2c, 0xfc, 0x49, 0x7e, 0x69, 0xa6, 0x26, 0xc5, 0x76, 0x71, 0xca, 0xc0, 0xc9, 0xed, 0xd0, 0x29, + 0x76, 0xf1, 0xef, 0xf5, 0x9a, 0xa5, 0xe4, 0x1a, 0xe5, 0x5d, 0xc3, 0xea, 0x66, 0x1a, 0x9d, 0xbd, + 0x2d, 0x1e, 0xde, 0x02, 0xce, 0xf8, 0x21, 0x8a, 0x49, 0x53, 0xb0, 0x45, 0x7d, 0xdf, 0x90, 0x14, + 0x64, 0x63, 0x61, 0xb3, 0xef, 0xb8, 0x4e, 0x78, 0x28, 0xf8, 0x33, 0x9c, 0x0f, 0x31, 0x69, 0x83, + 0xbf, 0x82, 0xd0, 0x37, 0x88, 0x26, 0x86, 0x9e, 0x4d, 0x31, 0x68, 0xf8, 0x2b, 0x08, 0x23, 0x6c, + 0x62, 0x3b, 0xd9, 0x01, 0xf5, 0x33, 0xed, 0x80, 0x46, 0x66, 0x07, 0x2c, 0xc1, 0x0c, 0xea, 0x1b, + 0x7a, 0x2e, 0x2f, 0x2f, 0x1a, 0xa6, 0x6c, 0x69, 0x55, 0x50, 0xb3, 0xac, 0x0a, 0x3a, 0xe1, 0x36, + 0x26, 0x53, 0x05, 0xcd, 0x95, 0x55, 0x41, 0xa7, 0xb9, 0x8c, 0xd1, 0x0a, 0xb7, 0xd6, 0x49, 0x85, + 0xdb, 0x8f, 0xb9, 0x3d, 0x1e, 0xe2, 0xc1, 0x9c, 0x0d, 0x68, 0xb9, 0x3f, 0x6e, 0x65, 0xee, 0x6c, + 0xba, 0x65, 0x56, 0x50, 0x57, 0x36, 0xaf, 0xa0, 0xb9, 0xfd, 0x06, 0xdd, 0x77, 0xfa, 0x83, 0x14, + 0x55, 0x1d, 0x8e, 0x6d, 0x89, 0xbe, 0xd8, 0x67, 0x5c, 0xa0, 0x55, 0x93, 0x02, 0x4d, 0xd5, 0x79, + 0x2c, 0x4c, 0xe7, 0x64, 0x9d, 0x67, 0xdc, 0x87, 0x39, 0x31, 0x97, 0xd4, 0x76, 0x89, 0x69, 0x6b, + 0xb3, 0x13, 0xb9, 0xc2, 0xc5, 0x64, 0x4b, 0xd2, 0x69, 0x10, 0xf0, 0xb5, 0x0b, 0x3a, 0xb6, 0x8c, + 0x3b, 0xd0, 0xe4, 0xf1, 0x26, 0x8f, 0xcc, 0xeb, 0x3a, 0x90, 0x3f, 0x29, 0x28, 0x19, 0x78, 0x61, + 0x09, 0x85, 0xd3, 0xd5, 0xee, 0xff, 0x34, 0x73, 0xba, 0x2c, 0xa6, 0xfb, 0x67, 0x4e, 0x96, 0xd7, + 0x50, 0xe3, 0xe4, 0xdc, 0xee, 0xbf, 0xc4, 0x40, 0xa5, 0xef, 0x0d, 0x22, 0xeb, 0x40, 0x3d, 0x6a, + 0x32, 0xc2, 0x53, 0x6c, 0xf3, 0x37, 0x59, 0xc6, 0xb4, 0x1d, 0x9c, 0x38, 0x0a, 0x25, 0x02, 0x69, + 0x32, 0xda, 0x96, 0x20, 0x31, 0x14, 0x12, 0x3a, 0xbf, 0xa1, 0xdc, 0x52, 0xd3, 0x26, 0xff, 0xc6, + 0xd2, 0x8b, 0xe8, 0xfa, 0x4a, 0x73, 0x61, 0x68, 0xf2, 0xe5, 0xc4, 0x89, 0xaf, 0x9d, 0x56, 0xd8, + 0x94, 0x5c, 0x34, 0x33, 0x11, 0x16, 0x48, 0x25, 0xbb, 0xd3, 0x5b, 0xeb, 0x33, 0x38, 0x9f, 0xea, + 0xaf, 0x9e, 0x10, 0x52, 0x03, 0x64, 0x67, 0x97, 0x9d, 0xff, 0x59, 0x01, 0xd8, 0x98, 0x44, 0x87, + 0x12, 0xdf, 0xf5, 0xa0, 0xce, 0x80, 0xa9, 0x86, 0x12, 0x55, 0x9b, 0xf1, 0x7c, 0x2b, 0x0c, 0x11, + 0x5c, 0xc5, 0x6f, 0x70, 0xaa, 0xcd, 0xb1, 0xd9, 0x44, 0xbd, 0x89, 0xf2, 0x6f, 0xf6, 0xa6, 0x2a, + 0x1e, 0x92, 0x07, 0x88, 0x4d, 0x11, 0x95, 0x87, 0xf2, 0x84, 0x6d, 0x09, 0xea, 0x86, 0x20, 0x32, + 0x31, 0xc7, 0xa6, 0xa8, 0x5a, 0x74, 0x3c, 0x88, 0xbc, 0xd7, 0xd4, 0x95, 0x28, 0xae, 0x15, 0x53, + 0x9f, 0x32, 0x22, 0x13, 0x0b, 0xe8, 0x01, 0x5a, 0x39, 0x88, 0xc5, 0x66, 0x84, 0x58, 0x4c, 0xe5, + 0x62, 0xec, 0x0d, 0xbe, 0xb3, 0x37, 0x19, 0x8d, 0xc4, 0x22, 0xcf, 0x6a, 0x4b, 0x04, 0x4d, 0x62, + 0x1d, 0xd9, 0xab, 0x82, 0xc4, 0x44, 0x72, 0x71, 0x3f, 0xbc, 0x5e, 0x3f, 0x0f, 0x0b, 0x9a, 0xa2, + 0xb2, 0xd4, 0xc4, 0x58, 0x10, 0x55, 0xe8, 0xbb, 0xe9, 0x6f, 0x5c, 0x80, 0xf3, 0xa9, 0xfe, 0x62, + 0xd8, 0xd5, 0xcb, 0x50, 0x8f, 0xdf, 0xdb, 0xc9, 0x2c, 0x54, 0x9f, 0x6e, 0xee, 0x75, 0xce, 0xb1, + 0x8f, 0x67, 0x5b, 0x7b, 0x9d, 0xca, 0xea, 0x2a, 0xcc, 0x67, 0x2e, 0x18, 0x49, 0x03, 0x6a, 0xe6, + 0xf6, 0xc6, 0xd6, 0x0b, 0x14, 0x9b, 0x83, 0xfa, 0xee, 0x93, 0xa7, 0xa2, 0x55, 0x59, 0xdd, 0x84, + 0x76, 0xfa, 0xb8, 0x23, 0x4d, 0x98, 0xdd, 0x44, 0xee, 0xd3, 0xed, 0x2d, 0x14, 0xc6, 0x86, 0xf9, + 0x6c, 0x77, 0x77, 0x67, 0xf7, 0x41, 0xa7, 0x42, 0x00, 0x66, 0xb6, 0xbf, 0xdd, 0x61, 0x8c, 0x29, + 0xc6, 0x78, 0xb6, 0xfb, 0x70, 0xf7, 0xc9, 0xaf, 0x76, 0x3b, 0xd5, 0xf5, 0xbf, 0xd5, 0xa1, 0x6d, + 0x8a, 0x25, 0xf4, 0x31, 0x16, 0x1c, 0x04, 0x8d, 0xf7, 0x61, 0x36, 0xfe, 0x99, 0x21, 0x39, 0x58, + 0xd3, 0x7f, 0x5e, 0xf4, 0xba, 0x79, 0x86, 0x34, 0xdb, 0x39, 0xb2, 0x07, 0xad, 0xd4, 0x4b, 0x1a, + 0x49, 0x40, 0x66, 0xd1, 0x63, 0x5d, 0xef, 0x4a, 0x19, 0x5b, 0x8d, 0xd8, 0x87, 0x76, 0xfa, 0x75, + 0x8c, 0x24, 0x7d, 0x0a, 0x5f, 0xdd, 0x7a, 0x57, 0x4b, 0xf9, 0x6a, 0xd0, 0x17, 0xd0, 0xc9, 0xbe, + 0x8b, 0x91, 0xe4, 0x4e, 0xab, 0xe4, 0xcd, 0xad, 0x77, 0xed, 0x04, 0x09, 0x7d, 0xe8, 0xdc, 0x0b, + 0xd2, 0x4a, 0xf9, 0x1b, 0x40, 0x6e, 0xe8, 0xb2, 0x87, 0x05, 0x61, 0x8a, 0xf4, 0xa5, 0x2e, 0xd1, + 0xdf, 0x6d, 0x0a, 0x2e, 0xd5, 0x35, 0x53, 0x14, 0xdf, 0x06, 0xe3, 0xa0, 0xcf, 0xb1, 0x52, 0x4b, + 0xe3, 0x55, 0x92, 0xf4, 0x2a, 0x46, 0xdf, 0xbd, 0x95, 0x72, 0x81, 0xb4, 0xdf, 0x74, 0x34, 0x9a, + 0xf2, 0x5b, 0x01, 0xc4, 0x4d, 0xf9, 0xad, 0x10, 0xc6, 0xf2, 0xf0, 0x4a, 0x61, 0x4e, 0x2d, 0xbc, + 0x8a, 0x00, 0x6e, 0xef, 0x4a, 0x19, 0x5b, 0x5f, 0x7e, 0x06, 0x6f, 0x6a, 0xcb, 0x2f, 0x86, 0xb1, + 0xbd, 0x95, 0x72, 0x81, 0xac, 0xaf, 0x92, 0x62, 0x3c, 0xe3, 0xab, 0x1c, 0x6c, 0xcb, 0xf8, 0x2a, + 0x5f, 0xc5, 0x4b, 0x5f, 0x65, 0xaa, 0xea, 0xab, 0xa5, 0xa5, 0x4a, 0xde, 0x57, 0xc5, 0xd5, 0x0f, + 0x8e, 0x7b, 0x17, 0xa6, 0x59, 0x85, 0x41, 0x92, 0xb3, 0x5c, 0x2b, 0x6e, 0x7a, 0x17, 0x32, 0xd4, + 0xb8, 0xdb, 0xf5, 0xca, 0xad, 0xca, 0xfa, 0x5f, 0xa6, 0x60, 0x4e, 0xa4, 0x3f, 0x99, 0x41, 0x1e, + 0x00, 0x24, 0x87, 0x30, 0xe9, 0xa5, 0x16, 0x95, 0xaa, 0x24, 0x7a, 0x97, 0x0a, 0x79, 0x4a, 0xa9, + 0x6f, 0x64, 0xd9, 0x22, 0x17, 0x7a, 0x29, 0x93, 0x6d, 0x53, 0x8b, 0xbc, 0x5c, 0xcc, 0x54, 0x63, + 0x6d, 0x41, 0x43, 0x25, 0x79, 0xa2, 0x9d, 0x0d, 0x99, 0x13, 0xaa, 0xd7, 0x2b, 0x62, 0xe9, 0x1a, + 0x69, 0x59, 0x5d, 0xd3, 0x28, 0x7f, 0x56, 0x68, 0x1a, 0x15, 0x1c, 0x04, 0xc6, 0xb9, 0xff, 0x06, + 0x00, 0x00, 0xff, 0xff, 0xe6, 0xbd, 0x3a, 0x14, 0xe5, 0x26, 0x00, 0x00, } diff --git a/pkg/kubelet/api/v1alpha1/runtime/api.proto b/pkg/kubelet/api/v1alpha1/runtime/api.proto index 0f312a2382c..cfd1bac7bfe 100644 --- a/pkg/kubelet/api/v1alpha1/runtime/api.proto +++ b/pkg/kubelet/api/v1alpha1/runtime/api.proto @@ -271,16 +271,14 @@ message PodSandboxStatusResponse { // PodSandboxFilter is used to filter a list of PodSandboxes. // All those fields are combined with 'AND' message PodSandboxFilter { - // Name of the sandbox. - optional string name = 1; // ID of the sandbox. - optional string id = 2; + optional string id = 1; // State of the sandbox. - optional PodSandBoxState state = 3; + optional PodSandBoxState state = 2; // LabelSelector to select matches. // Only api.MatchLabels is supported for now and the requirements // are ANDed. MatchExpressions is not supported yet. - map label_selector = 4; + map label_selector = 3; } message ListPodSandboxRequest { @@ -495,18 +493,16 @@ enum ContainerState { // ContainerFilter is used to filter containers. // All those fields are combined with 'AND' message ContainerFilter { - // Name of the container. - optional string name = 1; // ID of the container. - optional string id = 2; + optional string id = 1; // State of the container. - optional ContainerState state = 3; + optional ContainerState state = 2; // The id of the pod sandbox - optional string pod_sandbox_id = 4; + optional string pod_sandbox_id = 3; // LabelSelector to select matches. // Only api.MatchLabels is supported for now and the requirements // are ANDed. MatchExpressions is not supported yet. - map label_selector = 5; + map label_selector = 4; } message ListContainersRequest { diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index 5bfbd63ac51..9528d0495e2 100644 --- a/pkg/kubelet/dockershim/docker_container.go +++ b/pkg/kubelet/dockershim/docker_container.go @@ -71,11 +71,7 @@ func (ds *dockerService) ListContainers(filter *runtimeApi.ContainerFilter) ([]* glog.V(5).Infof("Unable to convert docker to runtime API container: %v", err) continue } - if len(filter.GetName()) != 0 && converted.Metadata.GetName() != filter.GetName() { - // TODO: Remove "name" from the ContainerFilter because name can no - // longer be used to identify a container. - continue - } + result = append(result, converted) } return result, nil diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index ffc14aa41cc..c070f0c5713 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -180,17 +180,11 @@ func (ds *dockerService) ListPodSandbox(filter *runtimeApi.PodSandboxFilter) ([] result := []*runtimeApi.PodSandbox{} for i := range containers { c := containers[i] - converted, err := toRuntimeAPISandbox(&c) if err != nil { glog.V(5).Infof("Unable to convert docker to runtime API sandbox: %v", err) continue } - if len(filter.GetName()) > 0 && converted.Metadata.GetName() != filter.GetName() { - // TODO: Remove "name" from the SandboxFilter because name can no - // longer be used to identify a container. - continue - } if filterOutReadySandboxes && converted.GetState() == runtimeApi.PodSandBoxState_READY { continue }