From f4ab2b6331d96c18ad12ada2d141f1993285a030 Mon Sep 17 00:00:00 2001 From: Lee Verberne Date: Thu, 25 Jan 2018 12:32:25 +0100 Subject: [PATCH 1/3] Switch CRI NamespaceOption from bools to enums --- .../apis/cri/v1alpha1/runtime/api.pb.go | 713 +++++++++--------- .../apis/cri/v1alpha1/runtime/api.proto | 37 +- 2 files changed, 401 insertions(+), 349 deletions(-) diff --git a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go b/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go index 84ccd5e41b..a6a69234aa 100644 --- a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go +++ b/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go @@ -205,6 +205,42 @@ func (x MountPropagation) String() string { } func (MountPropagation) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{1} } +// A NamespaceMode describes the intended namespace configuration for each +// of the namespaces (Network, PID, IPC) in NamespaceOption. Runtimes should +// map these modes as appropriate for the technology underlying the runtime. +type NamespaceMode int32 + +const ( + // A POD namespace is common to all containers in a pod. + // For example, a container with a PID namespace of POD expects to view + // all of the processes in all of the containers in the pod. + NamespaceMode_POD NamespaceMode = 0 + // A CONTAINER namespace is restricted to a single container. + // For example, a container with a PID namespace of CONTAINER expects to + // view only the processes in that container. + NamespaceMode_CONTAINER NamespaceMode = 1 + // A NODE namespace is the namespace of the Kubernetes node. + // For example, a container with a PID namespace of NODE expects to view + // all of the processes on the host running the kubelet. + NamespaceMode_NODE NamespaceMode = 2 +) + +var NamespaceMode_name = map[int32]string{ + 0: "POD", + 1: "CONTAINER", + 2: "NODE", +} +var NamespaceMode_value = map[string]int32{ + "POD": 0, + "CONTAINER": 1, + "NODE": 2, +} + +func (x NamespaceMode) String() string { + return proto.EnumName(NamespaceMode_name, int32(x)) +} +func (NamespaceMode) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{2} } + type PodSandboxState int32 const ( @@ -224,7 +260,7 @@ var PodSandboxState_value = map[string]int32{ func (x PodSandboxState) String() string { return proto.EnumName(PodSandboxState_name, int32(x)) } -func (PodSandboxState) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{2} } +func (PodSandboxState) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{3} } type ContainerState int32 @@ -251,7 +287,7 @@ var ContainerState_value = map[string]int32{ func (x ContainerState) String() string { return proto.EnumName(ContainerState_name, int32(x)) } -func (ContainerState) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{3} } +func (ContainerState) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{4} } type VersionRequest struct { // Version of the kubelet runtime API. @@ -449,37 +485,44 @@ func (m *Mount) GetPropagation() MountPropagation { // NamespaceOption provides options for Linux namespaces. type NamespaceOption struct { - // If set, use the host's network namespace. - HostNetwork bool `protobuf:"varint,1,opt,name=host_network,json=hostNetwork,proto3" json:"host_network,omitempty"` - // If set, use the host's PID namespace. - HostPid bool `protobuf:"varint,2,opt,name=host_pid,json=hostPid,proto3" json:"host_pid,omitempty"` - // If set, use the host's IPC namespace. - HostIpc bool `protobuf:"varint,3,opt,name=host_ipc,json=hostIpc,proto3" json:"host_ipc,omitempty"` + // Network namespace for this container/sandbox. + // Note: There is currently no way to set CONTAINER scoped network in the Kubernetes API. + // Namespaces currently set by the kubelet: POD, NODE + Network NamespaceMode `protobuf:"varint,1,opt,name=network,proto3,enum=runtime.NamespaceMode" json:"network,omitempty"` + // PID namespace for this container/sandbox. + // Note: The CRI default is POD, but the v1.PodSpec default is CONTAINER. + // The kubelet's runtime manager will set this to CONTAINER explicitly for v1 pods. + // Namespaces currently set by the kubelet: POD, CONTAINER, NODE + Pid NamespaceMode `protobuf:"varint,2,opt,name=pid,proto3,enum=runtime.NamespaceMode" json:"pid,omitempty"` + // IPC namespace for this container/sandbox. + // Note: There is currently no way to set CONTAINER scoped IPC in the Kubernetes API. + // Namespaces currently set by the kubelet: POD, NODE + Ipc NamespaceMode `protobuf:"varint,3,opt,name=ipc,proto3,enum=runtime.NamespaceMode" json:"ipc,omitempty"` } func (m *NamespaceOption) Reset() { *m = NamespaceOption{} } func (*NamespaceOption) ProtoMessage() {} func (*NamespaceOption) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{5} } -func (m *NamespaceOption) GetHostNetwork() bool { +func (m *NamespaceOption) GetNetwork() NamespaceMode { if m != nil { - return m.HostNetwork + return m.Network } - return false + return NamespaceMode_POD } -func (m *NamespaceOption) GetHostPid() bool { +func (m *NamespaceOption) GetPid() NamespaceMode { if m != nil { - return m.HostPid + return m.Pid } - return false + return NamespaceMode_POD } -func (m *NamespaceOption) GetHostIpc() bool { +func (m *NamespaceOption) GetIpc() NamespaceMode { if m != nil { - return m.HostIpc + return m.Ipc } - return false + return NamespaceMode_POD } // Int64Value is the wrapper of int64. @@ -3632,6 +3675,7 @@ func init() { proto.RegisterType((*ReopenContainerLogResponse)(nil), "runtime.ReopenContainerLogResponse") proto.RegisterEnum("runtime.Protocol", Protocol_name, Protocol_value) proto.RegisterEnum("runtime.MountPropagation", MountPropagation_name, MountPropagation_value) + proto.RegisterEnum("runtime.NamespaceMode", NamespaceMode_name, NamespaceMode_value) proto.RegisterEnum("runtime.PodSandboxState", PodSandboxState_name, PodSandboxState_value) proto.RegisterEnum("runtime.ContainerState", ContainerState_name, ContainerState_value) } @@ -4943,35 +4987,20 @@ func (m *NamespaceOption) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.HostNetwork { + if m.Network != 0 { dAtA[i] = 0x8 i++ - if m.HostNetwork { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintApi(dAtA, i, uint64(m.Network)) } - if m.HostPid { + if m.Pid != 0 { dAtA[i] = 0x10 i++ - if m.HostPid { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintApi(dAtA, i, uint64(m.Pid)) } - if m.HostIpc { + if m.Ipc != 0 { dAtA[i] = 0x18 i++ - if m.HostIpc { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintApi(dAtA, i, uint64(m.Ipc)) } return i, nil } @@ -8959,14 +8988,14 @@ func (m *Mount) Size() (n int) { func (m *NamespaceOption) Size() (n int) { var l int _ = l - if m.HostNetwork { - n += 2 + if m.Network != 0 { + n += 1 + sovApi(uint64(m.Network)) } - if m.HostPid { - n += 2 + if m.Pid != 0 { + n += 1 + sovApi(uint64(m.Pid)) } - if m.HostIpc { - n += 2 + if m.Ipc != 0 { + n += 1 + sovApi(uint64(m.Ipc)) } return n } @@ -10654,9 +10683,9 @@ func (this *NamespaceOption) String() string { return "nil" } s := strings.Join([]string{`&NamespaceOption{`, - `HostNetwork:` + fmt.Sprintf("%v", this.HostNetwork) + `,`, - `HostPid:` + fmt.Sprintf("%v", this.HostPid) + `,`, - `HostIpc:` + fmt.Sprintf("%v", this.HostIpc) + `,`, + `Network:` + fmt.Sprintf("%v", this.Network) + `,`, + `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, + `Ipc:` + fmt.Sprintf("%v", this.Ipc) + `,`, `}`, }, "") return s @@ -12698,9 +12727,9 @@ func (m *NamespaceOption) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HostNetwork", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Network", wireType) } - var v int + m.Network = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowApi @@ -12710,17 +12739,16 @@ func (m *NamespaceOption) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + m.Network |= (NamespaceMode(b) & 0x7F) << shift if b < 0x80 { break } } - m.HostNetwork = bool(v != 0) case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HostPid", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pid", wireType) } - var v int + m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowApi @@ -12730,17 +12758,16 @@ func (m *NamespaceOption) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + m.Pid |= (NamespaceMode(b) & 0x7F) << shift if b < 0x80 { break } } - m.HostPid = bool(v != 0) case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HostIpc", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Ipc", wireType) } - var v int + m.Ipc = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowApi @@ -12750,12 +12777,11 @@ func (m *NamespaceOption) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + m.Ipc |= (NamespaceMode(b) & 0x7F) << shift if b < 0x80 { break } } - m.HostIpc = bool(v != 0) default: iNdEx = preIndex skippy, err := skipApi(dAtA[iNdEx:]) @@ -26305,288 +26331,289 @@ var ( func init() { proto.RegisterFile("api.proto", fileDescriptorApi) } var fileDescriptorApi = []byte{ - // 4515 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x3b, 0x5d, 0x6f, 0x1c, 0x47, - 0x72, 0xdc, 0x5d, 0x7e, 0xec, 0xd6, 0x72, 0x97, 0xcb, 0x16, 0x45, 0x2e, 0x57, 0x12, 0x45, 0x8d, - 0x6c, 0x59, 0xd2, 0x9d, 0x64, 0x99, 0x3e, 0x4b, 0xb1, 0x6c, 0x4b, 0x5a, 0x93, 0x94, 0x42, 0x4b, - 0x22, 0x79, 0xb3, 0xa4, 0x3f, 0x72, 0x01, 0x26, 0xc3, 0x9d, 0xe6, 0x72, 0xec, 0xdd, 0xe9, 0xf1, - 0x7c, 0x48, 0x62, 0x90, 0x87, 0xe4, 0x25, 0x08, 0x02, 0x04, 0xb8, 0x00, 0x79, 0x49, 0x9e, 0xf2, - 0x10, 0xe0, 0x10, 0x04, 0x08, 0x82, 0x20, 0x08, 0xf2, 0x03, 0x82, 0xe4, 0x5e, 0x0e, 0xc8, 0x53, - 0x90, 0xc7, 0x9c, 0xf2, 0x90, 0x87, 0x00, 0xf9, 0x0d, 0x87, 0xfe, 0x9a, 0xe9, 0xf9, 0x5a, 0x91, - 0xb2, 0xef, 0xec, 0xa7, 0x9d, 0xae, 0xae, 0xae, 0xae, 0xae, 0xaa, 0xae, 0xae, 0xaa, 0xee, 0x85, - 0x9a, 0xe9, 0xda, 0x37, 0x5d, 0x8f, 0x04, 0x04, 0xcd, 0x78, 0xa1, 0x13, 0xd8, 0x23, 0xdc, 0xb9, - 0x31, 0xb0, 0x83, 0xa3, 0xf0, 0xe0, 0x66, 0x9f, 0x8c, 0xde, 0x1e, 0x90, 0x01, 0x79, 0x9b, 0xf5, - 0x1f, 0x84, 0x87, 0xac, 0xc5, 0x1a, 0xec, 0x8b, 0x8f, 0xd3, 0xae, 0x43, 0xf3, 0x53, 0xec, 0xf9, - 0x36, 0x71, 0x74, 0xfc, 0x75, 0x88, 0xfd, 0x00, 0xb5, 0x61, 0xe6, 0x19, 0x87, 0xb4, 0x4b, 0xab, - 0xa5, 0xab, 0x35, 0x5d, 0x36, 0xb5, 0x9f, 0x95, 0x60, 0x2e, 0x42, 0xf6, 0x5d, 0xe2, 0xf8, 0xb8, - 0x18, 0x1b, 0x5d, 0x82, 0x59, 0xc1, 0x93, 0xe1, 0x98, 0x23, 0xdc, 0x2e, 0xb3, 0xee, 0xba, 0x80, - 0x6d, 0x9b, 0x23, 0x8c, 0xde, 0x82, 0x39, 0x89, 0x22, 0x89, 0x54, 0x18, 0x56, 0x53, 0x80, 0xc5, - 0x6c, 0xe8, 0x26, 0x9c, 0x91, 0x88, 0xa6, 0x6b, 0x47, 0xc8, 0x93, 0x0c, 0x79, 0x5e, 0x74, 0x75, - 0x5d, 0x5b, 0xe0, 0x6b, 0x3f, 0x81, 0xda, 0xc6, 0x76, 0x6f, 0x9d, 0x38, 0x87, 0xf6, 0x80, 0xb2, - 0xe8, 0x63, 0x8f, 0x8e, 0x69, 0x97, 0x56, 0x2b, 0x94, 0x45, 0xd1, 0x44, 0x1d, 0xa8, 0xfa, 0xd8, - 0xf4, 0xfa, 0x47, 0xd8, 0x6f, 0x97, 0x59, 0x57, 0xd4, 0xa6, 0xa3, 0x88, 0x1b, 0xd8, 0xc4, 0xf1, - 0xdb, 0x15, 0x3e, 0x4a, 0x34, 0xb5, 0xbf, 0x2c, 0x41, 0x7d, 0x97, 0x78, 0xc1, 0x53, 0xd3, 0x75, - 0x6d, 0x67, 0x80, 0x6e, 0x40, 0x95, 0xc9, 0xb2, 0x4f, 0x86, 0x4c, 0x06, 0xcd, 0xb5, 0xf9, 0x9b, - 0x82, 0xa5, 0x9b, 0xbb, 0xa2, 0x43, 0x8f, 0x50, 0xd0, 0x9b, 0xd0, 0xec, 0x13, 0x27, 0x30, 0x6d, - 0x07, 0x7b, 0x86, 0x4b, 0xbc, 0x80, 0x49, 0x66, 0x4a, 0x6f, 0x44, 0x50, 0x4a, 0x1c, 0x9d, 0x83, - 0xda, 0x11, 0xf1, 0x03, 0x8e, 0x51, 0x61, 0x18, 0x55, 0x0a, 0x60, 0x9d, 0x4b, 0x30, 0xc3, 0x3a, - 0x6d, 0x57, 0xc8, 0x60, 0x9a, 0x36, 0xb7, 0x5c, 0xed, 0x17, 0x25, 0x98, 0x7a, 0x4a, 0x42, 0x27, - 0x48, 0x4d, 0x63, 0x06, 0x47, 0x42, 0x3f, 0xca, 0x34, 0x66, 0x70, 0x14, 0x4f, 0x43, 0x31, 0xb8, - 0x8a, 0xf8, 0x34, 0xb4, 0xb3, 0x03, 0x55, 0x0f, 0x9b, 0x16, 0x71, 0x86, 0xc7, 0x8c, 0x85, 0xaa, - 0x1e, 0xb5, 0xa9, 0xee, 0x7c, 0x3c, 0xb4, 0x9d, 0xf0, 0x85, 0xe1, 0xe1, 0xa1, 0x79, 0x80, 0x87, - 0x8c, 0x95, 0xaa, 0xde, 0x14, 0x60, 0x9d, 0x43, 0xd1, 0x07, 0x50, 0x77, 0x3d, 0xe2, 0x9a, 0x03, - 0x93, 0x8a, 0xaf, 0x3d, 0xc5, 0x24, 0xb4, 0x1c, 0x49, 0x88, 0x71, 0xbb, 0x1b, 0x23, 0xe8, 0x2a, - 0xb6, 0xf6, 0x25, 0xcc, 0x51, 0x4b, 0xf1, 0x5d, 0xb3, 0x8f, 0x77, 0x98, 0xfc, 0xa9, 0x5d, 0x31, - 0x8e, 0x1d, 0x1c, 0x3c, 0x27, 0xde, 0x57, 0x6c, 0x59, 0x55, 0xbd, 0x4e, 0x61, 0xdb, 0x1c, 0x84, - 0x96, 0xa1, 0xca, 0x17, 0x65, 0x5b, 0x6c, 0x4d, 0x55, 0x9d, 0x89, 0x6b, 0xd7, 0xb6, 0xa2, 0x2e, - 0xdb, 0xed, 0x8b, 0x25, 0xcd, 0x70, 0xd1, 0xf5, 0x35, 0x0d, 0x60, 0xcb, 0x09, 0x6e, 0xff, 0xe8, - 0x53, 0x73, 0x18, 0x62, 0xb4, 0x00, 0x53, 0xcf, 0xe8, 0x07, 0xa3, 0x5f, 0xd1, 0x79, 0x43, 0xfb, - 0xe3, 0x0a, 0x9c, 0x7b, 0x42, 0x57, 0xd7, 0x33, 0x1d, 0xeb, 0x80, 0xbc, 0xe8, 0xe1, 0x7e, 0xe8, - 0xd9, 0xc1, 0xf1, 0x3a, 0x71, 0x02, 0xfc, 0x22, 0x40, 0x9b, 0x30, 0xef, 0x48, 0x7e, 0x0d, 0x69, - 0x3f, 0x94, 0x42, 0x7d, 0xad, 0x1d, 0x2d, 0x39, 0xb5, 0x22, 0xbd, 0xe5, 0x24, 0x01, 0x3e, 0xba, - 0x1f, 0x0b, 0x57, 0x12, 0x29, 0x33, 0x22, 0x8b, 0x11, 0x91, 0xde, 0x26, 0xe3, 0x43, 0x90, 0x90, - 0x42, 0x97, 0x04, 0xde, 0x05, 0xba, 0xd1, 0x0c, 0xd3, 0x37, 0x42, 0x1f, 0x7b, 0x6c, 0xa5, 0xf5, - 0xb5, 0x33, 0xd1, 0xe0, 0x78, 0x9d, 0x7a, 0xcd, 0x0b, 0x9d, 0xae, 0xbf, 0xef, 0x63, 0x8f, 0x6d, - 0x47, 0xa1, 0x5e, 0xc3, 0x23, 0x24, 0x38, 0xf4, 0xa5, 0x4a, 0x25, 0x58, 0x67, 0x50, 0xf4, 0x36, - 0x9c, 0xf1, 0x43, 0xd7, 0x1d, 0xe2, 0x11, 0x76, 0x02, 0x73, 0x68, 0x0c, 0x3c, 0x12, 0xba, 0x7e, - 0x7b, 0x6a, 0xb5, 0x72, 0xb5, 0xa2, 0x23, 0xb5, 0xeb, 0x11, 0xeb, 0x41, 0x2b, 0x00, 0xae, 0x67, - 0x3f, 0xb3, 0x87, 0x78, 0x80, 0xad, 0xf6, 0x34, 0x23, 0xaa, 0x40, 0xd0, 0x2d, 0x58, 0xf0, 0x71, - 0xbf, 0x4f, 0x46, 0xae, 0xe1, 0x7a, 0xe4, 0xd0, 0x1e, 0x62, 0x6e, 0x90, 0x33, 0xcc, 0x20, 0x91, - 0xe8, 0xdb, 0xe5, 0x5d, 0xd4, 0x34, 0xb5, 0x9f, 0x96, 0xe1, 0x2c, 0x13, 0xc0, 0x2e, 0xb1, 0x84, - 0x2e, 0xc4, 0x76, 0xbf, 0x0c, 0x8d, 0x3e, 0x63, 0xc8, 0x70, 0x4d, 0x0f, 0x3b, 0x81, 0xb0, 0xfb, - 0x59, 0x0e, 0xdc, 0x65, 0x30, 0xb4, 0x03, 0x2d, 0x5f, 0xa8, 0xce, 0xe8, 0x73, 0xdd, 0x09, 0x09, - 0xbf, 0x11, 0x09, 0x69, 0x8c, 0x9e, 0xf5, 0x39, 0x3f, 0xa3, 0xf8, 0x19, 0xff, 0xd8, 0xef, 0x07, - 0x43, 0xee, 0x2e, 0xea, 0x6b, 0x3f, 0x48, 0xd2, 0x49, 0xb3, 0x79, 0xb3, 0xc7, 0xb1, 0x37, 0x9d, - 0xc0, 0x3b, 0xd6, 0xe5, 0xd8, 0xce, 0x5d, 0x98, 0x55, 0x3b, 0x50, 0x0b, 0x2a, 0x5f, 0xe1, 0x63, - 0xb1, 0x04, 0xfa, 0x19, 0xdb, 0x25, 0xdf, 0xac, 0xbc, 0x71, 0xb7, 0xfc, 0x5b, 0x25, 0xcd, 0x03, - 0x14, 0xcf, 0xf2, 0x14, 0x07, 0xa6, 0x65, 0x06, 0x26, 0x42, 0x30, 0xc9, 0xdc, 0x2f, 0x27, 0xc1, - 0xbe, 0x29, 0xd5, 0x50, 0x6c, 0x8d, 0x9a, 0x4e, 0x3f, 0xd1, 0x79, 0xa8, 0x45, 0x46, 0x28, 0x7c, - 0x70, 0x0c, 0xa0, 0xbe, 0xd0, 0x0c, 0x02, 0x3c, 0x72, 0x03, 0x66, 0x10, 0x0d, 0x5d, 0x36, 0xb5, - 0x7f, 0x99, 0x84, 0x56, 0x46, 0x03, 0x77, 0xa0, 0x3a, 0x12, 0xd3, 0x0b, 0xdb, 0x3f, 0x17, 0x3b, - 0xc4, 0x0c, 0x87, 0x7a, 0x84, 0x4c, 0xfd, 0x0d, 0xdd, 0x8c, 0xca, 0x71, 0x11, 0xb5, 0xa9, 0x5a, - 0x87, 0x64, 0x60, 0x58, 0xb6, 0x87, 0xfb, 0x01, 0xf1, 0x8e, 0x05, 0x97, 0xb3, 0x43, 0x32, 0xd8, - 0x90, 0x30, 0xf4, 0x0e, 0x80, 0xe5, 0xf8, 0x54, 0xa3, 0x87, 0xf6, 0x80, 0xf1, 0x5a, 0x5f, 0x43, - 0xd1, 0xdc, 0xd1, 0x91, 0xa0, 0xd7, 0x2c, 0xc7, 0x17, 0xcc, 0xbe, 0x0f, 0x0d, 0xea, 0x62, 0x8d, - 0x11, 0xf7, 0xe6, 0xdc, 0x8a, 0xeb, 0x6b, 0x0b, 0x0a, 0xc7, 0x91, 0xab, 0xd7, 0x67, 0xdd, 0xb8, - 0xe1, 0xa3, 0x8f, 0x60, 0x9a, 0xb9, 0x38, 0xbf, 0x3d, 0xcd, 0xc6, 0xbc, 0x99, 0xb3, 0x4a, 0xa1, - 0xed, 0x27, 0x0c, 0x8f, 0x2b, 0x5b, 0x0c, 0x42, 0x4f, 0xa0, 0x6e, 0x3a, 0x0e, 0x09, 0x4c, 0xbe, - 0xc1, 0x67, 0x18, 0x8d, 0xeb, 0xc5, 0x34, 0xba, 0x31, 0x32, 0x27, 0xa4, 0x0e, 0x47, 0x3f, 0x82, - 0x29, 0xe6, 0x01, 0xda, 0x55, 0xb6, 0xea, 0x95, 0xf1, 0xe6, 0xa7, 0x73, 0xe4, 0xce, 0xfb, 0x50, - 0x57, 0x58, 0x3b, 0x8d, 0xb9, 0x75, 0xee, 0x41, 0x2b, 0xcd, 0xd1, 0xa9, 0xcc, 0x75, 0x0b, 0x16, - 0xf4, 0xd0, 0x89, 0x19, 0x93, 0xf1, 0xc7, 0x3b, 0x30, 0x2d, 0xf4, 0xc7, 0x6d, 0x67, 0xb9, 0x50, - 0x22, 0xba, 0x40, 0xd4, 0x3e, 0x82, 0xb3, 0x29, 0x52, 0x22, 0x3a, 0x79, 0x03, 0x9a, 0x2e, 0xb1, - 0x0c, 0x9f, 0x83, 0x0d, 0xdb, 0x92, 0xce, 0xc0, 0x8d, 0x70, 0xb7, 0x2c, 0x3a, 0xbc, 0x17, 0x10, - 0x37, 0xcb, 0xca, 0xc9, 0x86, 0xb7, 0x61, 0x31, 0x3d, 0x9c, 0x4f, 0xaf, 0xdd, 0x87, 0x25, 0x1d, - 0x8f, 0xc8, 0x33, 0xfc, 0xba, 0xa4, 0x3b, 0xd0, 0xce, 0x12, 0x10, 0xc4, 0xbf, 0x80, 0xa5, 0x18, - 0xda, 0x0b, 0xcc, 0x20, 0xf4, 0x4f, 0x45, 0x5c, 0x84, 0x6e, 0x07, 0xc4, 0xc7, 0xf2, 0x90, 0x14, - 0x4d, 0xed, 0x9a, 0x4a, 0x5a, 0x1c, 0xaa, 0x7c, 0x06, 0xd4, 0x84, 0xb2, 0xed, 0x0a, 0x72, 0x65, - 0xdb, 0xd5, 0xee, 0x43, 0x2d, 0x3a, 0xce, 0xd0, 0x5a, 0x1c, 0x33, 0x95, 0x5f, 0x71, 0xe6, 0x45, - 0xd1, 0xd4, 0xe3, 0x8c, 0x1f, 0x17, 0x33, 0xad, 0x01, 0x44, 0x1e, 0x48, 0x9e, 0xa1, 0x28, 0x4b, - 0x4f, 0x57, 0xb0, 0xb4, 0xbf, 0x49, 0xb8, 0x23, 0x85, 0x65, 0x2b, 0x62, 0xd9, 0x4a, 0xb8, 0xa7, - 0xf2, 0x69, 0xdc, 0xd3, 0x4d, 0x98, 0xf2, 0x03, 0x33, 0xe0, 0x0e, 0xb2, 0xa9, 0x2c, 0x2e, 0x39, - 0x25, 0xd6, 0x39, 0x1a, 0xba, 0x00, 0xd0, 0xf7, 0xb0, 0x19, 0x60, 0xcb, 0x30, 0xb9, 0xe7, 0xac, - 0xe8, 0x35, 0x01, 0xe9, 0x06, 0xe8, 0x2e, 0xcc, 0xc8, 0x18, 0x66, 0x8a, 0xb1, 0xb1, 0x9a, 0x43, - 0x30, 0x21, 0x7d, 0x5d, 0x0e, 0x88, 0x77, 0xfb, 0xf4, 0xf8, 0xdd, 0x2e, 0xc6, 0x71, 0x64, 0xc5, - 0x61, 0xcd, 0x14, 0x3a, 0x2c, 0x3e, 0xe2, 0x24, 0x0e, 0xab, 0x5a, 0xe8, 0xb0, 0x04, 0x8d, 0xb1, - 0x0e, 0xeb, 0xbb, 0x74, 0x3d, 0xff, 0x5e, 0x82, 0x76, 0x76, 0xef, 0x08, 0x9f, 0xf1, 0x0e, 0x4c, - 0xfb, 0x0c, 0x32, 0xc6, 0xff, 0x88, 0x21, 0x02, 0x11, 0xdd, 0x87, 0x49, 0xdb, 0x39, 0x24, 0x2c, - 0x87, 0x50, 0x4f, 0xfe, 0xa2, 0x39, 0x6e, 0x6e, 0x39, 0x87, 0x84, 0x8b, 0x84, 0x0d, 0xec, 0xdc, - 0x81, 0x5a, 0x04, 0x3a, 0xd5, 0x4a, 0x1e, 0xc2, 0x42, 0xca, 0xf8, 0x78, 0xf4, 0x1a, 0x99, 0x6a, - 0xe9, 0x44, 0xa6, 0xaa, 0xfd, 0x7f, 0x49, 0xdd, 0x38, 0x0f, 0xed, 0x61, 0x80, 0xbd, 0xcc, 0xc6, - 0x79, 0x57, 0x12, 0xe5, 0xbb, 0xe6, 0x42, 0x11, 0x51, 0x1e, 0x58, 0x8a, 0x4d, 0xd0, 0x83, 0x26, - 0x33, 0x1f, 0xc3, 0xc7, 0x43, 0x76, 0x4a, 0x8b, 0xf8, 0xe8, 0x87, 0x39, 0xa3, 0xf9, 0xbc, 0xdc, - 0xf6, 0x7a, 0x02, 0x9d, 0x8b, 0xa9, 0x31, 0x54, 0x61, 0x9d, 0x07, 0x80, 0xb2, 0x48, 0xa7, 0x12, - 0xdc, 0x27, 0xd4, 0xed, 0xd0, 0x6c, 0x2a, 0xe7, 0xf8, 0x39, 0x64, 0x6c, 0x8c, 0x51, 0x3f, 0xe7, - 0x53, 0x17, 0x88, 0xda, 0x5f, 0x57, 0x00, 0xe2, 0xce, 0xef, 0xad, 0xbf, 0xb9, 0x13, 0xed, 0x7e, - 0x1e, 0xe2, 0x5c, 0xcc, 0xa1, 0x97, 0xbb, 0xef, 0x1f, 0x26, 0xf7, 0x3d, 0x0f, 0x76, 0xde, 0xc8, - 0x1b, 0xfd, 0xbd, 0xdd, 0xf1, 0xeb, 0xb0, 0x98, 0x56, 0xb7, 0xd8, 0xee, 0xd7, 0x60, 0xca, 0x0e, - 0xf0, 0x88, 0xd7, 0x06, 0xd4, 0x1c, 0x49, 0xc1, 0xe5, 0x18, 0xda, 0x25, 0xa8, 0x6d, 0x8d, 0xcc, - 0x01, 0xee, 0xb9, 0xb8, 0x4f, 0xe7, 0xb2, 0x69, 0x43, 0xcc, 0xcf, 0x1b, 0xda, 0x1a, 0x54, 0x1f, - 0xe3, 0x63, 0xbe, 0x07, 0x4f, 0xc8, 0x9f, 0xf6, 0x67, 0x65, 0x58, 0x62, 0x6e, 0x7b, 0x5d, 0x66, - 0xe6, 0x3a, 0xf6, 0x49, 0xe8, 0xf5, 0xb1, 0xcf, 0x54, 0xea, 0x86, 0x86, 0x8b, 0x3d, 0x9b, 0x58, - 0x22, 0x15, 0xad, 0xf5, 0xdd, 0x70, 0x97, 0x01, 0x68, 0xf6, 0x4e, 0xbb, 0xbf, 0x0e, 0x89, 0xb0, - 0xad, 0x8a, 0x5e, 0xed, 0xbb, 0xe1, 0x8f, 0x69, 0x5b, 0x8e, 0xf5, 0x8f, 0x4c, 0x0f, 0xfb, 0xcc, - 0x86, 0xf8, 0xd8, 0x1e, 0x03, 0xa0, 0x77, 0xe0, 0xec, 0x08, 0x8f, 0x88, 0x77, 0x6c, 0x0c, 0xed, - 0x91, 0x1d, 0x18, 0xb6, 0x63, 0x1c, 0x1c, 0x07, 0xd8, 0x17, 0x86, 0x83, 0x78, 0xe7, 0x13, 0xda, - 0xb7, 0xe5, 0x7c, 0x4c, 0x7b, 0x90, 0x06, 0x0d, 0x42, 0x46, 0x86, 0xdf, 0x27, 0x1e, 0x36, 0x4c, - 0xeb, 0x4b, 0x76, 0x6e, 0x55, 0xf4, 0x3a, 0x21, 0xa3, 0x1e, 0x85, 0x75, 0xad, 0x2f, 0xd1, 0x45, - 0xa8, 0xf7, 0xdd, 0xd0, 0xc7, 0x81, 0x41, 0x7f, 0xd8, 0xf9, 0x54, 0xd3, 0x81, 0x83, 0xd6, 0xdd, - 0xd0, 0x57, 0x10, 0x46, 0x54, 0xec, 0x33, 0x2a, 0xc2, 0x53, 0x2a, 0x66, 0x13, 0x1a, 0x89, 0xe4, - 0x96, 0xa6, 0x30, 0x2c, 0x8b, 0x15, 0x29, 0x0c, 0xfd, 0xa6, 0x30, 0x8f, 0x0c, 0xa5, 0x24, 0xd9, - 0x37, 0x85, 0x05, 0xc7, 0xae, 0xcc, 0x5f, 0xd8, 0x37, 0x15, 0xf9, 0x10, 0x3f, 0x13, 0xc5, 0x89, - 0x9a, 0xce, 0x1b, 0x9a, 0x05, 0xb0, 0x6e, 0xba, 0xe6, 0x81, 0x3d, 0xb4, 0x83, 0x63, 0x74, 0x0d, - 0x5a, 0xa6, 0x65, 0x19, 0x7d, 0x09, 0xb1, 0xb1, 0xac, 0x14, 0xcd, 0x99, 0x96, 0xb5, 0xae, 0x80, - 0xd1, 0x0f, 0x60, 0xde, 0xf2, 0x88, 0x9b, 0xc4, 0xe5, 0xa5, 0xa3, 0x16, 0xed, 0x50, 0x91, 0xb5, - 0x7f, 0x9e, 0x84, 0x0b, 0x49, 0xc5, 0xa6, 0xcb, 0x05, 0x77, 0x60, 0x36, 0x35, 0x6b, 0x32, 0x4f, - 0x8f, 0x99, 0xd4, 0x13, 0x88, 0xa9, 0x84, 0xba, 0x9c, 0x49, 0xa8, 0x73, 0xeb, 0x10, 0x95, 0x6f, - 0xa3, 0x0e, 0x31, 0xf9, 0x4d, 0xea, 0x10, 0x53, 0x27, 0xaa, 0x43, 0x5c, 0x61, 0x65, 0x41, 0x39, - 0x88, 0x65, 0x83, 0xdc, 0x8c, 0x1a, 0x11, 0x8e, 0x23, 0xcb, 0x87, 0xa9, 0x7a, 0xc5, 0xcc, 0x69, - 0xea, 0x15, 0xd5, 0xc2, 0x7a, 0x05, 0xb5, 0x08, 0xd7, 0x35, 0xbd, 0x11, 0xf1, 0x64, 0x41, 0xa2, - 0x5d, 0x63, 0x2c, 0xcc, 0x49, 0xb8, 0x28, 0x46, 0x14, 0x96, 0x2e, 0xa0, 0xa8, 0x74, 0x81, 0x56, - 0x61, 0xd6, 0x21, 0x86, 0x83, 0x9f, 0x1b, 0x54, 0x61, 0x7e, 0xbb, 0xce, 0xb5, 0xe7, 0x90, 0x6d, - 0xfc, 0x7c, 0x97, 0x42, 0xb4, 0xbf, 0x2d, 0xc1, 0x42, 0xd2, 0x70, 0x44, 0xb2, 0x7a, 0x0f, 0x6a, - 0x9e, 0xf4, 0x0d, 0xc2, 0x58, 0x56, 0x93, 0xa1, 0x5f, 0xd6, 0x87, 0xe8, 0xf1, 0x10, 0xf4, 0xe3, - 0xc2, 0xb2, 0xc7, 0x95, 0x02, 0x32, 0xaf, 0x2a, 0x7c, 0x68, 0xbf, 0x03, 0x8b, 0x9f, 0xd9, 0x8e, - 0x45, 0x9e, 0xfb, 0x69, 0x66, 0x1f, 0x64, 0x99, 0xd5, 0xa2, 0x59, 0xd2, 0x63, 0xf2, 0xd8, 0xd5, - 0xfe, 0xae, 0x04, 0xcb, 0x85, 0x88, 0x29, 0xff, 0x56, 0x4a, 0xfb, 0x37, 0xe1, 0x1b, 0xfb, 0x24, - 0x74, 0x02, 0xc5, 0x37, 0xae, 0xb3, 0xea, 0x28, 0x77, 0x42, 0xc6, 0xc8, 0x7c, 0x61, 0x8f, 0xc2, - 0x91, 0x70, 0x8e, 0x94, 0xdc, 0x53, 0x0e, 0x79, 0x0d, 0xef, 0xa8, 0x75, 0x61, 0x3e, 0xe2, 0x72, - 0x6c, 0xf9, 0x45, 0x29, 0xa7, 0x94, 0x93, 0xe5, 0x14, 0x07, 0xa6, 0x37, 0xf0, 0x33, 0xbb, 0x8f, - 0xbf, 0x95, 0xf2, 0xed, 0x2a, 0xd4, 0x5d, 0xec, 0x8d, 0x6c, 0xdf, 0x8f, 0xb6, 0x7f, 0x4d, 0x57, - 0x41, 0xda, 0x5f, 0x4c, 0xc3, 0x5c, 0x5a, 0x6d, 0xb7, 0x33, 0xd5, 0x9b, 0x4e, 0xec, 0x8f, 0xd2, - 0xeb, 0x53, 0xa2, 0x95, 0xab, 0xf2, 0x40, 0x2c, 0xa7, 0x52, 0xb5, 0xe8, 0xcc, 0x14, 0x87, 0x24, - 0x5d, 0x7f, 0x9f, 0x8c, 0x46, 0xa6, 0x63, 0xc9, 0xd2, 0xba, 0x68, 0x52, 0x69, 0x99, 0xde, 0x80, - 0x0a, 0x99, 0x82, 0xd9, 0x37, 0x55, 0x15, 0x4d, 0x79, 0x6c, 0x87, 0x15, 0x7f, 0x98, 0x0b, 0xa9, - 0xe9, 0x20, 0x40, 0x1b, 0xb6, 0x87, 0xde, 0x84, 0x49, 0xec, 0x3c, 0x93, 0x71, 0x49, 0x5c, 0x7b, - 0x97, 0x07, 0xb1, 0xce, 0xba, 0xd1, 0x15, 0x98, 0x1e, 0x51, 0xdd, 0xcb, 0xe4, 0xa7, 0x99, 0x2c, - 0x41, 0xeb, 0xa2, 0x17, 0x5d, 0x83, 0x19, 0x8b, 0xe9, 0x40, 0x66, 0x38, 0x73, 0x71, 0x01, 0x89, - 0xc1, 0x75, 0xd9, 0x8f, 0x3e, 0x8c, 0x22, 0xaa, 0x5a, 0x2a, 0x26, 0x4a, 0x09, 0x35, 0x37, 0xac, - 0x7a, 0x9c, 0x0c, 0xab, 0x80, 0x91, 0xb8, 0x56, 0x48, 0x62, 0x7c, 0xf9, 0x67, 0x19, 0xaa, 0x43, - 0x32, 0xe0, 0x76, 0x50, 0xe7, 0x17, 0x31, 0x43, 0x32, 0x60, 0x66, 0xb0, 0x40, 0xc3, 0x48, 0xcb, - 0x76, 0xda, 0xb3, 0xcc, 0xd1, 0xf0, 0x06, 0xdd, 0x3d, 0xec, 0xc3, 0x20, 0x4e, 0x1f, 0xb7, 0x1b, - 0xac, 0xab, 0xc6, 0x20, 0x3b, 0x4e, 0x9f, 0x05, 0x2f, 0x41, 0x70, 0xdc, 0x6e, 0x32, 0x38, 0xfd, - 0xa4, 0xd1, 0x3f, 0x4f, 0x39, 0xe7, 0x52, 0xd1, 0x7f, 0x9e, 0xa7, 0x92, 0x19, 0xe7, 0xfb, 0x30, - 0xf3, 0x9c, 0x6f, 0xe0, 0x76, 0x8b, 0x0d, 0xbb, 0x58, 0xe8, 0x01, 0xc4, 0x40, 0x89, 0xff, 0x5d, - 0x46, 0x8b, 0xff, 0x58, 0x82, 0xc5, 0x75, 0x16, 0x37, 0x2b, 0x6e, 0xe7, 0x34, 0xa5, 0x95, 0x5b, - 0x51, 0x0d, 0x2b, 0x5d, 0x07, 0x49, 0x2f, 0x57, 0xe0, 0xa1, 0x07, 0xd0, 0x94, 0x34, 0xc5, 0xc8, - 0xca, 0xab, 0xaa, 0x5f, 0x0d, 0x5f, 0x6d, 0x6a, 0x1f, 0xc2, 0x52, 0x86, 0x67, 0x11, 0xe3, 0x5e, - 0x82, 0xd9, 0xd8, 0x99, 0x44, 0x2c, 0xd7, 0x23, 0xd8, 0x96, 0xa5, 0xdd, 0x85, 0xb3, 0xbd, 0xc0, - 0xf4, 0x82, 0xcc, 0x82, 0x4f, 0x30, 0x96, 0x15, 0xc0, 0x92, 0x63, 0x45, 0x8d, 0xaa, 0x07, 0x0b, - 0xbd, 0x80, 0xb8, 0xaf, 0x41, 0x94, 0x3a, 0x09, 0xba, 0x6c, 0x12, 0x4a, 0xe7, 0x2d, 0x9b, 0xda, - 0x12, 0x2f, 0xd7, 0x65, 0x67, 0xfb, 0x00, 0x16, 0x79, 0xb5, 0xec, 0x75, 0x16, 0xb1, 0x2c, 0x6b, - 0x75, 0x59, 0xba, 0x1b, 0x70, 0x26, 0x3e, 0x0f, 0xe3, 0x1c, 0xfb, 0x46, 0x32, 0xc7, 0x5e, 0xca, - 0xea, 0x38, 0x91, 0x62, 0xff, 0x79, 0x59, 0xf1, 0xb5, 0x05, 0x19, 0xf6, 0x5a, 0x32, 0xc3, 0x3e, - 0x5f, 0x40, 0x32, 0x91, 0x60, 0x67, 0x2d, 0xb2, 0x92, 0x63, 0x91, 0x7a, 0x26, 0x0d, 0x9f, 0x4c, - 0x15, 0x2b, 0x52, 0xbc, 0xfd, 0x46, 0xb2, 0xf0, 0x2d, 0x9e, 0x85, 0x47, 0x53, 0x47, 0x15, 0xcc, - 0x5b, 0xa9, 0x2c, 0xbc, 0x5d, 0xc4, 0x66, 0x94, 0x84, 0xff, 0xc9, 0x24, 0xd4, 0xa2, 0xbe, 0x8c, - 0x60, 0xb3, 0x42, 0x2a, 0xe7, 0x08, 0x49, 0x3d, 0xfa, 0x2a, 0xaf, 0x73, 0xf4, 0x4d, 0xbe, 0xea, - 0xe8, 0x3b, 0x07, 0x35, 0xf6, 0x61, 0x78, 0xf8, 0x50, 0x1c, 0x65, 0x55, 0x06, 0xd0, 0xf1, 0x61, - 0x6c, 0x50, 0xd3, 0x27, 0x31, 0xa8, 0x54, 0xba, 0x3f, 0x93, 0x4e, 0xf7, 0x6f, 0x47, 0x87, 0x13, - 0x3f, 0xc6, 0x56, 0xb2, 0xe4, 0x72, 0x8f, 0xa5, 0xcd, 0xe4, 0xb1, 0xc4, 0x4f, 0xb6, 0xcb, 0x39, - 0x83, 0xbf, 0xb7, 0xc9, 0xfe, 0x13, 0x9e, 0xec, 0xab, 0x56, 0x25, 0x1c, 0xe1, 0x1a, 0x40, 0xb4, - 0xe7, 0x65, 0xc6, 0x8f, 0xb2, 0x4b, 0xd3, 0x15, 0x2c, 0x6d, 0x1f, 0x16, 0x13, 0xf2, 0x8f, 0xcb, - 0xec, 0x27, 0xf3, 0x62, 0x05, 0x35, 0xf6, 0x7f, 0x9b, 0x52, 0xdc, 0x41, 0x41, 0xa5, 0xfa, 0x76, - 0xa6, 0x72, 0x74, 0x32, 0x7b, 0xbc, 0x91, 0x2c, 0x1c, 0x9d, 0xce, 0x90, 0x32, 0x75, 0x23, 0x16, - 0x29, 0x98, 0x9e, 0xe8, 0xe6, 0x29, 0x7f, 0x4d, 0x40, 0xba, 0x2c, 0x94, 0x3e, 0xb4, 0x1d, 0xdb, - 0x3f, 0xe2, 0xfd, 0xd3, 0x3c, 0x94, 0x96, 0xa0, 0x2e, 0x7b, 0xc9, 0x80, 0x5f, 0xd8, 0x81, 0xd1, - 0x27, 0x16, 0x66, 0x66, 0x3a, 0xa5, 0x57, 0x29, 0x60, 0x9d, 0x58, 0x38, 0xde, 0x3a, 0xd5, 0x53, - 0x6d, 0x9d, 0x5a, 0x6a, 0xeb, 0x2c, 0xc2, 0xb4, 0x87, 0x4d, 0x9f, 0x38, 0x22, 0xef, 0x12, 0x2d, - 0x2a, 0xff, 0x11, 0xf6, 0x7d, 0x3a, 0x81, 0x88, 0x8a, 0x44, 0x53, 0x89, 0xdd, 0x66, 0x8b, 0x62, - 0xb7, 0x31, 0xa5, 0xf0, 0x54, 0xec, 0xd6, 0x28, 0x8a, 0xdd, 0x4e, 0x52, 0x09, 0x57, 0x22, 0xd3, - 0xe6, 0xd8, 0xc8, 0x54, 0x8d, 0xf1, 0xe6, 0x12, 0x31, 0xde, 0x77, 0xb9, 0xdb, 0xfe, 0xb5, 0x04, - 0x4b, 0x99, 0x0d, 0x22, 0xf6, 0xdb, 0xad, 0x54, 0x2d, 0xbd, 0x5d, 0x24, 0xa1, 0xa8, 0x94, 0x7e, - 0x2f, 0x51, 0x4a, 0xbf, 0x5e, 0x88, 0xff, 0xad, 0x57, 0xd2, 0xff, 0x00, 0x2e, 0xee, 0xbb, 0x56, - 0x2a, 0x7c, 0x12, 0x29, 0xe9, 0xc9, 0xf7, 0xfb, 0x6d, 0x19, 0x24, 0x97, 0x4f, 0x98, 0x9c, 0x73, - 0x74, 0x4d, 0x83, 0xd5, 0xe2, 0xd9, 0x45, 0x18, 0xf2, 0x7b, 0x30, 0xb7, 0xf9, 0x02, 0xf7, 0x7b, - 0xc7, 0x4e, 0xff, 0x14, 0x1c, 0xb5, 0xa0, 0xd2, 0x1f, 0x59, 0xa2, 0x46, 0x45, 0x3f, 0xd5, 0xc8, - 0xaa, 0x92, 0x8c, 0xac, 0x0c, 0x68, 0xc5, 0x33, 0x08, 0x15, 0x2e, 0x52, 0x15, 0x5a, 0x14, 0x99, - 0x12, 0x9f, 0xd5, 0x45, 0x4b, 0xc0, 0xb1, 0xe7, 0xb1, 0xa5, 0x72, 0x38, 0xf6, 0xbc, 0xe4, 0x6e, - 0xaf, 0x24, 0x77, 0xbb, 0xf6, 0x57, 0x25, 0xa8, 0xd3, 0x19, 0xbe, 0x11, 0xff, 0x22, 0x35, 0xa9, - 0xc4, 0xa9, 0x49, 0x94, 0xe1, 0x4c, 0xaa, 0x19, 0x4e, 0xcc, 0xf9, 0x14, 0x03, 0x67, 0x39, 0x9f, - 0x8e, 0xe0, 0xd8, 0xf3, 0xb4, 0x55, 0x98, 0xe5, 0xbc, 0x89, 0x95, 0xb7, 0xa0, 0x12, 0x7a, 0x43, - 0x69, 0x3d, 0xa1, 0x37, 0xd4, 0xfe, 0xb4, 0x04, 0x8d, 0x6e, 0x10, 0x98, 0xfd, 0xa3, 0x53, 0x2c, - 0x20, 0x62, 0xae, 0xac, 0x32, 0x97, 0x5d, 0x44, 0xcc, 0xee, 0x64, 0x01, 0xbb, 0x53, 0x09, 0x76, - 0x35, 0x68, 0x4a, 0x5e, 0x0a, 0x19, 0xde, 0x06, 0xb4, 0x4b, 0xbc, 0xe0, 0x21, 0xf1, 0x9e, 0x9b, - 0x9e, 0x75, 0xba, 0x1c, 0x06, 0xc1, 0xa4, 0x78, 0x9d, 0x56, 0xb9, 0x3a, 0xa5, 0xb3, 0x6f, 0xed, - 0x2d, 0x38, 0x93, 0xa0, 0x57, 0x38, 0xf1, 0x1d, 0xa8, 0x33, 0x07, 0x2e, 0xe2, 0xdc, 0xab, 0x6a, - 0xb1, 0x7c, 0x9c, 0x97, 0xd7, 0xba, 0x30, 0x4f, 0xcf, 0x6e, 0x06, 0x8f, 0x36, 0xde, 0x0f, 0x53, - 0xd1, 0xe0, 0x42, 0x72, 0x7c, 0x2a, 0x12, 0xfc, 0xfb, 0x12, 0x4c, 0x31, 0x78, 0xe6, 0x3c, 0x3d, - 0x07, 0x35, 0x0f, 0xbb, 0xc4, 0x08, 0xcc, 0x41, 0xf4, 0xe0, 0x8f, 0x02, 0xf6, 0xcc, 0x81, 0xcf, - 0xde, 0x2b, 0xd2, 0x4e, 0xcb, 0x1e, 0x60, 0x3f, 0x90, 0xaf, 0xfe, 0xea, 0x14, 0xb6, 0xc1, 0x41, - 0x54, 0x24, 0xbe, 0xfd, 0xfb, 0x3c, 0xcc, 0x9b, 0xd4, 0xd9, 0x37, 0x7a, 0x93, 0xbf, 0xa5, 0x19, - 0x53, 0xd9, 0x64, 0x0f, 0x6c, 0x3a, 0x50, 0x4d, 0x15, 0x33, 0xa3, 0xb6, 0xf6, 0x21, 0x20, 0x75, - 0xcd, 0x42, 0xa8, 0x57, 0x60, 0x9a, 0x89, 0x44, 0xc6, 0x29, 0xcd, 0xe4, 0xa2, 0x75, 0xd1, 0xab, - 0x7d, 0x0e, 0x88, 0x4b, 0x31, 0x11, 0x9b, 0x9c, 0x58, 0xe2, 0x63, 0x42, 0x94, 0x7f, 0x28, 0xc1, - 0x99, 0x04, 0xe9, 0xe8, 0x55, 0x45, 0x82, 0x76, 0x9a, 0x31, 0x41, 0xf7, 0x6e, 0xc2, 0x93, 0x5f, - 0x49, 0x31, 0xf0, 0x6b, 0xf2, 0xe2, 0xbf, 0x28, 0x01, 0x74, 0xc3, 0xe0, 0x48, 0xd4, 0xb2, 0x54, - 0xa9, 0x97, 0x92, 0x52, 0xa7, 0x7d, 0xae, 0xe9, 0xfb, 0xcf, 0x89, 0x27, 0x93, 0x81, 0xa8, 0xcd, - 0xea, 0x50, 0x61, 0x70, 0x24, 0x6f, 0x12, 0xe8, 0x37, 0x7a, 0x13, 0x9a, 0xfc, 0xdd, 0xa8, 0x61, - 0x5a, 0x96, 0x87, 0x7d, 0x5f, 0x5c, 0x29, 0x34, 0x38, 0xb4, 0xcb, 0x81, 0x14, 0xcd, 0xb6, 0xb0, - 0x13, 0xd8, 0xc1, 0xb1, 0x11, 0x90, 0xaf, 0xb0, 0x23, 0xc2, 0xfc, 0x86, 0x84, 0xee, 0x51, 0x20, - 0x45, 0xf3, 0xf0, 0xc0, 0xf6, 0x03, 0x4f, 0xa2, 0xc9, 0x12, 0xb7, 0x80, 0x32, 0x34, 0xed, 0x67, - 0x25, 0x68, 0xed, 0x86, 0xc3, 0x21, 0x97, 0xec, 0xa9, 0x75, 0xfb, 0x96, 0x58, 0x47, 0x39, 0x65, - 0x9d, 0xb1, 0x88, 0xc4, 0xe2, 0xbe, 0x79, 0xf9, 0xe1, 0x16, 0xcc, 0x2b, 0x8c, 0x0a, 0x4b, 0x49, - 0xc4, 0x6c, 0xa5, 0x64, 0xcc, 0xa6, 0xdd, 0x03, 0xc4, 0x33, 0xee, 0xd7, 0x5b, 0x9c, 0x76, 0x16, - 0xce, 0x24, 0xc6, 0x8b, 0x63, 0xf2, 0x3a, 0x34, 0xc4, 0xa3, 0x09, 0x61, 0x04, 0xcb, 0x50, 0xa5, - 0xee, 0xae, 0x6f, 0x5b, 0xf2, 0x0a, 0x69, 0xc6, 0x25, 0xd6, 0xba, 0x6d, 0x79, 0xda, 0x36, 0x34, - 0x74, 0x4e, 0x5e, 0xe0, 0x7e, 0x04, 0x4d, 0xf1, 0xc4, 0xc2, 0x48, 0x3c, 0x42, 0x8a, 0xef, 0x3b, - 0x12, 0xb4, 0xf5, 0x86, 0xa3, 0x36, 0xb5, 0x9f, 0x40, 0x87, 0x1f, 0xe3, 0x09, 0xaa, 0x72, 0x69, - 0x1f, 0x81, 0x7c, 0xd7, 0x5c, 0x44, 0x3c, 0x39, 0xac, 0xe1, 0xa9, 0x4d, 0xed, 0x02, 0x9c, 0xcb, - 0x25, 0x2e, 0xd6, 0xed, 0x42, 0x2b, 0xee, 0xb0, 0x6c, 0x79, 0x73, 0xc6, 0x6e, 0xc4, 0x4a, 0xca, - 0x8d, 0xd8, 0x62, 0x14, 0x93, 0x95, 0xe5, 0x79, 0xc2, 0x22, 0xaf, 0x38, 0x84, 0xae, 0x14, 0x85, - 0xd0, 0x93, 0x89, 0x10, 0x5a, 0xfb, 0x24, 0x92, 0x9e, 0xc8, 0x5f, 0xde, 0x67, 0xe9, 0x15, 0x9f, - 0x5b, 0xba, 0xad, 0xe5, 0x9c, 0xc5, 0x71, 0x0c, 0x5d, 0x41, 0xd6, 0xae, 0x41, 0x23, 0xe9, 0xc0, - 0x14, 0xb7, 0x54, 0xca, 0xb8, 0xa5, 0x66, 0xca, 0x23, 0xdd, 0x4c, 0xc5, 0x99, 0x19, 0x89, 0xa6, - 0xa2, 0xcc, 0xf7, 0x12, 0xbe, 0xe9, 0x52, 0x7c, 0x99, 0xf5, 0x6b, 0x72, 0x4b, 0x0b, 0xc2, 0x47, - 0x3f, 0xf4, 0xe9, 0x78, 0xb1, 0x44, 0xed, 0x32, 0xd4, 0xf7, 0x8b, 0x5e, 0x1c, 0x4f, 0xca, 0xdb, - 0xe1, 0xb7, 0x60, 0xbe, 0x17, 0x10, 0xcf, 0x1c, 0xe0, 0x2d, 0xe6, 0x40, 0x0e, 0x6d, 0x7e, 0xfb, - 0x19, 0x86, 0xd1, 0xd1, 0xc6, 0xbe, 0xb5, 0xff, 0x2c, 0xc1, 0xdc, 0x43, 0x7b, 0x88, 0xfd, 0x63, - 0x3f, 0xc0, 0xa3, 0x7d, 0x96, 0xe4, 0x9c, 0x87, 0x1a, 0x5d, 0x97, 0x1f, 0x98, 0x23, 0x57, 0xde, - 0x90, 0x44, 0x00, 0xaa, 0x2e, 0x9f, 0x93, 0x96, 0x05, 0x11, 0x35, 0xc1, 0xcc, 0xcc, 0x4a, 0x93, - 0x3e, 0x01, 0x42, 0xef, 0x02, 0x84, 0x3e, 0xb6, 0xc4, 0x9d, 0x48, 0x25, 0x75, 0x2a, 0xef, 0xab, - 0xf7, 0x7a, 0x14, 0x8f, 0x5f, 0x1f, 0xbf, 0x07, 0x75, 0xdb, 0x21, 0x16, 0x66, 0xf7, 0x7a, 0x96, - 0x28, 0x96, 0xe4, 0x8f, 0x02, 0x8e, 0xb8, 0xef, 0x63, 0x4b, 0xfb, 0x5d, 0x71, 0x0a, 0x49, 0xe1, - 0x09, 0x9d, 0x6f, 0xc2, 0x3c, 0xf7, 0x2d, 0x87, 0xd1, 0xa2, 0xa5, 0xcd, 0xc5, 0x69, 0x46, 0x4a, - 0x20, 0x7a, 0xcb, 0x16, 0x01, 0x83, 0x1c, 0xa1, 0xdd, 0x85, 0xb3, 0x89, 0xdc, 0xe2, 0x14, 0xd1, - 0xbe, 0xf6, 0x28, 0x55, 0x1a, 0x88, 0x0d, 0x52, 0x64, 0xe0, 0xd2, 0x1e, 0x0b, 0x32, 0x70, 0x9f, - 0x67, 0xe0, 0xbe, 0xa6, 0xc3, 0x72, 0xa2, 0x62, 0x91, 0x60, 0xe4, 0xbd, 0x54, 0xf4, 0x73, 0xa1, - 0x80, 0x58, 0x2a, 0x0c, 0xfa, 0xdf, 0x12, 0x2c, 0xe4, 0x21, 0xbc, 0x66, 0x6d, 0xec, 0xb3, 0x82, - 0x77, 0x3c, 0xb7, 0xc6, 0x72, 0xf3, 0x1b, 0xa9, 0x22, 0x3e, 0x86, 0x4e, 0x9e, 0xf4, 0xb2, 0xaa, - 0xa8, 0x9c, 0x40, 0x15, 0xff, 0x57, 0x56, 0xaa, 0xbd, 0xdd, 0x20, 0xf0, 0xec, 0x83, 0x90, 0x1a, - 0xef, 0xb7, 0x55, 0x9b, 0x79, 0x10, 0xd5, 0x1d, 0xb8, 0xfc, 0xae, 0x66, 0x47, 0xc5, 0xb3, 0xe6, - 0xd6, 0x1e, 0x76, 0x92, 0xb5, 0x07, 0x5e, 0xc7, 0xbd, 0x31, 0x96, 0xcc, 0xf7, 0xb6, 0x54, 0xf7, - 0xb2, 0x04, 0xcd, 0xa4, 0x1e, 0xd0, 0x87, 0x00, 0x66, 0xc4, 0xb9, 0x30, 0xf9, 0xf3, 0xe3, 0x56, - 0xa7, 0x2b, 0xf8, 0xe8, 0x32, 0x54, 0xfa, 0x6e, 0x28, 0x34, 0x12, 0xdf, 0x05, 0xae, 0xbb, 0x21, - 0x77, 0x00, 0xb4, 0x97, 0xe6, 0x13, 0xfc, 0xfe, 0x36, 0xe3, 0xb9, 0x9e, 0x32, 0x30, 0x47, 0x15, - 0x38, 0xe8, 0x3e, 0x34, 0x9f, 0x7b, 0x76, 0x60, 0x1e, 0x0c, 0xb1, 0x31, 0x34, 0x8f, 0xb1, 0x27, - 0x3c, 0x57, 0xb1, 0x97, 0x69, 0x48, 0xfc, 0x27, 0x14, 0x5d, 0x0b, 0xa1, 0x2a, 0xe7, 0x7f, 0x85, - 0x47, 0x7e, 0x0c, 0x4b, 0x21, 0x45, 0x33, 0xd8, 0x0b, 0x1b, 0xc7, 0x74, 0x88, 0xe1, 0x63, 0x7a, - 0x4a, 0xca, 0x07, 0xb5, 0xf9, 0xde, 0x72, 0x81, 0x0d, 0x5a, 0x27, 0x1e, 0xde, 0x36, 0x1d, 0xd2, - 0xe3, 0x23, 0xb4, 0x11, 0xd4, 0x95, 0xe5, 0xbc, 0x62, 0xe6, 0x07, 0x30, 0x2f, 0x6f, 0x59, 0x7d, - 0x1c, 0x08, 0xbf, 0x3e, 0x6e, 0xce, 0x39, 0x81, 0xde, 0xc3, 0x01, 0xbf, 0xfe, 0xbe, 0x07, 0xcb, - 0x3a, 0x26, 0x2e, 0x76, 0x22, 0x15, 0x3d, 0x21, 0x83, 0x53, 0x38, 0xd3, 0xf3, 0xd0, 0xc9, 0x1b, - 0xcf, 0x77, 0xf1, 0xf5, 0xf3, 0x50, 0x95, 0xff, 0xa5, 0x42, 0x33, 0x50, 0xd9, 0x5b, 0xdf, 0x6d, - 0x4d, 0xd0, 0x8f, 0xfd, 0x8d, 0xdd, 0x56, 0xe9, 0xfa, 0x08, 0x5a, 0xe9, 0xff, 0x11, 0xa1, 0x25, - 0x38, 0xb3, 0xab, 0xef, 0xec, 0x76, 0x1f, 0x75, 0xf7, 0xb6, 0x76, 0xb6, 0x8d, 0x5d, 0x7d, 0xeb, - 0xd3, 0xee, 0xde, 0x66, 0x6b, 0x02, 0x5d, 0x82, 0x0b, 0x6a, 0xc7, 0x6f, 0xef, 0xf4, 0xf6, 0x8c, - 0xbd, 0x1d, 0x63, 0x7d, 0x67, 0x7b, 0xaf, 0xbb, 0xb5, 0xbd, 0xa9, 0xb7, 0x4a, 0xe8, 0x02, 0x2c, - 0xab, 0x28, 0x1f, 0x6f, 0x6d, 0x6c, 0xe9, 0x9b, 0xeb, 0xf4, 0xbb, 0xfb, 0xa4, 0x55, 0xbe, 0x7e, - 0x17, 0xe6, 0x52, 0x4f, 0xf0, 0xd0, 0x3c, 0x34, 0x7a, 0xdd, 0xed, 0x8d, 0x8f, 0x77, 0x3e, 0x37, - 0xf4, 0xcd, 0xee, 0xc6, 0x17, 0xad, 0x09, 0xb4, 0x00, 0x2d, 0x09, 0xda, 0xde, 0xd9, 0xe3, 0xd0, - 0xd2, 0xf5, 0xaf, 0x52, 0x06, 0x8f, 0xd1, 0x59, 0x98, 0x8f, 0xe6, 0x36, 0xd6, 0xf5, 0xcd, 0xee, - 0xde, 0xe6, 0x46, 0x6b, 0x22, 0x09, 0xd6, 0xf7, 0xb7, 0xb7, 0xb7, 0xb6, 0x1f, 0xb5, 0x4a, 0x94, - 0x6a, 0x0c, 0xde, 0xfc, 0x7c, 0x8b, 0x22, 0x97, 0x93, 0xc8, 0xfb, 0xdb, 0x8f, 0xb7, 0x77, 0x3e, - 0xdb, 0x6e, 0x55, 0xd6, 0xfe, 0xa9, 0x09, 0x4d, 0x19, 0x01, 0x61, 0x8f, 0x3d, 0x2c, 0xb8, 0x07, - 0x33, 0xf2, 0x5f, 0x75, 0xb1, 0x2b, 0x4c, 0xfe, 0x05, 0xb0, 0xd3, 0xce, 0x76, 0x88, 0x20, 0x73, - 0x02, 0xed, 0xb2, 0xa0, 0x4f, 0x79, 0xee, 0x78, 0x41, 0x8d, 0xb5, 0x32, 0xef, 0x29, 0x3b, 0x2b, - 0x45, 0xdd, 0x11, 0xc5, 0x1e, 0x0d, 0xe7, 0xd4, 0xf7, 0xf3, 0x68, 0x45, 0x0d, 0x42, 0xb2, 0xef, - 0xf2, 0x3b, 0x17, 0x0b, 0xfb, 0x23, 0xa2, 0x5f, 0x40, 0x2b, 0xfd, 0x72, 0x1e, 0xc5, 0xd5, 0xb8, - 0x82, 0x57, 0xf9, 0x9d, 0x4b, 0x63, 0x30, 0x54, 0xd2, 0x99, 0x37, 0xe6, 0xab, 0x63, 0xde, 0xfc, - 0xa6, 0x49, 0x17, 0xbd, 0x0a, 0xe6, 0xa2, 0x48, 0x3e, 0x53, 0x44, 0xea, 0xcb, 0xee, 0x9c, 0xe7, - 0xaa, 0x8a, 0x28, 0xf2, 0xdf, 0x37, 0x6a, 0x13, 0xe8, 0x53, 0x98, 0x4b, 0x5d, 0x0c, 0xa3, 0x78, - 0x54, 0xfe, 0x35, 0x77, 0x67, 0xb5, 0x18, 0x21, 0xa9, 0x37, 0xf5, 0xda, 0x37, 0xa1, 0xb7, 0x9c, - 0xbb, 0xe4, 0x84, 0xde, 0x72, 0xef, 0x8b, 0x99, 0x79, 0x25, 0x2e, 0x77, 0x15, 0xf3, 0xca, 0xbb, - 0x49, 0xee, 0xac, 0x14, 0x75, 0xab, 0xcb, 0x4f, 0x5d, 0xec, 0x2a, 0xcb, 0xcf, 0xbf, 0x2f, 0xee, - 0xac, 0x16, 0x23, 0xa4, 0x75, 0x15, 0xdf, 0x32, 0xa5, 0x74, 0x95, 0xb9, 0xd4, 0x4c, 0xe9, 0x2a, - 0x7b, 0x3d, 0x25, 0x74, 0x95, 0xba, 0x14, 0xba, 0x58, 0x5c, 0x03, 0xcf, 0xe8, 0x2a, 0xbf, 0x48, - 0xae, 0x4d, 0xa0, 0xaf, 0xa1, 0x5d, 0x54, 0x5f, 0x46, 0x71, 0x04, 0xf2, 0x8a, 0x02, 0x78, 0xe7, - 0xda, 0x09, 0x30, 0xa3, 0x29, 0x0d, 0x9a, 0xde, 0xa7, 0xfd, 0x39, 0xd2, 0x14, 0xc9, 0x16, 0x1c, - 0x16, 0x9d, 0xcb, 0x63, 0x71, 0xa2, 0x09, 0xba, 0x50, 0x95, 0xd5, 0x6a, 0x14, 0x7b, 0xac, 0x54, - 0x89, 0xbc, 0xb3, 0x9c, 0xd3, 0x13, 0x91, 0x78, 0x0f, 0x26, 0x29, 0x14, 0x2d, 0x24, 0x90, 0xe4, - 0xd0, 0xb3, 0x29, 0x68, 0x34, 0xec, 0x03, 0x98, 0xe6, 0xa5, 0x57, 0x14, 0x27, 0x9a, 0x89, 0xba, - 0x70, 0x67, 0x29, 0x03, 0x8f, 0x06, 0x7f, 0xc2, 0xff, 0x3d, 0x2c, 0x6a, 0xa8, 0xe8, 0x5c, 0xe2, - 0x8f, 0x66, 0xc9, 0x4a, 0x6d, 0xe7, 0x7c, 0x7e, 0xa7, 0x6a, 0x83, 0xa9, 0xe8, 0x69, 0xa5, 0x28, - 0xbc, 0xcd, 0xd8, 0x60, 0x7e, 0xb8, 0xcc, 0x15, 0x97, 0x0d, 0xa7, 0x15, 0xc5, 0x15, 0x66, 0x2a, - 0x8a, 0xe2, 0x8a, 0xe3, 0x71, 0x6d, 0x02, 0x1d, 0xc0, 0x99, 0x9c, 0x42, 0x06, 0xba, 0x9c, 0xb2, - 0xae, 0xbc, 0x1a, 0x4a, 0xe7, 0x8d, 0xf1, 0x48, 0xaa, 0x8a, 0xc4, 0xfe, 0x59, 0xcc, 0x64, 0xf7, - 0x69, 0x15, 0xa5, 0x77, 0xcb, 0xda, 0x1f, 0x55, 0x60, 0x96, 0x97, 0x9b, 0xc4, 0xa1, 0xf9, 0x08, - 0x20, 0xae, 0xd0, 0xa2, 0x4e, 0x62, 0x99, 0x89, 0x52, 0x75, 0xe7, 0x5c, 0x6e, 0x9f, 0xaa, 0x7c, - 0xa5, 0xfe, 0xa9, 0x28, 0x3f, 0x5b, 0xc2, 0x55, 0x94, 0x9f, 0x53, 0x32, 0xd5, 0x26, 0xd0, 0x06, - 0xd4, 0xa2, 0x8a, 0x1b, 0x52, 0x0a, 0x75, 0xa9, 0x72, 0x61, 0xa7, 0x93, 0xd7, 0xa5, 0x72, 0xa4, - 0x54, 0xd1, 0x14, 0x8e, 0xb2, 0xb5, 0x39, 0x85, 0xa3, 0xbc, 0xc2, 0x5b, 0xbc, 0x3a, 0x9e, 0xa9, - 0xa7, 0x57, 0x97, 0x28, 0x7e, 0xa4, 0x57, 0x97, 0x4c, 0xee, 0xb5, 0x89, 0x8f, 0xcf, 0xff, 0xfc, - 0x97, 0x2b, 0xa5, 0xff, 0xfa, 0xe5, 0xca, 0xc4, 0x1f, 0xbe, 0x5c, 0x29, 0xfd, 0xfc, 0xe5, 0x4a, - 0xe9, 0x3f, 0x5e, 0xae, 0x94, 0xfe, 0xfb, 0xe5, 0x4a, 0xe9, 0xa7, 0xff, 0xb3, 0x32, 0x71, 0x30, - 0xcd, 0xfe, 0x4e, 0xff, 0xee, 0xaf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x56, 0x55, 0xe2, 0xa2, 0x02, - 0x41, 0x00, 0x00, + // 4542 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5b, 0xcd, 0x6f, 0x1b, 0x49, + 0x76, 0x17, 0x49, 0x7d, 0x90, 0x8f, 0x22, 0x45, 0x95, 0x65, 0x89, 0xa2, 0x6d, 0x59, 0x6e, 0xcf, + 0x78, 0x6c, 0xef, 0xda, 0x6b, 0x6b, 0x76, 0xec, 0x8c, 0x67, 0xc6, 0x36, 0x47, 0x92, 0x1d, 0x8d, + 0x6d, 0x49, 0xdb, 0x94, 0xe6, 0x23, 0x1b, 0xa0, 0xd3, 0x62, 0x97, 0xa8, 0xde, 0x21, 0xbb, 0x7a, + 0xfa, 0xc3, 0xb6, 0x82, 0x1c, 0x92, 0x4b, 0x10, 0x04, 0x08, 0xb0, 0x01, 0x02, 0x04, 0xc9, 0x29, + 0x87, 0x00, 0x8b, 0x20, 0x40, 0x10, 0x04, 0x41, 0x90, 0x3f, 0x20, 0x48, 0xf6, 0xb2, 0x40, 0x4e, + 0x41, 0x8e, 0x59, 0xe7, 0x90, 0x43, 0x80, 0xfc, 0x0d, 0x41, 0x7d, 0x75, 0x57, 0x7f, 0xd1, 0x92, + 0x67, 0x76, 0x67, 0x4e, 0xec, 0x7a, 0xf5, 0xea, 0xd5, 0xab, 0x7a, 0x55, 0xaf, 0xde, 0xfb, 0x55, + 0x11, 0x6a, 0xa6, 0x6b, 0xdf, 0x74, 0x3d, 0x12, 0x10, 0x34, 0xe3, 0x85, 0x4e, 0x60, 0x8f, 0x70, + 0xe7, 0xc6, 0xc0, 0x0e, 0x8e, 0xc2, 0x83, 0x9b, 0x7d, 0x32, 0xfa, 0xc1, 0x80, 0x0c, 0xc8, 0x0f, + 0x58, 0xfd, 0x41, 0x78, 0xc8, 0x4a, 0xac, 0xc0, 0xbe, 0x78, 0x3b, 0xed, 0x3a, 0x34, 0x3f, 0xc5, + 0x9e, 0x6f, 0x13, 0x47, 0xc7, 0x5f, 0x85, 0xd8, 0x0f, 0x50, 0x1b, 0x66, 0x9e, 0x73, 0x4a, 0xbb, + 0xb4, 0x5a, 0xba, 0x5a, 0xd3, 0x65, 0x51, 0xfb, 0x59, 0x09, 0xe6, 0x22, 0x66, 0xdf, 0x25, 0x8e, + 0x8f, 0x8b, 0xb9, 0xd1, 0x25, 0x98, 0x15, 0x3a, 0x19, 0x8e, 0x39, 0xc2, 0xed, 0x32, 0xab, 0xae, + 0x0b, 0xda, 0xb6, 0x39, 0xc2, 0xe8, 0x1d, 0x98, 0x93, 0x2c, 0x52, 0x48, 0x85, 0x71, 0x35, 0x05, + 0x59, 0xf4, 0x86, 0x6e, 0xc2, 0x19, 0xc9, 0x68, 0xba, 0x76, 0xc4, 0x3c, 0xc9, 0x98, 0xe7, 0x45, + 0x55, 0xd7, 0xb5, 0x05, 0xbf, 0xf6, 0x63, 0xa8, 0x6d, 0x6c, 0xf7, 0xd6, 0x89, 0x73, 0x68, 0x0f, + 0xa8, 0x8a, 0x3e, 0xf6, 0x68, 0x9b, 0x76, 0x69, 0xb5, 0x42, 0x55, 0x14, 0x45, 0xd4, 0x81, 0xaa, + 0x8f, 0x4d, 0xaf, 0x7f, 0x84, 0xfd, 0x76, 0x99, 0x55, 0x45, 0x65, 0xda, 0x8a, 0xb8, 0x81, 0x4d, + 0x1c, 0xbf, 0x5d, 0xe1, 0xad, 0x44, 0x51, 0xfb, 0x8b, 0x12, 0xd4, 0x77, 0x89, 0x17, 0x3c, 0x33, + 0x5d, 0xd7, 0x76, 0x06, 0xe8, 0x06, 0x54, 0xd9, 0x5c, 0xf6, 0xc9, 0x90, 0xcd, 0x41, 0x73, 0x6d, + 0xfe, 0xa6, 0x50, 0xe9, 0xe6, 0xae, 0xa8, 0xd0, 0x23, 0x16, 0xf4, 0x36, 0x34, 0xfb, 0xc4, 0x09, + 0x4c, 0xdb, 0xc1, 0x9e, 0xe1, 0x12, 0x2f, 0x60, 0x33, 0x33, 0xa5, 0x37, 0x22, 0x2a, 0x15, 0x8e, + 0xce, 0x41, 0xed, 0x88, 0xf8, 0x01, 0xe7, 0xa8, 0x30, 0x8e, 0x2a, 0x25, 0xb0, 0xca, 0x25, 0x98, + 0x61, 0x95, 0xb6, 0x2b, 0xe6, 0x60, 0x9a, 0x16, 0xb7, 0x5c, 0xed, 0x17, 0x25, 0x98, 0x7a, 0x46, + 0x42, 0x27, 0x48, 0x75, 0x63, 0x06, 0x47, 0xc2, 0x3e, 0x4a, 0x37, 0x66, 0x70, 0x14, 0x77, 0x43, + 0x39, 0xb8, 0x89, 0x78, 0x37, 0xb4, 0xb2, 0x03, 0x55, 0x0f, 0x9b, 0x16, 0x71, 0x86, 0xc7, 0x4c, + 0x85, 0xaa, 0x1e, 0x95, 0xa9, 0xed, 0x7c, 0x3c, 0xb4, 0x9d, 0xf0, 0xa5, 0xe1, 0xe1, 0xa1, 0x79, + 0x80, 0x87, 0x4c, 0x95, 0xaa, 0xde, 0x14, 0x64, 0x9d, 0x53, 0xd1, 0x07, 0x50, 0x77, 0x3d, 0xe2, + 0x9a, 0x03, 0x93, 0x4e, 0x5f, 0x7b, 0x8a, 0xcd, 0xd0, 0x72, 0x34, 0x43, 0x4c, 0xdb, 0xdd, 0x98, + 0x41, 0x57, 0xb9, 0xb5, 0x3f, 0x2f, 0xc1, 0x1c, 0x5d, 0x2a, 0xbe, 0x6b, 0xf6, 0xf1, 0x0e, 0x33, + 0x00, 0xba, 0x05, 0x33, 0x0e, 0x0e, 0x5e, 0x10, 0xef, 0x4b, 0x31, 0xdd, 0x8b, 0x91, 0xb0, 0x88, + 0xf5, 0x19, 0xb1, 0xb0, 0x2e, 0xd9, 0xd0, 0x55, 0xa8, 0xb8, 0xb6, 0xc5, 0x86, 0x57, 0xcc, 0x4d, + 0x59, 0x28, 0xa7, 0xed, 0xf6, 0xd9, 0x60, 0xc7, 0x70, 0xda, 0x6e, 0x5f, 0xd3, 0x00, 0xb6, 0x9c, + 0xe0, 0xce, 0x0f, 0x3f, 0x35, 0x87, 0x21, 0x46, 0x0b, 0x30, 0xf5, 0x9c, 0x7e, 0x30, 0x8d, 0x2a, + 0x3a, 0x2f, 0x68, 0x7f, 0x58, 0x81, 0x73, 0x4f, 0xe9, 0x5c, 0xf4, 0x4c, 0xc7, 0x3a, 0x20, 0x2f, + 0x7b, 0xb8, 0x1f, 0x7a, 0x76, 0x70, 0xbc, 0x4e, 0x9c, 0x00, 0xbf, 0x0c, 0xd0, 0x26, 0xcc, 0x3b, + 0x52, 0xb2, 0x21, 0x57, 0x1b, 0x95, 0x50, 0x5f, 0x6b, 0x67, 0xfb, 0xe6, 0xc3, 0xd7, 0x5b, 0x4e, + 0x92, 0xe0, 0xa3, 0x07, 0xb1, 0x29, 0xa4, 0x90, 0x32, 0x13, 0x12, 0x0f, 0xa0, 0xb7, 0xc9, 0xf4, + 0x10, 0x22, 0xa4, 0x89, 0xa4, 0x80, 0x77, 0x81, 0x6e, 0x4b, 0xc3, 0xf4, 0x8d, 0xd0, 0xc7, 0x1e, + 0x1b, 0x7d, 0x7d, 0xed, 0x4c, 0xd4, 0x38, 0x1e, 0xa7, 0x5e, 0xf3, 0x42, 0xa7, 0xeb, 0xef, 0xfb, + 0xd8, 0x63, 0x9b, 0x57, 0x2c, 0x06, 0xc3, 0x23, 0x24, 0x38, 0xf4, 0xe5, 0x02, 0x90, 0x64, 0x9d, + 0x51, 0xd1, 0x0f, 0xe0, 0x8c, 0x1f, 0xba, 0xee, 0x10, 0x8f, 0xb0, 0x13, 0x98, 0x43, 0x63, 0xe0, + 0x91, 0xd0, 0xf5, 0xdb, 0x53, 0xab, 0x95, 0xab, 0x15, 0x1d, 0xa9, 0x55, 0x8f, 0x59, 0x0d, 0x5a, + 0x01, 0x70, 0x3d, 0xfb, 0xb9, 0x3d, 0xc4, 0x03, 0x6c, 0xb5, 0xa7, 0x99, 0x50, 0x85, 0x82, 0x6e, + 0xc1, 0x82, 0x8f, 0xfb, 0x7d, 0x32, 0x72, 0x0d, 0xd7, 0x23, 0x87, 0xf6, 0x10, 0xf3, 0xe5, 0x3b, + 0xc3, 0x96, 0x2f, 0x12, 0x75, 0xbb, 0xbc, 0x8a, 0x2e, 0x64, 0xed, 0xa7, 0x65, 0x38, 0xcb, 0x26, + 0x60, 0x97, 0x58, 0xc2, 0x16, 0xc2, 0x39, 0x5c, 0x86, 0x46, 0x9f, 0x29, 0x64, 0xb8, 0xa6, 0x87, + 0x9d, 0x40, 0xec, 0x92, 0x59, 0x4e, 0xdc, 0x65, 0x34, 0xb4, 0x03, 0x2d, 0x5f, 0x98, 0xce, 0xe8, + 0x73, 0xdb, 0x89, 0x19, 0x7e, 0x2b, 0x9a, 0xa4, 0x31, 0x76, 0xd6, 0xe7, 0xfc, 0x8c, 0xe1, 0x67, + 0xfc, 0x63, 0xbf, 0x1f, 0x0c, 0xb9, 0x73, 0xa9, 0xaf, 0x7d, 0x2f, 0x29, 0x27, 0xad, 0xe6, 0xcd, + 0x1e, 0xe7, 0xde, 0x74, 0x02, 0xef, 0x58, 0x97, 0x6d, 0x3b, 0xf7, 0x60, 0x56, 0xad, 0x40, 0x2d, + 0xa8, 0x7c, 0x89, 0x8f, 0xc5, 0x10, 0xe8, 0x67, 0xbc, 0x2e, 0xf9, 0xd6, 0xe6, 0x85, 0x7b, 0xe5, + 0xdf, 0x28, 0x69, 0x1e, 0xa0, 0xb8, 0x97, 0x67, 0x38, 0x30, 0x2d, 0x33, 0x30, 0x11, 0x82, 0x49, + 0xe6, 0xac, 0xb9, 0x08, 0xf6, 0x4d, 0xa5, 0x86, 0x62, 0xf7, 0xd4, 0x74, 0xfa, 0x89, 0xce, 0x43, + 0x2d, 0x5a, 0x84, 0xc2, 0x63, 0xc7, 0x04, 0xea, 0x39, 0xcd, 0x20, 0xc0, 0x23, 0x37, 0x60, 0x0b, + 0xa2, 0xa1, 0xcb, 0xa2, 0xf6, 0xcf, 0x93, 0xd0, 0xca, 0x58, 0xe0, 0x2e, 0x54, 0x47, 0xa2, 0x7b, + 0xb1, 0xf6, 0xcf, 0xc5, 0xee, 0x33, 0xa3, 0xa1, 0x1e, 0x31, 0x53, 0xef, 0x44, 0x3d, 0x95, 0x72, + 0xb8, 0x44, 0x65, 0x6a, 0xd6, 0x21, 0x19, 0x18, 0x96, 0xed, 0xe1, 0x7e, 0x40, 0xbc, 0x63, 0xa1, + 0xe5, 0xec, 0x90, 0x0c, 0x36, 0x24, 0x0d, 0xdd, 0x06, 0xb0, 0x1c, 0x9f, 0x5a, 0xf4, 0xd0, 0x1e, + 0x30, 0x5d, 0xeb, 0x6b, 0x28, 0xea, 0x3b, 0x3a, 0x40, 0xf4, 0x9a, 0xe5, 0xf8, 0x42, 0xd9, 0xf7, + 0xa1, 0x41, 0x1d, 0xb2, 0x31, 0xe2, 0xbe, 0x9f, 0xaf, 0xe2, 0xfa, 0xda, 0x82, 0xa2, 0x71, 0x74, + 0x30, 0xe8, 0xb3, 0x6e, 0x5c, 0xf0, 0xd1, 0x47, 0x30, 0xcd, 0x1c, 0xa2, 0xdf, 0x9e, 0x66, 0x6d, + 0xde, 0xce, 0x19, 0xa5, 0xb0, 0xf6, 0x53, 0xc6, 0xc7, 0x8d, 0x2d, 0x1a, 0xa1, 0xa7, 0x50, 0x37, + 0x1d, 0x87, 0x04, 0x26, 0xdf, 0xe0, 0x33, 0x4c, 0xc6, 0xf5, 0x62, 0x19, 0xdd, 0x98, 0x99, 0x0b, + 0x52, 0x9b, 0xa3, 0x1f, 0xc2, 0x14, 0xf3, 0x00, 0xed, 0x2a, 0x1b, 0xf5, 0xca, 0xf8, 0xe5, 0xa7, + 0x73, 0xe6, 0xce, 0xfb, 0x50, 0x57, 0x54, 0x3b, 0xcd, 0x72, 0xeb, 0xdc, 0x87, 0x56, 0x5a, 0xa3, + 0x53, 0x2d, 0xd7, 0x2d, 0x58, 0xd0, 0x43, 0x27, 0x56, 0x4c, 0x46, 0x2b, 0xb7, 0x61, 0x5a, 0xd8, + 0x8f, 0xaf, 0x9d, 0xe5, 0xc2, 0x19, 0xd1, 0x05, 0xa3, 0xf6, 0x11, 0x9c, 0x4d, 0x89, 0x12, 0xb1, + 0xcc, 0x5b, 0xd0, 0x74, 0x89, 0x65, 0xf8, 0x9c, 0x6c, 0xd8, 0x96, 0x74, 0x06, 0x6e, 0xc4, 0xbb, + 0x65, 0xd1, 0xe6, 0xbd, 0x80, 0xb8, 0x59, 0x55, 0x4e, 0xd6, 0xbc, 0x0d, 0x8b, 0xe9, 0xe6, 0xbc, + 0x7b, 0xed, 0x01, 0x2c, 0xe9, 0x78, 0x44, 0x9e, 0xe3, 0x37, 0x15, 0xdd, 0x81, 0x76, 0x56, 0x80, + 0x10, 0xfe, 0x05, 0x2c, 0xc5, 0xd4, 0x5e, 0x60, 0x06, 0xa1, 0x7f, 0x2a, 0xe1, 0x22, 0xd0, 0x3b, + 0x20, 0x3e, 0x37, 0x4e, 0x55, 0x97, 0x45, 0xed, 0x9a, 0x2a, 0x7a, 0x9b, 0x1f, 0xb9, 0xbc, 0x07, + 0xd4, 0x84, 0xb2, 0xed, 0x0a, 0x71, 0x65, 0xdb, 0xd5, 0x1e, 0x40, 0x2d, 0x3a, 0xce, 0xd0, 0x5a, + 0x1c, 0x61, 0x95, 0x5f, 0x73, 0xe6, 0x45, 0xb1, 0xd7, 0x93, 0x8c, 0x1f, 0x17, 0x3d, 0xad, 0x01, + 0x44, 0x1e, 0x48, 0x9e, 0xa1, 0x28, 0x2b, 0x4f, 0x57, 0xb8, 0xb4, 0xbf, 0x4e, 0xb8, 0x23, 0x45, + 0x65, 0x2b, 0x52, 0xd9, 0x4a, 0xb8, 0xa7, 0xf2, 0x69, 0xdc, 0xd3, 0x4d, 0x98, 0xf2, 0x03, 0x33, + 0xc0, 0x22, 0x98, 0x68, 0xe7, 0xb4, 0xa2, 0x5d, 0x62, 0x9d, 0xb3, 0xa1, 0x0b, 0x00, 0x7d, 0x0f, + 0x9b, 0x01, 0xb6, 0x0c, 0x93, 0x7b, 0xce, 0x8a, 0x5e, 0x13, 0x94, 0x6e, 0x80, 0xee, 0xc5, 0x51, + 0xcf, 0x14, 0x53, 0x63, 0x35, 0x47, 0x60, 0x62, 0xf6, 0xe3, 0xf8, 0x27, 0xda, 0xed, 0xd3, 0xe3, + 0x77, 0xbb, 0x68, 0xc7, 0x99, 0x15, 0x87, 0x35, 0x53, 0xe8, 0xb0, 0x78, 0x8b, 0x93, 0x38, 0xac, + 0x6a, 0xa1, 0xc3, 0x12, 0x32, 0xc6, 0x3a, 0xac, 0x6f, 0xd3, 0xf5, 0xfc, 0x5b, 0x09, 0xda, 0xd9, + 0xbd, 0x23, 0x7c, 0xc6, 0x6d, 0x98, 0xf6, 0x19, 0x65, 0x8c, 0xff, 0x11, 0x4d, 0x04, 0x23, 0x7a, + 0x00, 0x93, 0xb6, 0x73, 0x48, 0x58, 0xc6, 0xa1, 0x9e, 0xfc, 0x45, 0x7d, 0xdc, 0xdc, 0x72, 0x0e, + 0x09, 0x9f, 0x12, 0xd6, 0xb0, 0x73, 0x17, 0x6a, 0x11, 0xe9, 0x54, 0x23, 0x79, 0x04, 0x0b, 0xa9, + 0xc5, 0xc7, 0xa3, 0xd7, 0x68, 0xa9, 0x96, 0x4e, 0xb4, 0x54, 0xb5, 0xff, 0x2b, 0xa9, 0x1b, 0xe7, + 0x91, 0x3d, 0x0c, 0xb0, 0x97, 0xd9, 0x38, 0xef, 0x4a, 0xa1, 0x7c, 0xd7, 0x5c, 0x28, 0x12, 0xca, + 0x03, 0x4b, 0xb1, 0x09, 0x7a, 0xd0, 0x64, 0xcb, 0xc7, 0xf0, 0xf1, 0x90, 0x9d, 0xd2, 0x22, 0x3e, + 0xfa, 0x7e, 0x4e, 0x6b, 0xde, 0x2f, 0x5f, 0x7b, 0x3d, 0xc1, 0xce, 0xa7, 0xa9, 0x31, 0x54, 0x69, + 0x9d, 0x87, 0x80, 0xb2, 0x4c, 0xa7, 0x9a, 0xb8, 0x4f, 0xa8, 0xdb, 0xa1, 0xb9, 0x57, 0xce, 0xf1, + 0x73, 0xc8, 0xd4, 0x18, 0x63, 0x7e, 0xae, 0xa7, 0x2e, 0x18, 0xb5, 0xbf, 0xaa, 0x00, 0xc4, 0x95, + 0xdf, 0x59, 0x7f, 0x73, 0x37, 0xda, 0xfd, 0x3c, 0xc4, 0xb9, 0x98, 0x23, 0x2f, 0x77, 0xdf, 0x3f, + 0x4a, 0xee, 0x7b, 0x1e, 0xec, 0xbc, 0x95, 0xd7, 0xfa, 0x3b, 0xbb, 0xe3, 0xd7, 0x61, 0x31, 0x6d, + 0x6e, 0xb1, 0xdd, 0xaf, 0xc1, 0x94, 0x1d, 0xe0, 0x11, 0x47, 0x12, 0xd4, 0x1c, 0x49, 0xe1, 0xe5, + 0x1c, 0xda, 0x25, 0xa8, 0x6d, 0x8d, 0xcc, 0x01, 0xee, 0xb9, 0xb8, 0x4f, 0xfb, 0xb2, 0x69, 0x41, + 0xf4, 0xcf, 0x0b, 0xda, 0x1a, 0x54, 0x9f, 0xe0, 0x63, 0xbe, 0x07, 0x4f, 0xa8, 0x9f, 0xf6, 0x27, + 0x65, 0x58, 0x62, 0x6e, 0x7b, 0x5d, 0xe6, 0xf1, 0x3a, 0xf6, 0x49, 0xe8, 0xf5, 0xb1, 0xcf, 0x4c, + 0xea, 0x86, 0x86, 0x8b, 0x3d, 0x9b, 0x58, 0x22, 0x15, 0xad, 0xf5, 0xdd, 0x70, 0x97, 0x11, 0x68, + 0xae, 0x4f, 0xab, 0xbf, 0x0a, 0x89, 0x58, 0x5b, 0x15, 0xbd, 0xda, 0x77, 0xc3, 0x1f, 0xd1, 0xb2, + 0x6c, 0xeb, 0x1f, 0x99, 0x1e, 0xf6, 0xd9, 0x1a, 0xe2, 0x6d, 0x7b, 0x8c, 0x80, 0x6e, 0xc3, 0xd9, + 0x11, 0x1e, 0x11, 0xef, 0xd8, 0x18, 0xda, 0x23, 0x3b, 0x30, 0x6c, 0xc7, 0x38, 0x38, 0x0e, 0xb0, + 0x2f, 0x16, 0x0e, 0xe2, 0x95, 0x4f, 0x69, 0xdd, 0x96, 0xf3, 0x31, 0xad, 0x41, 0x1a, 0x34, 0x08, + 0x19, 0x19, 0x7e, 0x9f, 0x78, 0xd8, 0x30, 0xad, 0x9f, 0xb0, 0x73, 0xab, 0xa2, 0xd7, 0x09, 0x19, + 0xf5, 0x28, 0xad, 0x6b, 0xfd, 0x04, 0x5d, 0x84, 0x7a, 0xdf, 0x0d, 0x7d, 0x1c, 0x18, 0xf4, 0x87, + 0x9d, 0x4f, 0x35, 0x1d, 0x38, 0x69, 0xdd, 0x0d, 0x7d, 0x85, 0x61, 0x44, 0xa7, 0x7d, 0x46, 0x65, + 0x78, 0x46, 0xa7, 0xd9, 0x84, 0x46, 0x22, 0xb9, 0xa5, 0x29, 0x0c, 0xcb, 0x62, 0x45, 0x0a, 0x43, + 0xbf, 0x29, 0xcd, 0x23, 0x43, 0x39, 0x93, 0xec, 0x9b, 0xd2, 0x82, 0x63, 0x57, 0xe6, 0x2f, 0xec, + 0x9b, 0x4e, 0xf9, 0x10, 0x3f, 0x17, 0x50, 0x46, 0x4d, 0xe7, 0x05, 0xcd, 0x02, 0x58, 0x37, 0x5d, + 0xf3, 0xc0, 0x1e, 0xda, 0xc1, 0x31, 0xba, 0x06, 0x2d, 0xd3, 0xb2, 0x8c, 0xbe, 0xa4, 0xd8, 0x58, + 0xe2, 0x4a, 0x73, 0xa6, 0x65, 0xad, 0x2b, 0x64, 0xf4, 0x3d, 0x98, 0xb7, 0x3c, 0xe2, 0x26, 0x79, + 0x39, 0xd0, 0xd4, 0xa2, 0x15, 0x2a, 0xb3, 0xf6, 0x4f, 0x93, 0x70, 0x21, 0x69, 0xd8, 0x34, 0x5c, + 0x70, 0x17, 0x66, 0x53, 0xbd, 0x26, 0xf3, 0xf4, 0x58, 0x49, 0x3d, 0xc1, 0x98, 0x4a, 0xa8, 0xcb, + 0x99, 0x84, 0x3a, 0x17, 0x87, 0xa8, 0x7c, 0x13, 0x38, 0xc4, 0xe4, 0xd7, 0xc1, 0x21, 0xa6, 0x4e, + 0x84, 0x43, 0x5c, 0x61, 0x20, 0xa2, 0x6c, 0xc4, 0xb2, 0x41, 0xbe, 0x8c, 0x1a, 0x11, 0x8f, 0x23, + 0xc1, 0xc6, 0x14, 0x5e, 0x31, 0x73, 0x1a, 0xbc, 0xa2, 0x5a, 0x88, 0x57, 0xd0, 0x15, 0xe1, 0xba, + 0xa6, 0x37, 0x22, 0x9e, 0x04, 0x24, 0xda, 0x35, 0xa6, 0xc2, 0x9c, 0xa4, 0x0b, 0x30, 0xa2, 0x10, + 0xba, 0x80, 0x22, 0xe8, 0x02, 0xad, 0xc2, 0xac, 0x43, 0x0c, 0x07, 0xbf, 0x30, 0xa8, 0xc1, 0xfc, + 0x76, 0x9d, 0x5b, 0xcf, 0x21, 0xdb, 0xf8, 0xc5, 0x2e, 0xa5, 0x68, 0x7f, 0x53, 0x82, 0x85, 0xe4, + 0xc2, 0x11, 0xc9, 0xea, 0x7d, 0xa8, 0x79, 0xd2, 0x37, 0x88, 0xc5, 0xb2, 0x9a, 0x0c, 0xfd, 0xb2, + 0x3e, 0x44, 0x8f, 0x9b, 0xa0, 0x1f, 0x15, 0xc2, 0x1e, 0x57, 0x0a, 0xc4, 0xbc, 0x0e, 0xf8, 0xd0, + 0x7e, 0x0b, 0x16, 0x3f, 0xb3, 0x1d, 0x8b, 0xbc, 0xf0, 0xd3, 0xca, 0x3e, 0xcc, 0x2a, 0xab, 0x45, + 0xbd, 0xa4, 0xdb, 0xe4, 0xa9, 0xab, 0xfd, 0x6d, 0x09, 0x96, 0x0b, 0x19, 0x53, 0xfe, 0xad, 0x94, + 0xf6, 0x6f, 0xc2, 0x37, 0xf6, 0x49, 0xe8, 0x04, 0x8a, 0x6f, 0x5c, 0x67, 0x58, 0x2a, 0x77, 0x42, + 0xc6, 0xc8, 0x7c, 0x69, 0x8f, 0xc2, 0x91, 0x70, 0x8e, 0x54, 0xdc, 0x33, 0x4e, 0x79, 0x03, 0xef, + 0xa8, 0x75, 0x61, 0x3e, 0xd2, 0x72, 0x2c, 0xfc, 0xa2, 0xc0, 0x29, 0xe5, 0x24, 0x9c, 0xe2, 0xc0, + 0xf4, 0x06, 0x7e, 0x6e, 0xf7, 0xf1, 0x37, 0x02, 0xf6, 0xae, 0x42, 0xdd, 0xc5, 0xde, 0xc8, 0xf6, + 0xfd, 0x68, 0xfb, 0xd7, 0x74, 0x95, 0xa4, 0xfd, 0xd9, 0x34, 0xcc, 0xa5, 0xcd, 0x76, 0x27, 0x83, + 0xde, 0x74, 0x62, 0x7f, 0x94, 0x1e, 0x9f, 0x12, 0xad, 0x5c, 0x95, 0x07, 0x62, 0x39, 0x95, 0xaa, + 0x45, 0x67, 0xa6, 0x38, 0x24, 0xe9, 0xf8, 0xfb, 0x64, 0x34, 0x32, 0x1d, 0x4b, 0x02, 0xf1, 0xa2, + 0x48, 0x67, 0xcb, 0xf4, 0x06, 0x74, 0x92, 0x29, 0x99, 0x7d, 0x53, 0x53, 0xd1, 0x94, 0xc7, 0x76, + 0x18, 0xf8, 0xc3, 0x5c, 0x48, 0x4d, 0x07, 0x41, 0xda, 0xb0, 0x3d, 0xf4, 0x36, 0x4c, 0x62, 0xe7, + 0xb9, 0x8c, 0x4b, 0x62, 0xa4, 0x5e, 0x1e, 0xc4, 0x3a, 0xab, 0x46, 0x57, 0x60, 0x7a, 0x44, 0x6d, + 0x2f, 0x93, 0x9f, 0x66, 0x12, 0xb0, 0xd6, 0x45, 0x2d, 0xba, 0x06, 0x33, 0x16, 0xb3, 0x81, 0xcc, + 0x70, 0xe6, 0x62, 0x00, 0x89, 0xd1, 0x75, 0x59, 0x8f, 0x3e, 0x8c, 0x22, 0xaa, 0x5a, 0x2a, 0x26, + 0x4a, 0x4d, 0x6a, 0x6e, 0x58, 0xf5, 0x24, 0x19, 0x56, 0x01, 0x13, 0x71, 0xad, 0x50, 0xc4, 0x78, + 0xf8, 0x67, 0x19, 0xaa, 0x43, 0x32, 0xe0, 0xeb, 0xa0, 0xce, 0xaf, 0x6d, 0x86, 0x64, 0xc0, 0x96, + 0xc1, 0x02, 0x0d, 0x23, 0x2d, 0xdb, 0x69, 0xcf, 0x32, 0x47, 0xc3, 0x0b, 0x74, 0xf7, 0xb0, 0x0f, + 0x83, 0x38, 0x7d, 0xdc, 0x6e, 0xb0, 0xaa, 0x1a, 0xa3, 0xec, 0x38, 0x7d, 0x16, 0xbc, 0x04, 0xc1, + 0x71, 0xbb, 0xc9, 0xe8, 0xf4, 0x93, 0x46, 0xff, 0x3c, 0xe5, 0x9c, 0x4b, 0x45, 0xff, 0x79, 0x9e, + 0x4a, 0x66, 0x9c, 0xef, 0xc3, 0xcc, 0x0b, 0xbe, 0x81, 0xdb, 0x2d, 0xd6, 0xec, 0x62, 0xa1, 0x07, + 0x10, 0x0d, 0x25, 0xff, 0xb7, 0x19, 0x2d, 0xfe, 0x43, 0x09, 0x16, 0xd7, 0x59, 0xdc, 0xac, 0xb8, + 0x9d, 0xd3, 0x40, 0x2b, 0xb7, 0x22, 0x0c, 0x2b, 0x8d, 0x83, 0xa4, 0x87, 0x2b, 0xf8, 0xd0, 0x43, + 0x68, 0x4a, 0x99, 0xa2, 0x65, 0xe5, 0x75, 0xe8, 0x57, 0xc3, 0x57, 0x8b, 0xda, 0x87, 0xb0, 0x94, + 0xd1, 0x59, 0xc4, 0xb8, 0x97, 0x60, 0x36, 0x76, 0x26, 0x91, 0xca, 0xf5, 0x88, 0xb6, 0x65, 0x69, + 0xf7, 0xe0, 0x6c, 0x2f, 0x30, 0xbd, 0x20, 0x33, 0xe0, 0x13, 0xb4, 0x65, 0x00, 0x58, 0xb2, 0xad, + 0xc0, 0xa8, 0x7a, 0xb0, 0xd0, 0x0b, 0x88, 0xfb, 0x06, 0x42, 0xa9, 0x93, 0xa0, 0xc3, 0x26, 0xa1, + 0x74, 0xde, 0xb2, 0xa8, 0x2d, 0x71, 0xb8, 0x2e, 0xdb, 0xdb, 0x07, 0xb0, 0xc8, 0xd1, 0xb2, 0x37, + 0x19, 0xc4, 0xb2, 0xc4, 0xea, 0xb2, 0x72, 0x37, 0xe0, 0x4c, 0x7c, 0x1e, 0xc6, 0x39, 0xf6, 0x8d, + 0x64, 0x8e, 0xbd, 0x94, 0xb5, 0x71, 0x22, 0xc5, 0xfe, 0xd3, 0xb2, 0xe2, 0x6b, 0x0b, 0x32, 0xec, + 0xb5, 0x64, 0x86, 0x7d, 0xbe, 0x40, 0x64, 0x22, 0xc1, 0xce, 0xae, 0xc8, 0x4a, 0xce, 0x8a, 0xd4, + 0x33, 0x69, 0xf8, 0x64, 0x0a, 0xac, 0x48, 0xe9, 0xf6, 0x6b, 0xc9, 0xc2, 0xb7, 0x78, 0x16, 0x1e, + 0x75, 0x1d, 0x21, 0x98, 0xb7, 0x52, 0x59, 0x78, 0xbb, 0x48, 0xcd, 0x28, 0x09, 0xff, 0xa3, 0x49, + 0xa8, 0x45, 0x75, 0x99, 0x89, 0xcd, 0x4e, 0x52, 0x39, 0x67, 0x92, 0xd4, 0xa3, 0xaf, 0xf2, 0x26, + 0x47, 0xdf, 0xe4, 0xeb, 0x8e, 0xbe, 0x73, 0x50, 0x63, 0x1f, 0x86, 0x87, 0x0f, 0xc5, 0x51, 0x56, + 0x65, 0x04, 0x1d, 0x1f, 0xc6, 0x0b, 0x6a, 0xfa, 0x24, 0x0b, 0x2a, 0x95, 0xee, 0xcf, 0xa4, 0xd3, + 0xfd, 0x3b, 0xd1, 0xe1, 0xc4, 0x8f, 0xb1, 0x95, 0xac, 0xb8, 0xdc, 0x63, 0x69, 0x33, 0x79, 0x2c, + 0xf1, 0x93, 0xed, 0x72, 0x4e, 0xe3, 0xef, 0x6c, 0xb2, 0xff, 0x94, 0x27, 0xfb, 0xea, 0xaa, 0x12, + 0x8e, 0x70, 0x0d, 0x20, 0xda, 0xf3, 0x32, 0xe3, 0x47, 0xd9, 0xa1, 0xe9, 0x0a, 0x97, 0xb6, 0x0f, + 0x8b, 0x89, 0xf9, 0x8f, 0x61, 0xf6, 0x93, 0x79, 0xb1, 0x02, 0x8c, 0xfd, 0x5f, 0xa7, 0x14, 0x77, + 0x50, 0x80, 0x54, 0xdf, 0xc9, 0x20, 0x47, 0x27, 0x5b, 0x8f, 0x37, 0x92, 0xc0, 0xd1, 0xe9, 0x16, + 0x52, 0x06, 0x37, 0x62, 0x91, 0x82, 0xe9, 0x89, 0x6a, 0x9e, 0xf2, 0xd7, 0x04, 0xa5, 0xcb, 0x42, + 0xe9, 0x43, 0xdb, 0xb1, 0xfd, 0x23, 0x5e, 0x3f, 0xcd, 0x43, 0x69, 0x49, 0xea, 0xb2, 0x77, 0x0f, + 0xf8, 0xa5, 0x1d, 0x18, 0x7d, 0x62, 0x61, 0xb6, 0x4c, 0xa7, 0xf4, 0x2a, 0x25, 0xac, 0x13, 0x0b, + 0xc7, 0x5b, 0xa7, 0x7a, 0xaa, 0xad, 0x53, 0x4b, 0x6d, 0x9d, 0x45, 0x98, 0xf6, 0xb0, 0xe9, 0x13, + 0x47, 0xe4, 0x5d, 0xa2, 0x44, 0xe7, 0x7f, 0x84, 0x7d, 0x9f, 0x76, 0x20, 0xa2, 0x22, 0x51, 0x54, + 0x62, 0xb7, 0xd9, 0xa2, 0xd8, 0x6d, 0x0c, 0x14, 0x9e, 0x8a, 0xdd, 0x1a, 0x45, 0xb1, 0xdb, 0x49, + 0x90, 0x70, 0x25, 0x32, 0x6d, 0x8e, 0x8d, 0x4c, 0xd5, 0x18, 0x6f, 0x2e, 0x11, 0xe3, 0x7d, 0x9b, + 0xbb, 0xed, 0x5f, 0x4a, 0xb0, 0x94, 0xd9, 0x20, 0x62, 0xbf, 0xdd, 0x4a, 0x61, 0xe9, 0xed, 0xa2, + 0x19, 0x8a, 0xa0, 0xf4, 0xfb, 0x09, 0x28, 0xfd, 0x7a, 0x21, 0xff, 0x37, 0x8e, 0xa4, 0xff, 0x1e, + 0x5c, 0xdc, 0x77, 0xad, 0x54, 0xf8, 0x24, 0x52, 0xd2, 0x93, 0xef, 0xf7, 0x3b, 0x32, 0x48, 0x2e, + 0x9f, 0x30, 0x39, 0xe7, 0xec, 0x9a, 0x06, 0xab, 0xc5, 0xbd, 0x8b, 0x30, 0xe4, 0x77, 0x60, 0x6e, + 0xf3, 0x25, 0xee, 0xf7, 0x8e, 0x9d, 0xfe, 0x29, 0x34, 0x6a, 0x41, 0xa5, 0x3f, 0xb2, 0x04, 0x46, + 0x45, 0x3f, 0xd5, 0xc8, 0xaa, 0x92, 0x8c, 0xac, 0x0c, 0x68, 0xc5, 0x3d, 0x08, 0x13, 0x2e, 0x52, + 0x13, 0x5a, 0x94, 0x99, 0x0a, 0x9f, 0xd5, 0x45, 0x49, 0xd0, 0xb1, 0xe7, 0xb1, 0xa1, 0x72, 0x3a, + 0xf6, 0xbc, 0xe4, 0x6e, 0xaf, 0x24, 0x77, 0xbb, 0xf6, 0x97, 0x25, 0xa8, 0xd3, 0x1e, 0xbe, 0x96, + 0xfe, 0x22, 0x35, 0xa9, 0xc4, 0xa9, 0x49, 0x94, 0xe1, 0x4c, 0xaa, 0x19, 0x4e, 0xac, 0xf9, 0x14, + 0x23, 0x67, 0x35, 0x9f, 0x8e, 0xe8, 0xd8, 0xf3, 0xb4, 0x55, 0x98, 0xe5, 0xba, 0x89, 0x91, 0xb7, + 0xa0, 0x12, 0x7a, 0x43, 0xb9, 0x7a, 0x42, 0x6f, 0xa8, 0xfd, 0x71, 0x09, 0x1a, 0xdd, 0x20, 0x30, + 0xfb, 0x47, 0xa7, 0x18, 0x40, 0xa4, 0x5c, 0x59, 0x55, 0x2e, 0x3b, 0x88, 0x58, 0xdd, 0xc9, 0x02, + 0x75, 0xa7, 0x12, 0xea, 0x6a, 0xd0, 0x94, 0xba, 0x14, 0x2a, 0xbc, 0x0d, 0x68, 0x97, 0x78, 0xc1, + 0x23, 0xe2, 0xbd, 0x30, 0x3d, 0xeb, 0x74, 0x39, 0x0c, 0x82, 0x49, 0xf1, 0x96, 0xad, 0x72, 0x75, + 0x4a, 0x67, 0xdf, 0xda, 0x3b, 0x70, 0x26, 0x21, 0xaf, 0xb0, 0xe3, 0xbb, 0x50, 0x67, 0x0e, 0x5c, + 0xc4, 0xb9, 0x57, 0x55, 0xb0, 0x7c, 0x9c, 0x97, 0xd7, 0xba, 0x30, 0x4f, 0xcf, 0x6e, 0x46, 0x8f, + 0x36, 0xde, 0xf7, 0x53, 0xd1, 0xe0, 0x42, 0xb2, 0x7d, 0x2a, 0x12, 0xfc, 0xbb, 0x12, 0x4c, 0x31, + 0x7a, 0xe6, 0x3c, 0x3d, 0x07, 0x35, 0x0f, 0xbb, 0xc4, 0x08, 0xcc, 0x41, 0xf4, 0x3c, 0x90, 0x12, + 0xf6, 0xcc, 0x81, 0xcf, 0x5e, 0x37, 0xd2, 0x4a, 0xcb, 0x1e, 0x60, 0x3f, 0x90, 0x6f, 0x04, 0xeb, + 0x94, 0xb6, 0xc1, 0x49, 0x74, 0x4a, 0x7c, 0xfb, 0x77, 0x79, 0x98, 0x37, 0xa9, 0xb3, 0x6f, 0xf4, + 0x36, 0x7f, 0x4b, 0x33, 0x06, 0xd9, 0x64, 0x0f, 0x6c, 0x3a, 0x50, 0x4d, 0x81, 0x99, 0x51, 0x59, + 0xfb, 0x10, 0x90, 0x3a, 0x66, 0x31, 0xa9, 0x57, 0x60, 0x9a, 0x4d, 0x89, 0x8c, 0x53, 0x9a, 0xc9, + 0x41, 0xeb, 0xa2, 0x56, 0xfb, 0x1c, 0x10, 0x9f, 0xc5, 0x44, 0x6c, 0x72, 0xe2, 0x19, 0x1f, 0x13, + 0xa2, 0xfc, 0x7d, 0x09, 0xce, 0x24, 0x44, 0x47, 0xaf, 0x2a, 0x12, 0xb2, 0xd3, 0x8a, 0x09, 0xb9, + 0xf7, 0x12, 0x9e, 0xfc, 0x4a, 0x4a, 0x81, 0x5f, 0x91, 0x17, 0xff, 0x45, 0x09, 0xa0, 0x1b, 0x06, + 0x47, 0x02, 0xcb, 0x52, 0x67, 0xbd, 0x94, 0x9c, 0x75, 0x5a, 0xe7, 0x9a, 0xbe, 0xff, 0x82, 0x78, + 0x32, 0x19, 0x88, 0xca, 0x0c, 0x87, 0x0a, 0x83, 0x23, 0x79, 0x93, 0x40, 0xbf, 0xd1, 0xdb, 0xd0, + 0xe4, 0xaf, 0x4c, 0x0d, 0xd3, 0xb2, 0x3c, 0xec, 0xfb, 0xe2, 0x4a, 0xa1, 0xc1, 0xa9, 0x5d, 0x4e, + 0xa4, 0x6c, 0xb6, 0x85, 0x9d, 0xc0, 0x0e, 0x8e, 0x8d, 0x80, 0x7c, 0x89, 0x1d, 0x11, 0xe6, 0x37, + 0x24, 0x75, 0x8f, 0x12, 0x29, 0x9b, 0x87, 0x07, 0xb6, 0x1f, 0x78, 0x92, 0x4d, 0x42, 0xdc, 0x82, + 0xca, 0xd8, 0xb4, 0x9f, 0x95, 0xa0, 0xb5, 0x1b, 0x0e, 0x87, 0x7c, 0x66, 0x4f, 0x6d, 0xdb, 0x77, + 0xc4, 0x38, 0xca, 0xa9, 0xd5, 0x19, 0x4f, 0x91, 0x18, 0xdc, 0xd7, 0x87, 0x1f, 0x6e, 0xc1, 0xbc, + 0xa2, 0xa8, 0x58, 0x29, 0x89, 0x98, 0xad, 0x94, 0x8c, 0xd9, 0xb4, 0xfb, 0x80, 0x78, 0xc6, 0xfd, + 0x66, 0x83, 0xd3, 0xce, 0xc2, 0x99, 0x44, 0x7b, 0x71, 0x4c, 0x5e, 0x87, 0x86, 0x78, 0x34, 0x21, + 0x16, 0xc1, 0x32, 0x54, 0xa9, 0xbb, 0xeb, 0xdb, 0x96, 0xbc, 0x42, 0x9a, 0x71, 0x89, 0xb5, 0x6e, + 0x5b, 0x9e, 0xb6, 0x0d, 0x0d, 0x9d, 0x8b, 0x17, 0xbc, 0x1f, 0x41, 0x53, 0x3c, 0xb1, 0x30, 0x12, + 0x8f, 0x90, 0x94, 0x87, 0xa3, 0xaa, 0x6c, 0xbd, 0xe1, 0xa8, 0x45, 0xed, 0xc7, 0xd0, 0xe1, 0xc7, + 0x78, 0x42, 0xaa, 0x1c, 0xda, 0x47, 0x20, 0x5f, 0x41, 0x17, 0x09, 0x4f, 0x36, 0x6b, 0x78, 0x6a, + 0x51, 0xbb, 0x00, 0xe7, 0x72, 0x85, 0x8b, 0x71, 0xbb, 0xd0, 0x8a, 0x2b, 0x2c, 0x5b, 0xde, 0x9c, + 0xb1, 0x1b, 0xb1, 0x92, 0x72, 0x23, 0xb6, 0x18, 0xc5, 0x64, 0x65, 0x79, 0x9e, 0xb0, 0xc8, 0x2b, + 0x0e, 0xa1, 0x2b, 0x45, 0x21, 0xf4, 0x64, 0x22, 0x84, 0xd6, 0x3e, 0x89, 0x66, 0x4f, 0xe4, 0x2f, + 0xef, 0xb3, 0xf4, 0x8a, 0xf7, 0x2d, 0xdd, 0xd6, 0x72, 0xce, 0xe0, 0x38, 0x87, 0xae, 0x30, 0x6b, + 0xd7, 0xa0, 0x91, 0x74, 0x60, 0x8a, 0x5b, 0x2a, 0x65, 0xdc, 0x52, 0x33, 0xe5, 0x91, 0x6e, 0xa6, + 0xe2, 0xcc, 0xcc, 0x8c, 0xa6, 0xa2, 0xcc, 0xf7, 0x12, 0xbe, 0xe9, 0x52, 0x7c, 0x99, 0xf5, 0x2b, + 0x72, 0x4b, 0x0b, 0xc2, 0x47, 0x3f, 0xf2, 0x69, 0x7b, 0x31, 0x44, 0xed, 0x32, 0xd4, 0xf7, 0x8b, + 0x5e, 0x1c, 0x4f, 0xca, 0xdb, 0xe1, 0x77, 0x60, 0xbe, 0x17, 0x10, 0xcf, 0x1c, 0xe0, 0x2d, 0xe6, + 0x40, 0x0e, 0x6d, 0x7e, 0xfb, 0x19, 0x86, 0xd1, 0xd1, 0xc6, 0xbe, 0xb5, 0xff, 0x28, 0xc1, 0xdc, + 0x23, 0x7b, 0x88, 0xfd, 0x63, 0x3f, 0xc0, 0xa3, 0x7d, 0x96, 0xe4, 0x9c, 0x87, 0x1a, 0x1d, 0x97, + 0x1f, 0x98, 0x23, 0x57, 0xde, 0x90, 0x44, 0x04, 0x6a, 0x2e, 0x9f, 0x8b, 0x96, 0x80, 0x88, 0x9a, + 0x60, 0x66, 0x7a, 0xa5, 0x49, 0x9f, 0x20, 0xa1, 0x77, 0x01, 0x42, 0x1f, 0x5b, 0xe2, 0x4e, 0xa4, + 0x92, 0x3a, 0x95, 0xf7, 0xd5, 0x7b, 0x3d, 0xca, 0xc7, 0xaf, 0x8f, 0xdf, 0x83, 0xba, 0xed, 0x10, + 0x0b, 0xb3, 0x7b, 0x3d, 0x4b, 0x80, 0x25, 0xf9, 0xad, 0x80, 0x33, 0xee, 0xfb, 0xd8, 0xd2, 0x7e, + 0x5b, 0x9c, 0x42, 0x72, 0xf2, 0x84, 0xcd, 0x37, 0x61, 0x9e, 0xfb, 0x96, 0xc3, 0x68, 0xd0, 0x72, + 0xcd, 0xc5, 0x69, 0x46, 0x6a, 0x42, 0xf4, 0x96, 0x2d, 0x02, 0x06, 0xd9, 0x42, 0xbb, 0x07, 0x67, + 0x13, 0xb9, 0xc5, 0x29, 0xa2, 0x7d, 0xed, 0x71, 0x0a, 0x1a, 0x88, 0x17, 0xa4, 0xc8, 0xc0, 0xe5, + 0x7a, 0x2c, 0xc8, 0xc0, 0x7d, 0x9e, 0x81, 0xfb, 0x9a, 0x0e, 0xcb, 0x09, 0xc4, 0x22, 0xa1, 0xc8, + 0x7b, 0xa9, 0xe8, 0xe7, 0x42, 0x81, 0xb0, 0x54, 0x18, 0xf4, 0x3f, 0x25, 0x58, 0xc8, 0x63, 0x78, + 0x43, 0x6c, 0xec, 0xb3, 0x82, 0x77, 0x3c, 0xb7, 0xc6, 0x6a, 0xf3, 0x6b, 0x41, 0x11, 0x9f, 0x40, + 0x27, 0x6f, 0xf6, 0xb2, 0xa6, 0xa8, 0x9c, 0xc0, 0x14, 0xff, 0x5b, 0x56, 0xd0, 0xde, 0x6e, 0x10, + 0x78, 0xf6, 0x41, 0x48, 0x17, 0xef, 0x37, 0x85, 0xcd, 0x3c, 0x8c, 0x70, 0x07, 0x3e, 0x7f, 0x57, + 0xb3, 0xad, 0xe2, 0x5e, 0x73, 0xb1, 0x87, 0x9d, 0x24, 0xf6, 0xc0, 0x71, 0xdc, 0x1b, 0x63, 0xc5, + 0x7c, 0x67, 0xa1, 0xba, 0x57, 0x25, 0x68, 0x26, 0xed, 0x80, 0x3e, 0x04, 0x30, 0x23, 0xcd, 0xc5, + 0x92, 0x3f, 0x3f, 0x6e, 0x74, 0xba, 0xc2, 0x8f, 0x2e, 0x43, 0xa5, 0xef, 0x86, 0xc2, 0x22, 0xf1, + 0x5d, 0xe0, 0xba, 0x1b, 0x72, 0x07, 0x40, 0x6b, 0x69, 0x3e, 0xc1, 0xef, 0x6f, 0x33, 0x9e, 0xeb, + 0x19, 0x23, 0x73, 0x56, 0xc1, 0x83, 0x1e, 0x40, 0xf3, 0x85, 0x67, 0x07, 0xe6, 0xc1, 0x10, 0x1b, + 0x43, 0xf3, 0x18, 0x7b, 0xc2, 0x73, 0x15, 0x7b, 0x99, 0x86, 0xe4, 0x7f, 0x4a, 0xd9, 0xb5, 0x10, + 0xaa, 0xb2, 0xff, 0xd7, 0x78, 0xe4, 0x27, 0xb0, 0x14, 0x52, 0x36, 0x83, 0xbd, 0xb0, 0x71, 0x4c, + 0x87, 0x18, 0x3e, 0xa6, 0xa7, 0xa4, 0x7c, 0x50, 0x9b, 0xef, 0x2d, 0x17, 0x58, 0xa3, 0x75, 0xe2, + 0xe1, 0x6d, 0xd3, 0x21, 0x3d, 0xde, 0x42, 0x1b, 0x41, 0x5d, 0x19, 0xce, 0x6b, 0x7a, 0x7e, 0x08, + 0xf3, 0xf2, 0x96, 0xd5, 0xc7, 0x81, 0xf0, 0xeb, 0xe3, 0xfa, 0x9c, 0x13, 0xec, 0x3d, 0x1c, 0xf0, + 0xeb, 0xef, 0xfb, 0xb0, 0xac, 0x63, 0xe2, 0x62, 0x27, 0x32, 0xd1, 0x53, 0x32, 0x38, 0x85, 0x33, + 0x3d, 0x0f, 0x9d, 0xbc, 0xf6, 0x7c, 0x17, 0x5f, 0x3f, 0x0f, 0x55, 0xf9, 0xcf, 0x2b, 0x34, 0x03, + 0x95, 0xbd, 0xf5, 0xdd, 0xd6, 0x04, 0xfd, 0xd8, 0xdf, 0xd8, 0x6d, 0x95, 0xae, 0x8f, 0xa0, 0x95, + 0xfe, 0xd7, 0x11, 0x5a, 0x82, 0x33, 0xbb, 0xfa, 0xce, 0x6e, 0xf7, 0x71, 0x77, 0x6f, 0x6b, 0x67, + 0xdb, 0xd8, 0xd5, 0xb7, 0x3e, 0xed, 0xee, 0x6d, 0xb6, 0x26, 0xd0, 0x25, 0xb8, 0xa0, 0x56, 0xfc, + 0xe6, 0x4e, 0x6f, 0xcf, 0xd8, 0xdb, 0x31, 0xd6, 0x77, 0xb6, 0xf7, 0xba, 0x5b, 0xdb, 0x9b, 0x7a, + 0xab, 0x84, 0x2e, 0xc0, 0xb2, 0xca, 0xf2, 0xf1, 0xd6, 0xc6, 0x96, 0xbe, 0xb9, 0x4e, 0xbf, 0xbb, + 0x4f, 0x5b, 0xe5, 0xeb, 0xb7, 0xa1, 0x91, 0xf8, 0xff, 0x10, 0x55, 0x64, 0x77, 0x67, 0xa3, 0x35, + 0x81, 0x1a, 0x50, 0x53, 0xe5, 0x54, 0x61, 0x72, 0x7b, 0x67, 0x63, 0xb3, 0x55, 0xbe, 0x7e, 0x0f, + 0xe6, 0x52, 0xaf, 0xf6, 0xd0, 0x3c, 0x34, 0x7a, 0xdd, 0xed, 0x8d, 0x8f, 0x77, 0x3e, 0x37, 0xf4, + 0xcd, 0xee, 0xc6, 0x17, 0xad, 0x09, 0xb4, 0x00, 0x2d, 0x49, 0xda, 0xde, 0xd9, 0xe3, 0xd4, 0xd2, + 0xf5, 0x2f, 0x53, 0x7b, 0x04, 0xa3, 0xb3, 0x30, 0x1f, 0x75, 0x63, 0xac, 0xeb, 0x9b, 0xdd, 0xbd, + 0x4d, 0xda, 0x7b, 0x82, 0xac, 0xef, 0x6f, 0x6f, 0x6f, 0x6d, 0x3f, 0x6e, 0x95, 0xa8, 0xd4, 0x98, + 0xbc, 0xf9, 0xf9, 0x16, 0x65, 0x2e, 0x27, 0x99, 0xf7, 0xb7, 0x9f, 0x6c, 0xef, 0x7c, 0xb6, 0xdd, + 0xaa, 0xac, 0xfd, 0x63, 0x13, 0x9a, 0x32, 0x68, 0xc2, 0x1e, 0x7b, 0x8b, 0x70, 0x1f, 0x66, 0xe4, + 0xdf, 0xf6, 0x62, 0xef, 0x99, 0xfc, 0x8f, 0x61, 0xa7, 0x9d, 0xad, 0x10, 0x71, 0xe9, 0x04, 0xda, + 0x65, 0x71, 0xa2, 0xf2, 0x42, 0xf2, 0x82, 0x1a, 0x9e, 0x65, 0x9e, 0x60, 0x76, 0x56, 0x8a, 0xaa, + 0x23, 0x89, 0x3d, 0x1a, 0x01, 0xaa, 0x4f, 0xee, 0xd1, 0x8a, 0x1a, 0xb7, 0x64, 0x9f, 0xf2, 0x77, + 0x2e, 0x16, 0xd6, 0x47, 0x42, 0xbf, 0x80, 0x56, 0xfa, 0xb1, 0x3d, 0x8a, 0x01, 0xbc, 0x82, 0x87, + 0xfc, 0x9d, 0x4b, 0x63, 0x38, 0x54, 0xd1, 0x99, 0x67, 0xe9, 0xab, 0x63, 0x9e, 0x09, 0xa7, 0x45, + 0x17, 0x3d, 0x24, 0xe6, 0x53, 0x91, 0x7c, 0xd9, 0x88, 0xd4, 0xc7, 0xe0, 0x39, 0x2f, 0x5c, 0x95, + 0xa9, 0xc8, 0x7f, 0x12, 0xa9, 0x4d, 0xa0, 0x4f, 0x61, 0x2e, 0x75, 0x97, 0x8c, 0xe2, 0x56, 0xf9, + 0x37, 0xe3, 0x9d, 0xd5, 0x62, 0x86, 0xa4, 0xdd, 0xd4, 0x9b, 0xe2, 0x84, 0xdd, 0x72, 0xae, 0x9f, + 0x13, 0x76, 0xcb, 0xbd, 0x62, 0x66, 0xcb, 0x2b, 0x71, 0x1f, 0xac, 0x2c, 0xaf, 0xbc, 0xcb, 0xe7, + 0xce, 0x4a, 0x51, 0xb5, 0x3a, 0xfc, 0xd4, 0x5d, 0xb0, 0x32, 0xfc, 0xfc, 0x2b, 0xe6, 0xce, 0x6a, + 0x31, 0x43, 0xda, 0x56, 0xf1, 0xc5, 0x54, 0xca, 0x56, 0x99, 0x7b, 0xd0, 0x94, 0xad, 0xb2, 0x37, + 0x5a, 0xc2, 0x56, 0xa9, 0x7b, 0xa4, 0x8b, 0xc5, 0xb0, 0x79, 0xc6, 0x56, 0xf9, 0xb8, 0xba, 0x36, + 0x81, 0xbe, 0x82, 0x76, 0x11, 0x24, 0x8d, 0xe2, 0xa0, 0xe5, 0x35, 0x98, 0x79, 0xe7, 0xda, 0x09, + 0x38, 0xa3, 0x2e, 0x0d, 0x40, 0xd9, 0x23, 0x00, 0x69, 0xca, 0xcc, 0x16, 0x9c, 0x2f, 0x9d, 0xcb, + 0x63, 0x79, 0xa2, 0x0e, 0xba, 0x50, 0x95, 0x00, 0x37, 0x8a, 0x3d, 0x56, 0x0a, 0x55, 0xef, 0x2c, + 0xe7, 0xd4, 0x44, 0x22, 0xde, 0x83, 0x49, 0x4a, 0x45, 0x0b, 0x09, 0x26, 0xd9, 0xf4, 0x6c, 0x8a, + 0x1a, 0x35, 0xfb, 0x00, 0xa6, 0x39, 0x5a, 0x8b, 0xe2, 0xdc, 0x34, 0x01, 0x25, 0x77, 0x96, 0x32, + 0xf4, 0xa8, 0xf1, 0x27, 0xfc, 0xef, 0xc9, 0x02, 0x76, 0x45, 0xe7, 0x12, 0xff, 0x4d, 0x4b, 0x82, + 0xbb, 0x9d, 0xf3, 0xf9, 0x95, 0xea, 0x1a, 0x4c, 0x05, 0x5c, 0x2b, 0x45, 0x11, 0x71, 0x66, 0x0d, + 0xe6, 0x47, 0xd8, 0xdc, 0x70, 0xd9, 0x08, 0x5c, 0x31, 0x5c, 0x61, 0x72, 0xa3, 0x18, 0xae, 0x38, + 0x84, 0xd7, 0x26, 0xd0, 0x01, 0x9c, 0xc9, 0xc1, 0x3e, 0xd0, 0xe5, 0xd4, 0xea, 0xca, 0x83, 0x5d, + 0x3a, 0x6f, 0x8d, 0x67, 0x52, 0x4d, 0x24, 0xf6, 0xcf, 0x62, 0x06, 0x10, 0x48, 0x9b, 0x28, 0xbd, + 0x5b, 0xd6, 0xfe, 0xa0, 0x02, 0xb3, 0x1c, 0xa1, 0x12, 0x87, 0xe6, 0x63, 0x80, 0x18, 0xd4, 0x45, + 0x9d, 0xc4, 0x30, 0x13, 0xe8, 0x76, 0xe7, 0x5c, 0x6e, 0x9d, 0x6a, 0x7c, 0x05, 0x32, 0x55, 0x8c, + 0x9f, 0x45, 0x7d, 0x15, 0xe3, 0xe7, 0xa0, 0xac, 0xda, 0x04, 0xda, 0x80, 0x5a, 0x04, 0xd2, 0x21, + 0x05, 0xdb, 0x4b, 0x21, 0x8c, 0x9d, 0x4e, 0x5e, 0x95, 0xaa, 0x91, 0x02, 0xbc, 0x29, 0x1a, 0x65, + 0xe1, 0x3c, 0x45, 0xa3, 0x3c, 0xac, 0x2e, 0x1e, 0x1d, 0x4f, 0xee, 0xd3, 0xa3, 0x4b, 0xe0, 0x25, + 0xe9, 0xd1, 0x25, 0xf1, 0x00, 0x6d, 0xe2, 0xe3, 0xf3, 0x3f, 0xff, 0xe5, 0x4a, 0xe9, 0x3f, 0x7f, + 0xb9, 0x32, 0xf1, 0xfb, 0xaf, 0x56, 0x4a, 0x3f, 0x7f, 0xb5, 0x52, 0xfa, 0xf7, 0x57, 0x2b, 0xa5, + 0xff, 0x7a, 0xb5, 0x52, 0xfa, 0xe9, 0x7f, 0xaf, 0x4c, 0x1c, 0x4c, 0xb3, 0xff, 0xeb, 0xbf, 0xfb, + 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x91, 0xf3, 0x99, 0x55, 0x63, 0x41, 0x00, 0x00, } diff --git a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto b/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto index 5cb520591d..7468e0f1ea 100644 --- a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto +++ b/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto @@ -178,14 +178,39 @@ message Mount { MountPropagation propagation = 5; } +// A NamespaceMode describes the intended namespace configuration for each +// of the namespaces (Network, PID, IPC) in NamespaceOption. Runtimes should +// map these modes as appropriate for the technology underlying the runtime. +enum NamespaceMode { + // A POD namespace is common to all containers in a pod. + // For example, a container with a PID namespace of POD expects to view + // all of the processes in all of the containers in the pod. + POD = 0; + // A CONTAINER namespace is restricted to a single container. + // For example, a container with a PID namespace of CONTAINER expects to + // view only the processes in that container. + CONTAINER = 1; + // A NODE namespace is the namespace of the Kubernetes node. + // For example, a container with a PID namespace of NODE expects to view + // all of the processes on the host running the kubelet. + NODE = 2; +} + // NamespaceOption provides options for Linux namespaces. message NamespaceOption { - // If set, use the host's network namespace. - bool host_network = 1; - // If set, use the host's PID namespace. - bool host_pid = 2; - // If set, use the host's IPC namespace. - bool host_ipc = 3; + // Network namespace for this container/sandbox. + // Note: There is currently no way to set CONTAINER scoped network in the Kubernetes API. + // Namespaces currently set by the kubelet: POD, NODE + NamespaceMode network = 1; + // PID namespace for this container/sandbox. + // Note: The CRI default is POD, but the v1.PodSpec default is CONTAINER. + // The kubelet's runtime manager will set this to CONTAINER explicitly for v1 pods. + // Namespaces currently set by the kubelet: POD, CONTAINER, NODE + NamespaceMode pid = 2; + // IPC namespace for this container/sandbox. + // Note: There is currently no way to set CONTAINER scoped IPC in the Kubernetes API. + // Namespaces currently set by the kubelet: POD, NODE + NamespaceMode ipc = 3; } // Int64Value is the wrapper of int64. From 0f1de417908ae3f04de7f0a0bfd753ded9553558 Mon Sep 17 00:00:00 2001 From: Lee Verberne Date: Fri, 26 Jan 2018 18:35:10 +0100 Subject: [PATCH 2/3] Update kubelet for enumerated CRI namespaces This adds support to both the Generic Runtime Manager and the dockershim for the CRI's enumerated namespaces. --- pkg/kubelet/dockershim/docker_sandbox.go | 55 +++++++++---------- pkg/kubelet/dockershim/docker_sandbox_test.go | 37 ++++++++----- pkg/kubelet/dockershim/helpers_windows.go | 2 +- pkg/kubelet/dockershim/security_context.go | 27 +++------ .../dockershim/security_context_test.go | 26 ++++----- pkg/kubelet/kuberuntime/helpers.go | 32 +++++++++++ pkg/kubelet/kuberuntime/helpers_test.go | 42 ++++++++++++++ .../kuberuntime/kuberuntime_manager.go | 7 +-- .../kuberuntime/kuberuntime_sandbox.go | 6 +- pkg/kubelet/kuberuntime/security_context.go | 6 +- 10 files changed, 150 insertions(+), 90 deletions(-) diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index 331ecd2f22..fc5621e26a 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -148,7 +148,7 @@ func (ds *dockerService) RunPodSandbox(ctx context.Context, r *runtimeapi.RunPod } // Do not invoke network plugins if in hostNetwork mode. - if nsOptions := config.GetLinux().GetSecurityContext().GetNamespaceOptions(); nsOptions != nil && nsOptions.HostNetwork { + if config.GetLinux().GetSecurityContext().GetNamespaceOptions().GetNetwork() == runtimeapi.NamespaceMode_NODE { return resp, nil } @@ -187,8 +187,7 @@ func (ds *dockerService) StopPodSandbox(ctx context.Context, r *runtimeapi.StopP statusResp, statusErr := ds.PodSandboxStatus(ctx, &runtimeapi.PodSandboxStatusRequest{PodSandboxId: podSandboxID}) status := statusResp.GetStatus() if statusErr == nil { - nsOpts := status.GetLinux().GetNamespaces().GetOptions() - hostNetwork = nsOpts != nil && nsOpts.HostNetwork + hostNetwork = status.GetLinux().GetNamespaces().GetOptions().GetNetwork() == runtimeapi.NamespaceMode_NODE m := status.GetMetadata() namespace = m.Namespace name = m.Name @@ -323,7 +322,7 @@ func (ds *dockerService) getIP(podSandboxID string, sandbox *dockertypes.Contain if sandbox.NetworkSettings == nil { return "" } - if sharesHostNetwork(sandbox) { + if networkNamespaceMode(sandbox) == runtimeapi.NamespaceMode_NODE { // For sandboxes using host network, the shim is not responsible for // reporting the IP. return "" @@ -388,7 +387,6 @@ func (ds *dockerService) PodSandboxStatus(ctx context.Context, req *runtimeapi.P if IP = ds.determinePodIPBySandboxID(podSandboxID); IP == "" { IP = ds.getIP(podSandboxID, r) } - hostNetwork := sharesHostNetwork(r) metadata, err := parseSandboxName(r.Name) if err != nil { @@ -408,9 +406,9 @@ func (ds *dockerService) PodSandboxStatus(ctx context.Context, req *runtimeapi.P Linux: &runtimeapi.LinuxPodSandboxStatus{ Namespaces: &runtimeapi.Namespace{ Options: &runtimeapi.NamespaceOption{ - HostNetwork: hostNetwork, - HostPid: sharesHostPid(r), - HostIpc: sharesHostIpc(r), + Network: networkNamespaceMode(r), + Pid: pidNamespaceMode(r), + Ipc: ipcNamespaceMode(r), }, }, }, @@ -592,31 +590,32 @@ func (ds *dockerService) makeSandboxDockerConfig(c *runtimeapi.PodSandboxConfig, return createConfig, nil } -// sharesHostNetwork returns true if the given container is sharing the host's -// network namespace. -func sharesHostNetwork(container *dockertypes.ContainerJSON) bool { - if container != nil && container.HostConfig != nil { - return string(container.HostConfig.NetworkMode) == namespaceModeHost +// networkNamespaceMode returns the network runtimeapi.NamespaceMode for this container. +// Supports: POD, NODE +func networkNamespaceMode(container *dockertypes.ContainerJSON) runtimeapi.NamespaceMode { + if container != nil && container.HostConfig != nil && string(container.HostConfig.NetworkMode) == namespaceModeHost { + return runtimeapi.NamespaceMode_NODE } - return false + return runtimeapi.NamespaceMode_POD } -// sharesHostPid returns true if the given container is sharing the host's pid -// namespace. -func sharesHostPid(container *dockertypes.ContainerJSON) bool { - if container != nil && container.HostConfig != nil { - return string(container.HostConfig.PidMode) == namespaceModeHost +// pidNamespaceMode returns the PID runtimeapi.NamespaceMode for this container. +// Supports: CONTAINER, NODE +// TODO(verb): add support for POD PID namespace sharing +func pidNamespaceMode(container *dockertypes.ContainerJSON) runtimeapi.NamespaceMode { + if container != nil && container.HostConfig != nil && string(container.HostConfig.PidMode) == namespaceModeHost { + return runtimeapi.NamespaceMode_NODE } - return false + return runtimeapi.NamespaceMode_CONTAINER } -// sharesHostIpc returns true if the given container is sharing the host's ipc -// namespace. -func sharesHostIpc(container *dockertypes.ContainerJSON) bool { - if container != nil && container.HostConfig != nil { - return string(container.HostConfig.IpcMode) == namespaceModeHost +// ipcNamespaceMode returns the IPC runtimeapi.NamespaceMode for this container. +// Supports: POD, NODE +func ipcNamespaceMode(container *dockertypes.ContainerJSON) runtimeapi.NamespaceMode { + if container != nil && container.HostConfig != nil && string(container.HostConfig.IpcMode) == namespaceModeHost { + return runtimeapi.NamespaceMode_NODE } - return false + return runtimeapi.NamespaceMode_POD } func constructPodSandboxCheckpoint(config *runtimeapi.PodSandboxConfig) *PodSandboxCheckpoint { @@ -629,8 +628,8 @@ func constructPodSandboxCheckpoint(config *runtimeapi.PodSandboxConfig) *PodSand Protocol: &proto, }) } - if nsOptions := config.GetLinux().GetSecurityContext().GetNamespaceOptions(); nsOptions != nil { - checkpoint.Data.HostNetwork = nsOptions.HostNetwork + if config.GetLinux().GetSecurityContext().GetNamespaceOptions().GetNetwork() == runtimeapi.NamespaceMode_NODE { + checkpoint.Data.HostNetwork = true } return checkpoint } diff --git a/pkg/kubelet/dockershim/docker_sandbox_test.go b/pkg/kubelet/dockershim/docker_sandbox_test.go index 7767187570..b70a441d1b 100644 --- a/pkg/kubelet/dockershim/docker_sandbox_test.go +++ b/pkg/kubelet/dockershim/docker_sandbox_test.go @@ -103,13 +103,18 @@ func TestSandboxStatus(t *testing.T) { state := runtimeapi.PodSandboxState_SANDBOX_READY ct := int64(0) - hostNetwork := false expected := &runtimeapi.PodSandboxStatus{ - State: state, - CreatedAt: ct, - Metadata: config.Metadata, - Network: &runtimeapi.PodSandboxNetworkStatus{Ip: fakeIP}, - Linux: &runtimeapi.LinuxPodSandboxStatus{Namespaces: &runtimeapi.Namespace{Options: &runtimeapi.NamespaceOption{HostNetwork: hostNetwork}}}, + State: state, + CreatedAt: ct, + Metadata: config.Metadata, + Network: &runtimeapi.PodSandboxNetworkStatus{Ip: fakeIP}, + Linux: &runtimeapi.LinuxPodSandboxStatus{ + Namespaces: &runtimeapi.Namespace{ + Options: &runtimeapi.NamespaceOption{ + Pid: runtimeapi.NamespaceMode_CONTAINER, + }, + }, + }, Labels: labels, Annotations: annotations, } @@ -162,13 +167,18 @@ func TestSandboxStatusAfterRestart(t *testing.T) { state := runtimeapi.PodSandboxState_SANDBOX_READY ct := int64(0) - hostNetwork := false expected := &runtimeapi.PodSandboxStatus{ - State: state, - CreatedAt: ct, - Metadata: config.Metadata, - Network: &runtimeapi.PodSandboxNetworkStatus{Ip: fakeIP}, - Linux: &runtimeapi.LinuxPodSandboxStatus{Namespaces: &runtimeapi.Namespace{Options: &runtimeapi.NamespaceOption{HostNetwork: hostNetwork}}}, + State: state, + CreatedAt: ct, + Metadata: config.Metadata, + Network: &runtimeapi.PodSandboxNetworkStatus{Ip: fakeIP}, + Linux: &runtimeapi.LinuxPodSandboxStatus{ + Namespaces: &runtimeapi.Namespace{ + Options: &runtimeapi.NamespaceOption{ + Pid: runtimeapi.NamespaceMode_CONTAINER, + }, + }, + }, Labels: map[string]string{}, Annotations: map[string]string{}, } @@ -238,11 +248,10 @@ func TestHostNetworkPluginInvocation(t *testing.T) { map[string]string{"label": name}, map[string]string{"annotation": ns}, ) - hostNetwork := true c.Linux = &runtimeapi.LinuxPodSandboxConfig{ SecurityContext: &runtimeapi.LinuxSandboxSecurityContext{ NamespaceOptions: &runtimeapi.NamespaceOption{ - HostNetwork: hostNetwork, + Network: runtimeapi.NamespaceMode_NODE, }, }, } diff --git a/pkg/kubelet/dockershim/helpers_windows.go b/pkg/kubelet/dockershim/helpers_windows.go index af8e607b1c..f7a82fc3a5 100644 --- a/pkg/kubelet/dockershim/helpers_windows.go +++ b/pkg/kubelet/dockershim/helpers_windows.go @@ -79,7 +79,7 @@ func (ds *dockerService) updateCreateConfig( createConfig.HostConfig.NetworkMode = dockercontainer.NetworkMode(networkMode) } else if !shouldIsolatedByHyperV(sandboxConfig.Annotations) { // Todo: Refactor this call in future for calling methods directly in security_context.go - modifyHostOptionsForContainer(false, podSandboxID, createConfig.HostConfig) + modifyHostOptionsForContainer(nil, podSandboxID, createConfig.HostConfig) } applyExperimentalCreateConfig(createConfig, sandboxConfig.Annotations) diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go index f29bd9668b..5eac5e8bf9 100644 --- a/pkg/kubelet/dockershim/security_context.go +++ b/pkg/kubelet/dockershim/security_context.go @@ -122,41 +122,30 @@ func modifyHostConfig(sc *runtimeapi.LinuxContainerSecurityContext, hostConfig * // modifySandboxNamespaceOptions apply namespace options for sandbox func modifySandboxNamespaceOptions(nsOpts *runtimeapi.NamespaceOption, hostConfig *dockercontainer.HostConfig, network *knetwork.PluginManager) { - hostNetwork := false - hostIpc := false - if nsOpts != nil { - hostNetwork = nsOpts.HostNetwork - hostIpc = nsOpts.HostIpc - } modifyCommonNamespaceOptions(nsOpts, hostConfig) - modifyHostOptionsForSandbox(hostNetwork, hostIpc, network, hostConfig) + modifyHostOptionsForSandbox(nsOpts, network, hostConfig) } // modifyContainerNamespaceOptions apply namespace options for container func modifyContainerNamespaceOptions(nsOpts *runtimeapi.NamespaceOption, podSandboxID string, hostConfig *dockercontainer.HostConfig) { - hostNetwork := false - if nsOpts != nil { - hostNetwork = nsOpts.HostNetwork - } hostConfig.PidMode = dockercontainer.PidMode(fmt.Sprintf("container:%v", podSandboxID)) modifyCommonNamespaceOptions(nsOpts, hostConfig) - modifyHostOptionsForContainer(hostNetwork, podSandboxID, hostConfig) + modifyHostOptionsForContainer(nsOpts, podSandboxID, hostConfig) } // modifyCommonNamespaceOptions apply common namespace options for sandbox and container func modifyCommonNamespaceOptions(nsOpts *runtimeapi.NamespaceOption, hostConfig *dockercontainer.HostConfig) { - if nsOpts != nil && nsOpts.HostPid { + if nsOpts.GetPid() == runtimeapi.NamespaceMode_NODE { hostConfig.PidMode = namespaceModeHost } } // modifyHostOptionsForSandbox applies NetworkMode/UTSMode to sandbox's dockercontainer.HostConfig. -func modifyHostOptionsForSandbox(hostNetwork bool, hostIpc bool, network *knetwork.PluginManager, hc *dockercontainer.HostConfig) { - if hostIpc { +func modifyHostOptionsForSandbox(nsOpts *runtimeapi.NamespaceOption, network *knetwork.PluginManager, hc *dockercontainer.HostConfig) { + if nsOpts.GetIpc() == runtimeapi.NamespaceMode_NODE { hc.IpcMode = namespaceModeHost } - - if hostNetwork { + if nsOpts.GetNetwork() == runtimeapi.NamespaceMode_NODE { hc.NetworkMode = namespaceModeHost return } @@ -177,13 +166,13 @@ func modifyHostOptionsForSandbox(hostNetwork bool, hostIpc bool, network *knetwo } // modifyHostOptionsForContainer applies NetworkMode/UTSMode to container's dockercontainer.HostConfig. -func modifyHostOptionsForContainer(hostNetwork bool, podSandboxID string, hc *dockercontainer.HostConfig) { +func modifyHostOptionsForContainer(nsOpts *runtimeapi.NamespaceOption, podSandboxID string, hc *dockercontainer.HostConfig) { sandboxNSMode := fmt.Sprintf("container:%v", podSandboxID) hc.NetworkMode = dockercontainer.NetworkMode(sandboxNSMode) hc.IpcMode = dockercontainer.IpcMode(sandboxNSMode) hc.UTSMode = "" - if hostNetwork { + if nsOpts.GetNetwork() == runtimeapi.NamespaceMode_NODE { hc.UTSMode = namespaceModeHost } } diff --git a/pkg/kubelet/dockershim/security_context_test.go b/pkg/kubelet/dockershim/security_context_test.go index 3a252f0d33..4248750cfb 100644 --- a/pkg/kubelet/dockershim/security_context_test.go +++ b/pkg/kubelet/dockershim/security_context_test.go @@ -228,25 +228,24 @@ func TestModifyHostConfigAndNamespaceOptionsForContainer(t *testing.T) { } func TestModifySandboxNamespaceOptions(t *testing.T) { - set := true cases := []struct { name string nsOpt *runtimeapi.NamespaceOption expected *dockercontainer.HostConfig }{ { - name: "NamespaceOption.HostNetwork", + name: "Host Network NamespaceOption", nsOpt: &runtimeapi.NamespaceOption{ - HostNetwork: set, + Network: runtimeapi.NamespaceMode_NODE, }, expected: &dockercontainer.HostConfig{ NetworkMode: namespaceModeHost, }, }, { - name: "NamespaceOption.HostIpc", + name: "Host IPC NamespaceOption", nsOpt: &runtimeapi.NamespaceOption{ - HostIpc: set, + Ipc: runtimeapi.NamespaceMode_NODE, }, expected: &dockercontainer.HostConfig{ IpcMode: namespaceModeHost, @@ -254,9 +253,9 @@ func TestModifySandboxNamespaceOptions(t *testing.T) { }, }, { - name: "NamespaceOption.HostPid", + name: "Host PID NamespaceOption", nsOpt: &runtimeapi.NamespaceOption{ - HostPid: set, + Pid: runtimeapi.NamespaceMode_NODE, }, expected: &dockercontainer.HostConfig{ PidMode: namespaceModeHost, @@ -272,7 +271,6 @@ func TestModifySandboxNamespaceOptions(t *testing.T) { } func TestModifyContainerNamespaceOptions(t *testing.T) { - set := true sandboxID := "sandbox" sandboxNSMode := fmt.Sprintf("container:%v", sandboxID) cases := []struct { @@ -281,9 +279,9 @@ func TestModifyContainerNamespaceOptions(t *testing.T) { expected *dockercontainer.HostConfig }{ { - name: "NamespaceOption.HostNetwork", + name: "Host Network NamespaceOption", nsOpt: &runtimeapi.NamespaceOption{ - HostNetwork: set, + Network: runtimeapi.NamespaceMode_NODE, }, expected: &dockercontainer.HostConfig{ NetworkMode: dockercontainer.NetworkMode(sandboxNSMode), @@ -293,9 +291,9 @@ func TestModifyContainerNamespaceOptions(t *testing.T) { }, }, { - name: "NamespaceOption.HostIpc", + name: "Host IPC NamespaceOption", nsOpt: &runtimeapi.NamespaceOption{ - HostIpc: set, + Ipc: runtimeapi.NamespaceMode_NODE, }, expected: &dockercontainer.HostConfig{ NetworkMode: dockercontainer.NetworkMode(sandboxNSMode), @@ -304,9 +302,9 @@ func TestModifyContainerNamespaceOptions(t *testing.T) { }, }, { - name: "NamespaceOption.HostPid", + name: "Host PID NamespaceOption", nsOpt: &runtimeapi.NamespaceOption{ - HostPid: set, + Pid: runtimeapi.NamespaceMode_NODE, }, expected: &dockercontainer.HostConfig{ NetworkMode: dockercontainer.NetworkMode(sandboxNSMode), diff --git a/pkg/kubelet/kuberuntime/helpers.go b/pkg/kubelet/kuberuntime/helpers.go index d1ee8de3f9..2a0f51efcf 100644 --- a/pkg/kubelet/kuberuntime/helpers.go +++ b/pkg/kubelet/kuberuntime/helpers.go @@ -278,3 +278,35 @@ func (m *kubeGenericRuntimeManager) getSeccompProfileFromAnnotations(annotations return profile } + +func ipcNamespaceForPod(pod *v1.Pod) runtimeapi.NamespaceMode { + if pod != nil && pod.Spec.HostIPC { + return runtimeapi.NamespaceMode_NODE + } + return runtimeapi.NamespaceMode_POD +} + +func networkNamespaceForPod(pod *v1.Pod) runtimeapi.NamespaceMode { + if pod != nil && pod.Spec.HostNetwork { + return runtimeapi.NamespaceMode_NODE + } + return runtimeapi.NamespaceMode_POD +} + +func pidNamespaceForPod(pod *v1.Pod) runtimeapi.NamespaceMode { + if pod != nil && pod.Spec.HostPID { + return runtimeapi.NamespaceMode_NODE + } + // Note that PID does not default to the zero value + return runtimeapi.NamespaceMode_CONTAINER +} + +// namespacesForPod returns the runtimeapi.NamespaceOption for a given pod. +// An empty or nil pod can be used to get the namespace defaults for v1.Pod. +func namespacesForPod(pod *v1.Pod) *runtimeapi.NamespaceOption { + return &runtimeapi.NamespaceOption{ + Ipc: ipcNamespaceForPod(pod), + Network: networkNamespaceForPod(pod), + Pid: pidNamespaceForPod(pod), + } +} diff --git a/pkg/kubelet/kuberuntime/helpers_test.go b/pkg/kubelet/kuberuntime/helpers_test.go index 8690749fa1..0500bfe61d 100644 --- a/pkg/kubelet/kuberuntime/helpers_test.go +++ b/pkg/kubelet/kuberuntime/helpers_test.go @@ -305,3 +305,45 @@ func TestGetSeccompProfileFromAnnotations(t *testing.T) { assert.Equal(t, test.expectedProfile, seccompProfile, "TestCase[%d]", i) } } + +func TestNamespacesForPod(t *testing.T) { + for desc, test := range map[string]struct { + input *v1.Pod + expected *runtimeapi.NamespaceOption + }{ + "nil pod -> default v1 namespaces": { + nil, + &runtimeapi.NamespaceOption{ + Ipc: runtimeapi.NamespaceMode_POD, + Network: runtimeapi.NamespaceMode_POD, + Pid: runtimeapi.NamespaceMode_CONTAINER, + }, + }, + "v1.Pod default namespaces": { + &v1.Pod{}, + &runtimeapi.NamespaceOption{ + Ipc: runtimeapi.NamespaceMode_POD, + Network: runtimeapi.NamespaceMode_POD, + Pid: runtimeapi.NamespaceMode_CONTAINER, + }, + }, + "Host Namespaces": { + &v1.Pod{ + Spec: v1.PodSpec{ + HostIPC: true, + HostNetwork: true, + HostPID: true, + }, + }, + &runtimeapi.NamespaceOption{ + Ipc: runtimeapi.NamespaceMode_NODE, + Network: runtimeapi.NamespaceMode_NODE, + Pid: runtimeapi.NamespaceMode_NODE, + }, + }, + } { + t.Logf("TestCase: %s", desc) + actual := namespacesForPod(test.input) + assert.Equal(t, test.expected, actual) + } +} diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 3b7a9e66a3..ae9468d22b 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -405,8 +405,7 @@ func (m *kubeGenericRuntimeManager) podSandboxChanged(pod *v1.Pod, podStatus *ku } // Needs to create a new sandbox when network namespace changed. - if sandboxStatus.Linux != nil && sandboxStatus.Linux.Namespaces != nil && sandboxStatus.Linux.Namespaces.Options != nil && - sandboxStatus.Linux.Namespaces.Options.HostNetwork != kubecontainer.IsHostNetworkPod(pod) { + if sandboxStatus.GetLinux().GetNamespaces().GetOptions().GetNetwork() != networkNamespaceForPod(pod) { glog.V(2).Infof("Sandbox for pod %q has changed. Need to start a new one", format.Pod(pod)) return true, sandboxStatus.Metadata.Attempt + 1, "" } @@ -815,8 +814,8 @@ func (m *kubeGenericRuntimeManager) isHostNetwork(podSandBoxID string, pod *v1.P return false, err } - if nsOpts := podStatus.GetLinux().GetNamespaces().GetOptions(); nsOpts != nil { - return nsOpts.HostNetwork, nil + if podStatus.GetLinux().GetNamespaces().GetOptions().GetNetwork() == runtimeapi.NamespaceMode_NODE { + return true, nil } return false, nil diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go index 2773270e2f..9ae3bc908d 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go @@ -145,11 +145,7 @@ func (m *kubeGenericRuntimeManager) generatePodSandboxLinuxConfig(pod *v1.Pod) ( if sc.RunAsUser != nil { lc.SecurityContext.RunAsUser = &runtimeapi.Int64Value{Value: int64(*sc.RunAsUser)} } - lc.SecurityContext.NamespaceOptions = &runtimeapi.NamespaceOption{ - HostNetwork: pod.Spec.HostNetwork, - HostIpc: pod.Spec.HostIPC, - HostPid: pod.Spec.HostPID, - } + lc.SecurityContext.NamespaceOptions = namespacesForPod(pod) if sc.FSGroup != nil { lc.SecurityContext.SupplementalGroups = append(lc.SecurityContext.SupplementalGroups, int64(*sc.FSGroup)) diff --git a/pkg/kubelet/kuberuntime/security_context.go b/pkg/kubelet/kuberuntime/security_context.go index 3d48d372ac..fe0ec076e0 100644 --- a/pkg/kubelet/kuberuntime/security_context.go +++ b/pkg/kubelet/kuberuntime/security_context.go @@ -48,11 +48,7 @@ func (m *kubeGenericRuntimeManager) determineEffectiveSecurityContext(pod *v1.Po } // set namespace options and supplemental groups. - synthesized.NamespaceOptions = &runtimeapi.NamespaceOption{ - HostNetwork: pod.Spec.HostNetwork, - HostIpc: pod.Spec.HostIPC, - HostPid: pod.Spec.HostPID, - } + synthesized.NamespaceOptions = namespacesForPod(pod) podSc := pod.Spec.SecurityContext if podSc != nil { if podSc.FSGroup != nil { From e10042d22f0990384befb49c15773e8b395d9e0d Mon Sep 17 00:00:00 2001 From: Lee Verberne Date: Tue, 6 Feb 2018 23:11:09 +0100 Subject: [PATCH 3/3] Increment CRI version from v1alpha1 to v1alpha2 This also incorporates the version string into the package name so that incompatibile versions will fail to connect. Arbitrary choices: - The proto3 package name is runtime.v1alpha2. The proto compiler normally translates this to a go package of "runtime_v1alpha2", but I renamed it to "v1alpha2" for consistency with existing packages. - kubelet/apis/cri is used as "internalapi". I left it alone and put the public "runtimeapi" in kubelet/apis/cri/runtime. --- hack/.golint_failures | 2 +- hack/update-generated-runtime-dockerized.sh | 2 +- hack/verify-generated-runtime.sh | 2 +- pkg/kubelet/BUILD | 4 +- pkg/kubelet/apis/cri/BUILD | 4 +- .../runtime => runtime/v1alpha2}/BUILD | 3 +- .../runtime => runtime/v1alpha2}/api.pb.go | 924 +++++++++--------- .../runtime => runtime/v1alpha2}/api.proto | 3 +- .../runtime => runtime/v1alpha2}/constants.go | 2 +- pkg/kubelet/apis/cri/services.go | 2 +- pkg/kubelet/apis/cri/testing/BUILD | 2 +- .../apis/cri/testing/fake_image_service.go | 2 +- .../apis/cri/testing/fake_runtime_service.go | 2 +- pkg/kubelet/apis/cri/testing/utils.go | 2 +- pkg/kubelet/cm/cpumanager/BUILD | 4 +- pkg/kubelet/cm/cpumanager/cpu_manager.go | 2 +- pkg/kubelet/cm/cpumanager/cpu_manager_test.go | 2 +- pkg/kubelet/container/BUILD | 2 +- pkg/kubelet/container/helpers.go | 2 +- pkg/kubelet/container/runtime.go | 2 +- pkg/kubelet/container/testing/BUILD | 2 +- .../container/testing/fake_runtime_helper.go | 2 +- pkg/kubelet/dockershim/BUILD | 4 +- pkg/kubelet/dockershim/convert.go | 2 +- pkg/kubelet/dockershim/convert_test.go | 2 +- pkg/kubelet/dockershim/doc.go | 2 +- pkg/kubelet/dockershim/docker_container.go | 2 +- .../dockershim/docker_container_test.go | 2 +- pkg/kubelet/dockershim/docker_image.go | 2 +- pkg/kubelet/dockershim/docker_image_linux.go | 2 +- pkg/kubelet/dockershim/docker_image_test.go | 2 +- .../dockershim/docker_image_unsupported.go | 2 +- .../dockershim/docker_image_windows.go | 2 +- pkg/kubelet/dockershim/docker_logs.go | 2 +- pkg/kubelet/dockershim/docker_sandbox.go | 2 +- pkg/kubelet/dockershim/docker_sandbox_test.go | 2 +- pkg/kubelet/dockershim/docker_service.go | 2 +- pkg/kubelet/dockershim/docker_service_test.go | 2 +- pkg/kubelet/dockershim/docker_stats_linux.go | 2 +- .../dockershim/docker_stats_unsupported.go | 2 +- .../dockershim/docker_stats_windows.go | 2 +- pkg/kubelet/dockershim/docker_streaming.go | 2 +- pkg/kubelet/dockershim/helpers.go | 2 +- pkg/kubelet/dockershim/helpers_linux.go | 2 +- pkg/kubelet/dockershim/helpers_test.go | 2 +- pkg/kubelet/dockershim/helpers_unsupported.go | 2 +- pkg/kubelet/dockershim/helpers_windows.go | 2 +- pkg/kubelet/dockershim/naming.go | 2 +- pkg/kubelet/dockershim/naming_test.go | 2 +- pkg/kubelet/dockershim/remote/BUILD | 2 +- .../dockershim/remote/docker_server.go | 2 +- pkg/kubelet/dockershim/security_context.go | 2 +- .../dockershim/security_context_test.go | 2 +- pkg/kubelet/dockershim/selinux_util.go | 2 +- pkg/kubelet/kubelet_network.go | 2 +- pkg/kubelet/kubelet_pods.go | 2 +- pkg/kubelet/kubelet_pods_test.go | 2 +- pkg/kubelet/kuberuntime/BUILD | 4 +- pkg/kubelet/kuberuntime/helpers.go | 2 +- pkg/kubelet/kuberuntime/helpers_test.go | 2 +- .../kuberuntime/instrumented_services.go | 2 +- .../kuberuntime/instrumented_services_test.go | 2 +- .../kuberuntime/kuberuntime_container.go | 2 +- .../kuberuntime/kuberuntime_container_test.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_gc.go | 2 +- .../kuberuntime/kuberuntime_gc_test.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_image.go | 2 +- .../kuberuntime/kuberuntime_image_test.go | 2 +- .../kuberuntime/kuberuntime_manager.go | 2 +- .../kuberuntime/kuberuntime_manager_test.go | 2 +- .../kuberuntime/kuberuntime_sandbox.go | 2 +- .../kuberuntime/kuberuntime_sandbox_test.go | 2 +- pkg/kubelet/kuberuntime/logs/BUILD | 4 +- pkg/kubelet/kuberuntime/logs/logs.go | 2 +- pkg/kubelet/kuberuntime/logs/logs_test.go | 2 +- pkg/kubelet/kuberuntime/security_context.go | 2 +- pkg/kubelet/network/dns/BUILD | 4 +- pkg/kubelet/network/dns/dns.go | 2 +- pkg/kubelet/network/dns/dns_test.go | 2 +- pkg/kubelet/pleg/BUILD | 2 +- pkg/kubelet/pleg/generic.go | 2 +- pkg/kubelet/remote/BUILD | 2 +- pkg/kubelet/remote/fake/BUILD | 2 +- pkg/kubelet/remote/fake/fake_image_service.go | 2 +- pkg/kubelet/remote/fake/fake_runtime.go | 2 +- pkg/kubelet/remote/remote_image.go | 2 +- pkg/kubelet/remote/remote_runtime.go | 2 +- pkg/kubelet/remote/utils.go | 2 +- pkg/kubelet/server/streaming/BUILD | 4 +- pkg/kubelet/server/streaming/server.go | 2 +- pkg/kubelet/server/streaming/server_test.go | 2 +- pkg/kubelet/stats/BUILD | 4 +- pkg/kubelet/stats/cri_stats_provider.go | 2 +- pkg/kubelet/stats/cri_stats_provider_test.go | 2 +- test/e2e_node/BUILD | 4 +- test/e2e_node/container_manager_test.go | 2 +- test/e2e_node/cpu_manager_test.go | 2 +- test/e2e_node/garbage_collector_test.go | 2 +- test/e2e_node/image_list.go | 2 +- 99 files changed, 573 insertions(+), 569 deletions(-) rename pkg/kubelet/apis/cri/{v1alpha1/runtime => runtime/v1alpha2}/BUILD (88%) rename pkg/kubelet/apis/cri/{v1alpha1/runtime => runtime/v1alpha2}/api.pb.go (93%) rename pkg/kubelet/apis/cri/{v1alpha1/runtime => runtime/v1alpha2}/api.proto (99%) rename pkg/kubelet/apis/cri/{v1alpha1/runtime => runtime/v1alpha2}/constants.go (99%) diff --git a/hack/.golint_failures b/hack/.golint_failures index 2b5a7e6c72..7e332d626c 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -160,8 +160,8 @@ pkg/kubectl/util/crlf pkg/kubectl/util/slice pkg/kubelet pkg/kubelet/apis +pkg/kubelet/apis/cri/runtime/v1alpha2 pkg/kubelet/apis/cri/testing -pkg/kubelet/apis/cri/v1alpha1/runtime pkg/kubelet/apis/deviceplugin/v1alpha pkg/kubelet/apis/kubeletconfig pkg/kubelet/apis/kubeletconfig/v1alpha1 diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh index 37f1aa5b8b..724c5d1559 100755 --- a/hack/update-generated-runtime-dockerized.sh +++ b/hack/update-generated-runtime-dockerized.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime/" +KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/runtime/v1alpha2/" source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env diff --git a/hack/verify-generated-runtime.sh b/hack/verify-generated-runtime.sh index f59b0f00d9..3e1132547a 100755 --- a/hack/verify-generated-runtime.sh +++ b/hack/verify-generated-runtime.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime" +KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/runtime/v1alpha2" source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index f547e2d4b6..6111bd67b7 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -42,7 +42,7 @@ go_library( "//pkg/fieldpath:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/certificate:go_default_library", @@ -169,7 +169,7 @@ go_test( "//pkg/capabilities:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", diff --git a/pkg/kubelet/apis/cri/BUILD b/pkg/kubelet/apis/cri/BUILD index 399cf489a3..de2fea67d2 100644 --- a/pkg/kubelet/apis/cri/BUILD +++ b/pkg/kubelet/apis/cri/BUILD @@ -9,7 +9,7 @@ go_library( name = "go_default_library", srcs = ["services.go"], importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri", - deps = ["//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library"], + deps = ["//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library"], ) filegroup( @@ -23,8 +23,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:all-srcs", "//pkg/kubelet/apis/cri/testing:all-srcs", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/apis/cri/v1alpha1/runtime/BUILD b/pkg/kubelet/apis/cri/runtime/v1alpha2/BUILD similarity index 88% rename from pkg/kubelet/apis/cri/v1alpha1/runtime/BUILD rename to pkg/kubelet/apis/cri/runtime/v1alpha2/BUILD index a2ed4b6686..6685cd1289 100644 --- a/pkg/kubelet/apis/cri/v1alpha1/runtime/BUILD +++ b/pkg/kubelet/apis/cri/runtime/v1alpha2/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime", + importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", @@ -37,5 +37,4 @@ filegroup( filegroup( name = "go_default_library_protos", srcs = ["api.proto"], - visibility = ["//visibility:public"], ) diff --git a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go b/pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go similarity index 93% rename from pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go rename to pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go index a6a69234aa..8aae4fbe69 100644 --- a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go +++ b/pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go @@ -19,7 +19,7 @@ limitations under the License. // DO NOT EDIT! /* - Package runtime is a generated protocol buffer package. + Package v1alpha2 is a generated protocol buffer package. It is generated from these files: api.proto @@ -127,7 +127,7 @@ limitations under the License. ReopenContainerLogRequest ReopenContainerLogResponse */ -package runtime +package v1alpha2 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -389,7 +389,7 @@ func (m *DNSConfig) GetOptions() []string { // PortMapping specifies the port mapping configurations of a sandbox. type PortMapping struct { // Protocol of the port mapping. - Protocol Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=runtime.Protocol" json:"protocol,omitempty"` + Protocol Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=runtime.v1alpha2.Protocol" json:"protocol,omitempty"` // Port number within the container. Default: 0 (not specified). ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"` // Port number on the host. Default: 0 (not specified). @@ -441,7 +441,7 @@ type Mount struct { // If set, the mount needs SELinux relabeling. SelinuxRelabel bool `protobuf:"varint,4,opt,name=selinux_relabel,json=selinuxRelabel,proto3" json:"selinux_relabel,omitempty"` // Requested propagation mode. - Propagation MountPropagation `protobuf:"varint,5,opt,name=propagation,proto3,enum=runtime.MountPropagation" json:"propagation,omitempty"` + Propagation MountPropagation `protobuf:"varint,5,opt,name=propagation,proto3,enum=runtime.v1alpha2.MountPropagation" json:"propagation,omitempty"` } func (m *Mount) Reset() { *m = Mount{} } @@ -488,16 +488,16 @@ type NamespaceOption struct { // Network namespace for this container/sandbox. // Note: There is currently no way to set CONTAINER scoped network in the Kubernetes API. // Namespaces currently set by the kubelet: POD, NODE - Network NamespaceMode `protobuf:"varint,1,opt,name=network,proto3,enum=runtime.NamespaceMode" json:"network,omitempty"` + Network NamespaceMode `protobuf:"varint,1,opt,name=network,proto3,enum=runtime.v1alpha2.NamespaceMode" json:"network,omitempty"` // PID namespace for this container/sandbox. // Note: The CRI default is POD, but the v1.PodSpec default is CONTAINER. // The kubelet's runtime manager will set this to CONTAINER explicitly for v1 pods. // Namespaces currently set by the kubelet: POD, CONTAINER, NODE - Pid NamespaceMode `protobuf:"varint,2,opt,name=pid,proto3,enum=runtime.NamespaceMode" json:"pid,omitempty"` + Pid NamespaceMode `protobuf:"varint,2,opt,name=pid,proto3,enum=runtime.v1alpha2.NamespaceMode" json:"pid,omitempty"` // IPC namespace for this container/sandbox. // Note: There is currently no way to set CONTAINER scoped IPC in the Kubernetes API. // Namespaces currently set by the kubelet: POD, NODE - Ipc NamespaceMode `protobuf:"varint,3,opt,name=ipc,proto3,enum=runtime.NamespaceMode" json:"ipc,omitempty"` + Ipc NamespaceMode `protobuf:"varint,3,opt,name=ipc,proto3,enum=runtime.v1alpha2.NamespaceMode" json:"ipc,omitempty"` } func (m *NamespaceOption) Reset() { *m = NamespaceOption{} } @@ -987,7 +987,7 @@ type PodSandboxStatus struct { // Metadata of the sandbox. Metadata *PodSandboxMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"` // State of the sandbox. - State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.PodSandboxState" json:"state,omitempty"` + State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.v1alpha2.PodSandboxState" json:"state,omitempty"` // Creation timestamp of the sandbox in nanoseconds. Must be > 0. CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // Network contains network status if network is handled by the runtime. @@ -1094,7 +1094,7 @@ func (m *PodSandboxStatusResponse) GetInfo() map[string]string { // PodSandboxStateValue is the wrapper of PodSandboxState. type PodSandboxStateValue struct { // State of the sandbox. - State PodSandboxState `protobuf:"varint,1,opt,name=state,proto3,enum=runtime.PodSandboxState" json:"state,omitempty"` + State PodSandboxState `protobuf:"varint,1,opt,name=state,proto3,enum=runtime.v1alpha2.PodSandboxState" json:"state,omitempty"` } func (m *PodSandboxStateValue) Reset() { *m = PodSandboxStateValue{} } @@ -1169,7 +1169,7 @@ type PodSandbox struct { // Metadata of the PodSandbox. Metadata *PodSandboxMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"` // State of the PodSandbox. - State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.PodSandboxState" json:"state,omitempty"` + State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.v1alpha2.PodSandboxState" json:"state,omitempty"` // Creation timestamps of the PodSandbox in nanoseconds. Must be > 0. CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // Labels of the PodSandbox. @@ -2038,7 +2038,7 @@ func (*RemoveContainerResponse) Descriptor() ([]byte, []int) { return fileDescri // ContainerStateValue is the wrapper of ContainerState. type ContainerStateValue struct { // State of the container. - State ContainerState `protobuf:"varint,1,opt,name=state,proto3,enum=runtime.ContainerState" json:"state,omitempty"` + State ContainerState `protobuf:"varint,1,opt,name=state,proto3,enum=runtime.v1alpha2.ContainerState" json:"state,omitempty"` } func (m *ContainerStateValue) Reset() { *m = ContainerStateValue{} } @@ -2130,7 +2130,7 @@ type Container struct { // image ID. ImageRef string `protobuf:"bytes,5,opt,name=image_ref,json=imageRef,proto3" json:"image_ref,omitempty"` // State of the container. - State ContainerState `protobuf:"varint,6,opt,name=state,proto3,enum=runtime.ContainerState" json:"state,omitempty"` + State ContainerState `protobuf:"varint,6,opt,name=state,proto3,enum=runtime.v1alpha2.ContainerState" json:"state,omitempty"` // Creation time of the container in nanoseconds. CreatedAt int64 `protobuf:"varint,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // Key-value pairs that may be used to scope and select individual resources. @@ -2257,7 +2257,7 @@ type ContainerStatus struct { // Metadata of the container. Metadata *ContainerMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"` // Status of the container. - State ContainerState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.ContainerState" json:"state,omitempty"` + State ContainerState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.v1alpha2.ContainerState" json:"state,omitempty"` // Creation time of the container in nanoseconds. CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // Start time of the container in nanoseconds. Default: 0 (not specified). @@ -3572,112 +3572,112 @@ func (*ReopenContainerLogResponse) ProtoMessage() {} func (*ReopenContainerLogResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{100} } func init() { - proto.RegisterType((*VersionRequest)(nil), "runtime.VersionRequest") - proto.RegisterType((*VersionResponse)(nil), "runtime.VersionResponse") - proto.RegisterType((*DNSConfig)(nil), "runtime.DNSConfig") - proto.RegisterType((*PortMapping)(nil), "runtime.PortMapping") - proto.RegisterType((*Mount)(nil), "runtime.Mount") - proto.RegisterType((*NamespaceOption)(nil), "runtime.NamespaceOption") - proto.RegisterType((*Int64Value)(nil), "runtime.Int64Value") - proto.RegisterType((*LinuxSandboxSecurityContext)(nil), "runtime.LinuxSandboxSecurityContext") - proto.RegisterType((*LinuxPodSandboxConfig)(nil), "runtime.LinuxPodSandboxConfig") - proto.RegisterType((*PodSandboxMetadata)(nil), "runtime.PodSandboxMetadata") - proto.RegisterType((*PodSandboxConfig)(nil), "runtime.PodSandboxConfig") - proto.RegisterType((*RunPodSandboxRequest)(nil), "runtime.RunPodSandboxRequest") - proto.RegisterType((*RunPodSandboxResponse)(nil), "runtime.RunPodSandboxResponse") - proto.RegisterType((*StopPodSandboxRequest)(nil), "runtime.StopPodSandboxRequest") - proto.RegisterType((*StopPodSandboxResponse)(nil), "runtime.StopPodSandboxResponse") - proto.RegisterType((*RemovePodSandboxRequest)(nil), "runtime.RemovePodSandboxRequest") - proto.RegisterType((*RemovePodSandboxResponse)(nil), "runtime.RemovePodSandboxResponse") - proto.RegisterType((*PodSandboxStatusRequest)(nil), "runtime.PodSandboxStatusRequest") - proto.RegisterType((*PodSandboxNetworkStatus)(nil), "runtime.PodSandboxNetworkStatus") - proto.RegisterType((*Namespace)(nil), "runtime.Namespace") - proto.RegisterType((*LinuxPodSandboxStatus)(nil), "runtime.LinuxPodSandboxStatus") - proto.RegisterType((*PodSandboxStatus)(nil), "runtime.PodSandboxStatus") - proto.RegisterType((*PodSandboxStatusResponse)(nil), "runtime.PodSandboxStatusResponse") - proto.RegisterType((*PodSandboxStateValue)(nil), "runtime.PodSandboxStateValue") - proto.RegisterType((*PodSandboxFilter)(nil), "runtime.PodSandboxFilter") - proto.RegisterType((*ListPodSandboxRequest)(nil), "runtime.ListPodSandboxRequest") - proto.RegisterType((*PodSandbox)(nil), "runtime.PodSandbox") - proto.RegisterType((*ListPodSandboxResponse)(nil), "runtime.ListPodSandboxResponse") - proto.RegisterType((*ImageSpec)(nil), "runtime.ImageSpec") - proto.RegisterType((*KeyValue)(nil), "runtime.KeyValue") - proto.RegisterType((*LinuxContainerResources)(nil), "runtime.LinuxContainerResources") - proto.RegisterType((*SELinuxOption)(nil), "runtime.SELinuxOption") - proto.RegisterType((*Capability)(nil), "runtime.Capability") - proto.RegisterType((*LinuxContainerSecurityContext)(nil), "runtime.LinuxContainerSecurityContext") - proto.RegisterType((*LinuxContainerConfig)(nil), "runtime.LinuxContainerConfig") - proto.RegisterType((*WindowsContainerConfig)(nil), "runtime.WindowsContainerConfig") - proto.RegisterType((*WindowsContainerResources)(nil), "runtime.WindowsContainerResources") - proto.RegisterType((*ContainerMetadata)(nil), "runtime.ContainerMetadata") - proto.RegisterType((*Device)(nil), "runtime.Device") - proto.RegisterType((*ContainerConfig)(nil), "runtime.ContainerConfig") - proto.RegisterType((*CreateContainerRequest)(nil), "runtime.CreateContainerRequest") - proto.RegisterType((*CreateContainerResponse)(nil), "runtime.CreateContainerResponse") - proto.RegisterType((*StartContainerRequest)(nil), "runtime.StartContainerRequest") - proto.RegisterType((*StartContainerResponse)(nil), "runtime.StartContainerResponse") - proto.RegisterType((*StopContainerRequest)(nil), "runtime.StopContainerRequest") - proto.RegisterType((*StopContainerResponse)(nil), "runtime.StopContainerResponse") - proto.RegisterType((*RemoveContainerRequest)(nil), "runtime.RemoveContainerRequest") - proto.RegisterType((*RemoveContainerResponse)(nil), "runtime.RemoveContainerResponse") - proto.RegisterType((*ContainerStateValue)(nil), "runtime.ContainerStateValue") - proto.RegisterType((*ContainerFilter)(nil), "runtime.ContainerFilter") - proto.RegisterType((*ListContainersRequest)(nil), "runtime.ListContainersRequest") - proto.RegisterType((*Container)(nil), "runtime.Container") - proto.RegisterType((*ListContainersResponse)(nil), "runtime.ListContainersResponse") - proto.RegisterType((*ContainerStatusRequest)(nil), "runtime.ContainerStatusRequest") - proto.RegisterType((*ContainerStatus)(nil), "runtime.ContainerStatus") - proto.RegisterType((*ContainerStatusResponse)(nil), "runtime.ContainerStatusResponse") - proto.RegisterType((*UpdateContainerResourcesRequest)(nil), "runtime.UpdateContainerResourcesRequest") - proto.RegisterType((*UpdateContainerResourcesResponse)(nil), "runtime.UpdateContainerResourcesResponse") - proto.RegisterType((*ExecSyncRequest)(nil), "runtime.ExecSyncRequest") - proto.RegisterType((*ExecSyncResponse)(nil), "runtime.ExecSyncResponse") - proto.RegisterType((*ExecRequest)(nil), "runtime.ExecRequest") - proto.RegisterType((*ExecResponse)(nil), "runtime.ExecResponse") - proto.RegisterType((*AttachRequest)(nil), "runtime.AttachRequest") - proto.RegisterType((*AttachResponse)(nil), "runtime.AttachResponse") - proto.RegisterType((*PortForwardRequest)(nil), "runtime.PortForwardRequest") - proto.RegisterType((*PortForwardResponse)(nil), "runtime.PortForwardResponse") - proto.RegisterType((*ImageFilter)(nil), "runtime.ImageFilter") - proto.RegisterType((*ListImagesRequest)(nil), "runtime.ListImagesRequest") - proto.RegisterType((*Image)(nil), "runtime.Image") - proto.RegisterType((*ListImagesResponse)(nil), "runtime.ListImagesResponse") - proto.RegisterType((*ImageStatusRequest)(nil), "runtime.ImageStatusRequest") - proto.RegisterType((*ImageStatusResponse)(nil), "runtime.ImageStatusResponse") - proto.RegisterType((*AuthConfig)(nil), "runtime.AuthConfig") - proto.RegisterType((*PullImageRequest)(nil), "runtime.PullImageRequest") - proto.RegisterType((*PullImageResponse)(nil), "runtime.PullImageResponse") - proto.RegisterType((*RemoveImageRequest)(nil), "runtime.RemoveImageRequest") - proto.RegisterType((*RemoveImageResponse)(nil), "runtime.RemoveImageResponse") - proto.RegisterType((*NetworkConfig)(nil), "runtime.NetworkConfig") - proto.RegisterType((*RuntimeConfig)(nil), "runtime.RuntimeConfig") - proto.RegisterType((*UpdateRuntimeConfigRequest)(nil), "runtime.UpdateRuntimeConfigRequest") - proto.RegisterType((*UpdateRuntimeConfigResponse)(nil), "runtime.UpdateRuntimeConfigResponse") - proto.RegisterType((*RuntimeCondition)(nil), "runtime.RuntimeCondition") - proto.RegisterType((*RuntimeStatus)(nil), "runtime.RuntimeStatus") - proto.RegisterType((*StatusRequest)(nil), "runtime.StatusRequest") - proto.RegisterType((*StatusResponse)(nil), "runtime.StatusResponse") - proto.RegisterType((*ImageFsInfoRequest)(nil), "runtime.ImageFsInfoRequest") - proto.RegisterType((*UInt64Value)(nil), "runtime.UInt64Value") - proto.RegisterType((*StorageIdentifier)(nil), "runtime.StorageIdentifier") - proto.RegisterType((*FilesystemUsage)(nil), "runtime.FilesystemUsage") - proto.RegisterType((*ImageFsInfoResponse)(nil), "runtime.ImageFsInfoResponse") - proto.RegisterType((*ContainerStatsRequest)(nil), "runtime.ContainerStatsRequest") - proto.RegisterType((*ContainerStatsResponse)(nil), "runtime.ContainerStatsResponse") - proto.RegisterType((*ListContainerStatsRequest)(nil), "runtime.ListContainerStatsRequest") - proto.RegisterType((*ContainerStatsFilter)(nil), "runtime.ContainerStatsFilter") - proto.RegisterType((*ListContainerStatsResponse)(nil), "runtime.ListContainerStatsResponse") - proto.RegisterType((*ContainerAttributes)(nil), "runtime.ContainerAttributes") - proto.RegisterType((*ContainerStats)(nil), "runtime.ContainerStats") - proto.RegisterType((*CpuUsage)(nil), "runtime.CpuUsage") - proto.RegisterType((*MemoryUsage)(nil), "runtime.MemoryUsage") - proto.RegisterType((*ReopenContainerLogRequest)(nil), "runtime.ReopenContainerLogRequest") - proto.RegisterType((*ReopenContainerLogResponse)(nil), "runtime.ReopenContainerLogResponse") - proto.RegisterEnum("runtime.Protocol", Protocol_name, Protocol_value) - proto.RegisterEnum("runtime.MountPropagation", MountPropagation_name, MountPropagation_value) - proto.RegisterEnum("runtime.NamespaceMode", NamespaceMode_name, NamespaceMode_value) - proto.RegisterEnum("runtime.PodSandboxState", PodSandboxState_name, PodSandboxState_value) - proto.RegisterEnum("runtime.ContainerState", ContainerState_name, ContainerState_value) + proto.RegisterType((*VersionRequest)(nil), "runtime.v1alpha2.VersionRequest") + proto.RegisterType((*VersionResponse)(nil), "runtime.v1alpha2.VersionResponse") + proto.RegisterType((*DNSConfig)(nil), "runtime.v1alpha2.DNSConfig") + proto.RegisterType((*PortMapping)(nil), "runtime.v1alpha2.PortMapping") + proto.RegisterType((*Mount)(nil), "runtime.v1alpha2.Mount") + proto.RegisterType((*NamespaceOption)(nil), "runtime.v1alpha2.NamespaceOption") + proto.RegisterType((*Int64Value)(nil), "runtime.v1alpha2.Int64Value") + proto.RegisterType((*LinuxSandboxSecurityContext)(nil), "runtime.v1alpha2.LinuxSandboxSecurityContext") + proto.RegisterType((*LinuxPodSandboxConfig)(nil), "runtime.v1alpha2.LinuxPodSandboxConfig") + proto.RegisterType((*PodSandboxMetadata)(nil), "runtime.v1alpha2.PodSandboxMetadata") + proto.RegisterType((*PodSandboxConfig)(nil), "runtime.v1alpha2.PodSandboxConfig") + proto.RegisterType((*RunPodSandboxRequest)(nil), "runtime.v1alpha2.RunPodSandboxRequest") + proto.RegisterType((*RunPodSandboxResponse)(nil), "runtime.v1alpha2.RunPodSandboxResponse") + proto.RegisterType((*StopPodSandboxRequest)(nil), "runtime.v1alpha2.StopPodSandboxRequest") + proto.RegisterType((*StopPodSandboxResponse)(nil), "runtime.v1alpha2.StopPodSandboxResponse") + proto.RegisterType((*RemovePodSandboxRequest)(nil), "runtime.v1alpha2.RemovePodSandboxRequest") + proto.RegisterType((*RemovePodSandboxResponse)(nil), "runtime.v1alpha2.RemovePodSandboxResponse") + proto.RegisterType((*PodSandboxStatusRequest)(nil), "runtime.v1alpha2.PodSandboxStatusRequest") + proto.RegisterType((*PodSandboxNetworkStatus)(nil), "runtime.v1alpha2.PodSandboxNetworkStatus") + proto.RegisterType((*Namespace)(nil), "runtime.v1alpha2.Namespace") + proto.RegisterType((*LinuxPodSandboxStatus)(nil), "runtime.v1alpha2.LinuxPodSandboxStatus") + proto.RegisterType((*PodSandboxStatus)(nil), "runtime.v1alpha2.PodSandboxStatus") + proto.RegisterType((*PodSandboxStatusResponse)(nil), "runtime.v1alpha2.PodSandboxStatusResponse") + proto.RegisterType((*PodSandboxStateValue)(nil), "runtime.v1alpha2.PodSandboxStateValue") + proto.RegisterType((*PodSandboxFilter)(nil), "runtime.v1alpha2.PodSandboxFilter") + proto.RegisterType((*ListPodSandboxRequest)(nil), "runtime.v1alpha2.ListPodSandboxRequest") + proto.RegisterType((*PodSandbox)(nil), "runtime.v1alpha2.PodSandbox") + proto.RegisterType((*ListPodSandboxResponse)(nil), "runtime.v1alpha2.ListPodSandboxResponse") + proto.RegisterType((*ImageSpec)(nil), "runtime.v1alpha2.ImageSpec") + proto.RegisterType((*KeyValue)(nil), "runtime.v1alpha2.KeyValue") + proto.RegisterType((*LinuxContainerResources)(nil), "runtime.v1alpha2.LinuxContainerResources") + proto.RegisterType((*SELinuxOption)(nil), "runtime.v1alpha2.SELinuxOption") + proto.RegisterType((*Capability)(nil), "runtime.v1alpha2.Capability") + proto.RegisterType((*LinuxContainerSecurityContext)(nil), "runtime.v1alpha2.LinuxContainerSecurityContext") + proto.RegisterType((*LinuxContainerConfig)(nil), "runtime.v1alpha2.LinuxContainerConfig") + proto.RegisterType((*WindowsContainerConfig)(nil), "runtime.v1alpha2.WindowsContainerConfig") + proto.RegisterType((*WindowsContainerResources)(nil), "runtime.v1alpha2.WindowsContainerResources") + proto.RegisterType((*ContainerMetadata)(nil), "runtime.v1alpha2.ContainerMetadata") + proto.RegisterType((*Device)(nil), "runtime.v1alpha2.Device") + proto.RegisterType((*ContainerConfig)(nil), "runtime.v1alpha2.ContainerConfig") + proto.RegisterType((*CreateContainerRequest)(nil), "runtime.v1alpha2.CreateContainerRequest") + proto.RegisterType((*CreateContainerResponse)(nil), "runtime.v1alpha2.CreateContainerResponse") + proto.RegisterType((*StartContainerRequest)(nil), "runtime.v1alpha2.StartContainerRequest") + proto.RegisterType((*StartContainerResponse)(nil), "runtime.v1alpha2.StartContainerResponse") + proto.RegisterType((*StopContainerRequest)(nil), "runtime.v1alpha2.StopContainerRequest") + proto.RegisterType((*StopContainerResponse)(nil), "runtime.v1alpha2.StopContainerResponse") + proto.RegisterType((*RemoveContainerRequest)(nil), "runtime.v1alpha2.RemoveContainerRequest") + proto.RegisterType((*RemoveContainerResponse)(nil), "runtime.v1alpha2.RemoveContainerResponse") + proto.RegisterType((*ContainerStateValue)(nil), "runtime.v1alpha2.ContainerStateValue") + proto.RegisterType((*ContainerFilter)(nil), "runtime.v1alpha2.ContainerFilter") + proto.RegisterType((*ListContainersRequest)(nil), "runtime.v1alpha2.ListContainersRequest") + proto.RegisterType((*Container)(nil), "runtime.v1alpha2.Container") + proto.RegisterType((*ListContainersResponse)(nil), "runtime.v1alpha2.ListContainersResponse") + proto.RegisterType((*ContainerStatusRequest)(nil), "runtime.v1alpha2.ContainerStatusRequest") + proto.RegisterType((*ContainerStatus)(nil), "runtime.v1alpha2.ContainerStatus") + proto.RegisterType((*ContainerStatusResponse)(nil), "runtime.v1alpha2.ContainerStatusResponse") + proto.RegisterType((*UpdateContainerResourcesRequest)(nil), "runtime.v1alpha2.UpdateContainerResourcesRequest") + proto.RegisterType((*UpdateContainerResourcesResponse)(nil), "runtime.v1alpha2.UpdateContainerResourcesResponse") + proto.RegisterType((*ExecSyncRequest)(nil), "runtime.v1alpha2.ExecSyncRequest") + proto.RegisterType((*ExecSyncResponse)(nil), "runtime.v1alpha2.ExecSyncResponse") + proto.RegisterType((*ExecRequest)(nil), "runtime.v1alpha2.ExecRequest") + proto.RegisterType((*ExecResponse)(nil), "runtime.v1alpha2.ExecResponse") + proto.RegisterType((*AttachRequest)(nil), "runtime.v1alpha2.AttachRequest") + proto.RegisterType((*AttachResponse)(nil), "runtime.v1alpha2.AttachResponse") + proto.RegisterType((*PortForwardRequest)(nil), "runtime.v1alpha2.PortForwardRequest") + proto.RegisterType((*PortForwardResponse)(nil), "runtime.v1alpha2.PortForwardResponse") + proto.RegisterType((*ImageFilter)(nil), "runtime.v1alpha2.ImageFilter") + proto.RegisterType((*ListImagesRequest)(nil), "runtime.v1alpha2.ListImagesRequest") + proto.RegisterType((*Image)(nil), "runtime.v1alpha2.Image") + proto.RegisterType((*ListImagesResponse)(nil), "runtime.v1alpha2.ListImagesResponse") + proto.RegisterType((*ImageStatusRequest)(nil), "runtime.v1alpha2.ImageStatusRequest") + proto.RegisterType((*ImageStatusResponse)(nil), "runtime.v1alpha2.ImageStatusResponse") + proto.RegisterType((*AuthConfig)(nil), "runtime.v1alpha2.AuthConfig") + proto.RegisterType((*PullImageRequest)(nil), "runtime.v1alpha2.PullImageRequest") + proto.RegisterType((*PullImageResponse)(nil), "runtime.v1alpha2.PullImageResponse") + proto.RegisterType((*RemoveImageRequest)(nil), "runtime.v1alpha2.RemoveImageRequest") + proto.RegisterType((*RemoveImageResponse)(nil), "runtime.v1alpha2.RemoveImageResponse") + proto.RegisterType((*NetworkConfig)(nil), "runtime.v1alpha2.NetworkConfig") + proto.RegisterType((*RuntimeConfig)(nil), "runtime.v1alpha2.RuntimeConfig") + proto.RegisterType((*UpdateRuntimeConfigRequest)(nil), "runtime.v1alpha2.UpdateRuntimeConfigRequest") + proto.RegisterType((*UpdateRuntimeConfigResponse)(nil), "runtime.v1alpha2.UpdateRuntimeConfigResponse") + proto.RegisterType((*RuntimeCondition)(nil), "runtime.v1alpha2.RuntimeCondition") + proto.RegisterType((*RuntimeStatus)(nil), "runtime.v1alpha2.RuntimeStatus") + proto.RegisterType((*StatusRequest)(nil), "runtime.v1alpha2.StatusRequest") + proto.RegisterType((*StatusResponse)(nil), "runtime.v1alpha2.StatusResponse") + proto.RegisterType((*ImageFsInfoRequest)(nil), "runtime.v1alpha2.ImageFsInfoRequest") + proto.RegisterType((*UInt64Value)(nil), "runtime.v1alpha2.UInt64Value") + proto.RegisterType((*StorageIdentifier)(nil), "runtime.v1alpha2.StorageIdentifier") + proto.RegisterType((*FilesystemUsage)(nil), "runtime.v1alpha2.FilesystemUsage") + proto.RegisterType((*ImageFsInfoResponse)(nil), "runtime.v1alpha2.ImageFsInfoResponse") + proto.RegisterType((*ContainerStatsRequest)(nil), "runtime.v1alpha2.ContainerStatsRequest") + proto.RegisterType((*ContainerStatsResponse)(nil), "runtime.v1alpha2.ContainerStatsResponse") + proto.RegisterType((*ListContainerStatsRequest)(nil), "runtime.v1alpha2.ListContainerStatsRequest") + proto.RegisterType((*ContainerStatsFilter)(nil), "runtime.v1alpha2.ContainerStatsFilter") + proto.RegisterType((*ListContainerStatsResponse)(nil), "runtime.v1alpha2.ListContainerStatsResponse") + proto.RegisterType((*ContainerAttributes)(nil), "runtime.v1alpha2.ContainerAttributes") + proto.RegisterType((*ContainerStats)(nil), "runtime.v1alpha2.ContainerStats") + proto.RegisterType((*CpuUsage)(nil), "runtime.v1alpha2.CpuUsage") + proto.RegisterType((*MemoryUsage)(nil), "runtime.v1alpha2.MemoryUsage") + proto.RegisterType((*ReopenContainerLogRequest)(nil), "runtime.v1alpha2.ReopenContainerLogRequest") + proto.RegisterType((*ReopenContainerLogResponse)(nil), "runtime.v1alpha2.ReopenContainerLogResponse") + proto.RegisterEnum("runtime.v1alpha2.Protocol", Protocol_name, Protocol_value) + proto.RegisterEnum("runtime.v1alpha2.MountPropagation", MountPropagation_name, MountPropagation_value) + proto.RegisterEnum("runtime.v1alpha2.NamespaceMode", NamespaceMode_name, NamespaceMode_value) + proto.RegisterEnum("runtime.v1alpha2.PodSandboxState", PodSandboxState_name, PodSandboxState_value) + proto.RegisterEnum("runtime.v1alpha2.ContainerState", ContainerState_name, ContainerState_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -3770,7 +3770,7 @@ func NewRuntimeServiceClient(cc *grpc.ClientConn) RuntimeServiceClient { func (c *runtimeServiceClient) Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionResponse, error) { out := new(VersionResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/Version", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/Version", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3779,7 +3779,7 @@ func (c *runtimeServiceClient) Version(ctx context.Context, in *VersionRequest, func (c *runtimeServiceClient) RunPodSandbox(ctx context.Context, in *RunPodSandboxRequest, opts ...grpc.CallOption) (*RunPodSandboxResponse, error) { out := new(RunPodSandboxResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/RunPodSandbox", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/RunPodSandbox", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3788,7 +3788,7 @@ func (c *runtimeServiceClient) RunPodSandbox(ctx context.Context, in *RunPodSand func (c *runtimeServiceClient) StopPodSandbox(ctx context.Context, in *StopPodSandboxRequest, opts ...grpc.CallOption) (*StopPodSandboxResponse, error) { out := new(StopPodSandboxResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/StopPodSandbox", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/StopPodSandbox", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3797,7 +3797,7 @@ func (c *runtimeServiceClient) StopPodSandbox(ctx context.Context, in *StopPodSa func (c *runtimeServiceClient) RemovePodSandbox(ctx context.Context, in *RemovePodSandboxRequest, opts ...grpc.CallOption) (*RemovePodSandboxResponse, error) { out := new(RemovePodSandboxResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/RemovePodSandbox", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/RemovePodSandbox", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3806,7 +3806,7 @@ func (c *runtimeServiceClient) RemovePodSandbox(ctx context.Context, in *RemoveP func (c *runtimeServiceClient) PodSandboxStatus(ctx context.Context, in *PodSandboxStatusRequest, opts ...grpc.CallOption) (*PodSandboxStatusResponse, error) { out := new(PodSandboxStatusResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/PodSandboxStatus", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/PodSandboxStatus", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3815,7 +3815,7 @@ func (c *runtimeServiceClient) PodSandboxStatus(ctx context.Context, in *PodSand func (c *runtimeServiceClient) ListPodSandbox(ctx context.Context, in *ListPodSandboxRequest, opts ...grpc.CallOption) (*ListPodSandboxResponse, error) { out := new(ListPodSandboxResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ListPodSandbox", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ListPodSandbox", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3824,7 +3824,7 @@ func (c *runtimeServiceClient) ListPodSandbox(ctx context.Context, in *ListPodSa func (c *runtimeServiceClient) CreateContainer(ctx context.Context, in *CreateContainerRequest, opts ...grpc.CallOption) (*CreateContainerResponse, error) { out := new(CreateContainerResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/CreateContainer", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/CreateContainer", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3833,7 +3833,7 @@ func (c *runtimeServiceClient) CreateContainer(ctx context.Context, in *CreateCo func (c *runtimeServiceClient) StartContainer(ctx context.Context, in *StartContainerRequest, opts ...grpc.CallOption) (*StartContainerResponse, error) { out := new(StartContainerResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/StartContainer", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/StartContainer", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3842,7 +3842,7 @@ func (c *runtimeServiceClient) StartContainer(ctx context.Context, in *StartCont func (c *runtimeServiceClient) StopContainer(ctx context.Context, in *StopContainerRequest, opts ...grpc.CallOption) (*StopContainerResponse, error) { out := new(StopContainerResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/StopContainer", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/StopContainer", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3851,7 +3851,7 @@ func (c *runtimeServiceClient) StopContainer(ctx context.Context, in *StopContai func (c *runtimeServiceClient) RemoveContainer(ctx context.Context, in *RemoveContainerRequest, opts ...grpc.CallOption) (*RemoveContainerResponse, error) { out := new(RemoveContainerResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/RemoveContainer", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/RemoveContainer", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3860,7 +3860,7 @@ func (c *runtimeServiceClient) RemoveContainer(ctx context.Context, in *RemoveCo func (c *runtimeServiceClient) ListContainers(ctx context.Context, in *ListContainersRequest, opts ...grpc.CallOption) (*ListContainersResponse, error) { out := new(ListContainersResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ListContainers", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ListContainers", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3869,7 +3869,7 @@ func (c *runtimeServiceClient) ListContainers(ctx context.Context, in *ListConta func (c *runtimeServiceClient) ContainerStatus(ctx context.Context, in *ContainerStatusRequest, opts ...grpc.CallOption) (*ContainerStatusResponse, error) { out := new(ContainerStatusResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ContainerStatus", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ContainerStatus", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3878,7 +3878,7 @@ func (c *runtimeServiceClient) ContainerStatus(ctx context.Context, in *Containe func (c *runtimeServiceClient) UpdateContainerResources(ctx context.Context, in *UpdateContainerResourcesRequest, opts ...grpc.CallOption) (*UpdateContainerResourcesResponse, error) { out := new(UpdateContainerResourcesResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/UpdateContainerResources", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/UpdateContainerResources", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3887,7 +3887,7 @@ func (c *runtimeServiceClient) UpdateContainerResources(ctx context.Context, in func (c *runtimeServiceClient) ReopenContainerLog(ctx context.Context, in *ReopenContainerLogRequest, opts ...grpc.CallOption) (*ReopenContainerLogResponse, error) { out := new(ReopenContainerLogResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ReopenContainerLog", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ReopenContainerLog", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3896,7 +3896,7 @@ func (c *runtimeServiceClient) ReopenContainerLog(ctx context.Context, in *Reope func (c *runtimeServiceClient) ExecSync(ctx context.Context, in *ExecSyncRequest, opts ...grpc.CallOption) (*ExecSyncResponse, error) { out := new(ExecSyncResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ExecSync", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ExecSync", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3905,7 +3905,7 @@ func (c *runtimeServiceClient) ExecSync(ctx context.Context, in *ExecSyncRequest func (c *runtimeServiceClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (*ExecResponse, error) { out := new(ExecResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/Exec", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/Exec", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3914,7 +3914,7 @@ func (c *runtimeServiceClient) Exec(ctx context.Context, in *ExecRequest, opts . func (c *runtimeServiceClient) Attach(ctx context.Context, in *AttachRequest, opts ...grpc.CallOption) (*AttachResponse, error) { out := new(AttachResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/Attach", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/Attach", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3923,7 +3923,7 @@ func (c *runtimeServiceClient) Attach(ctx context.Context, in *AttachRequest, op func (c *runtimeServiceClient) PortForward(ctx context.Context, in *PortForwardRequest, opts ...grpc.CallOption) (*PortForwardResponse, error) { out := new(PortForwardResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/PortForward", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/PortForward", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3932,7 +3932,7 @@ func (c *runtimeServiceClient) PortForward(ctx context.Context, in *PortForwardR func (c *runtimeServiceClient) ContainerStats(ctx context.Context, in *ContainerStatsRequest, opts ...grpc.CallOption) (*ContainerStatsResponse, error) { out := new(ContainerStatsResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ContainerStats", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ContainerStats", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3941,7 +3941,7 @@ func (c *runtimeServiceClient) ContainerStats(ctx context.Context, in *Container func (c *runtimeServiceClient) ListContainerStats(ctx context.Context, in *ListContainerStatsRequest, opts ...grpc.CallOption) (*ListContainerStatsResponse, error) { out := new(ListContainerStatsResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/ListContainerStats", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/ListContainerStats", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3950,7 +3950,7 @@ func (c *runtimeServiceClient) ListContainerStats(ctx context.Context, in *ListC func (c *runtimeServiceClient) UpdateRuntimeConfig(ctx context.Context, in *UpdateRuntimeConfigRequest, opts ...grpc.CallOption) (*UpdateRuntimeConfigResponse, error) { out := new(UpdateRuntimeConfigResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/UpdateRuntimeConfig", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/UpdateRuntimeConfig", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -3959,7 +3959,7 @@ func (c *runtimeServiceClient) UpdateRuntimeConfig(ctx context.Context, in *Upda func (c *runtimeServiceClient) Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusResponse, error) { out := new(StatusResponse) - err := grpc.Invoke(ctx, "/runtime.RuntimeService/Status", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.RuntimeService/Status", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4052,7 +4052,7 @@ func _RuntimeService_Version_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/Version", + FullMethod: "/runtime.v1alpha2.RuntimeService/Version", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).Version(ctx, req.(*VersionRequest)) @@ -4070,7 +4070,7 @@ func _RuntimeService_RunPodSandbox_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/RunPodSandbox", + FullMethod: "/runtime.v1alpha2.RuntimeService/RunPodSandbox", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).RunPodSandbox(ctx, req.(*RunPodSandboxRequest)) @@ -4088,7 +4088,7 @@ func _RuntimeService_StopPodSandbox_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/StopPodSandbox", + FullMethod: "/runtime.v1alpha2.RuntimeService/StopPodSandbox", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).StopPodSandbox(ctx, req.(*StopPodSandboxRequest)) @@ -4106,7 +4106,7 @@ func _RuntimeService_RemovePodSandbox_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/RemovePodSandbox", + FullMethod: "/runtime.v1alpha2.RuntimeService/RemovePodSandbox", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).RemovePodSandbox(ctx, req.(*RemovePodSandboxRequest)) @@ -4124,7 +4124,7 @@ func _RuntimeService_PodSandboxStatus_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/PodSandboxStatus", + FullMethod: "/runtime.v1alpha2.RuntimeService/PodSandboxStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).PodSandboxStatus(ctx, req.(*PodSandboxStatusRequest)) @@ -4142,7 +4142,7 @@ func _RuntimeService_ListPodSandbox_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ListPodSandbox", + FullMethod: "/runtime.v1alpha2.RuntimeService/ListPodSandbox", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ListPodSandbox(ctx, req.(*ListPodSandboxRequest)) @@ -4160,7 +4160,7 @@ func _RuntimeService_CreateContainer_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/CreateContainer", + FullMethod: "/runtime.v1alpha2.RuntimeService/CreateContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).CreateContainer(ctx, req.(*CreateContainerRequest)) @@ -4178,7 +4178,7 @@ func _RuntimeService_StartContainer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/StartContainer", + FullMethod: "/runtime.v1alpha2.RuntimeService/StartContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).StartContainer(ctx, req.(*StartContainerRequest)) @@ -4196,7 +4196,7 @@ func _RuntimeService_StopContainer_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/StopContainer", + FullMethod: "/runtime.v1alpha2.RuntimeService/StopContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).StopContainer(ctx, req.(*StopContainerRequest)) @@ -4214,7 +4214,7 @@ func _RuntimeService_RemoveContainer_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/RemoveContainer", + FullMethod: "/runtime.v1alpha2.RuntimeService/RemoveContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).RemoveContainer(ctx, req.(*RemoveContainerRequest)) @@ -4232,7 +4232,7 @@ func _RuntimeService_ListContainers_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ListContainers", + FullMethod: "/runtime.v1alpha2.RuntimeService/ListContainers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ListContainers(ctx, req.(*ListContainersRequest)) @@ -4250,7 +4250,7 @@ func _RuntimeService_ContainerStatus_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ContainerStatus", + FullMethod: "/runtime.v1alpha2.RuntimeService/ContainerStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ContainerStatus(ctx, req.(*ContainerStatusRequest)) @@ -4268,7 +4268,7 @@ func _RuntimeService_UpdateContainerResources_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/UpdateContainerResources", + FullMethod: "/runtime.v1alpha2.RuntimeService/UpdateContainerResources", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).UpdateContainerResources(ctx, req.(*UpdateContainerResourcesRequest)) @@ -4286,7 +4286,7 @@ func _RuntimeService_ReopenContainerLog_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ReopenContainerLog", + FullMethod: "/runtime.v1alpha2.RuntimeService/ReopenContainerLog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ReopenContainerLog(ctx, req.(*ReopenContainerLogRequest)) @@ -4304,7 +4304,7 @@ func _RuntimeService_ExecSync_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ExecSync", + FullMethod: "/runtime.v1alpha2.RuntimeService/ExecSync", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ExecSync(ctx, req.(*ExecSyncRequest)) @@ -4322,7 +4322,7 @@ func _RuntimeService_Exec_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/Exec", + FullMethod: "/runtime.v1alpha2.RuntimeService/Exec", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).Exec(ctx, req.(*ExecRequest)) @@ -4340,7 +4340,7 @@ func _RuntimeService_Attach_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/Attach", + FullMethod: "/runtime.v1alpha2.RuntimeService/Attach", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).Attach(ctx, req.(*AttachRequest)) @@ -4358,7 +4358,7 @@ func _RuntimeService_PortForward_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/PortForward", + FullMethod: "/runtime.v1alpha2.RuntimeService/PortForward", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).PortForward(ctx, req.(*PortForwardRequest)) @@ -4376,7 +4376,7 @@ func _RuntimeService_ContainerStats_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ContainerStats", + FullMethod: "/runtime.v1alpha2.RuntimeService/ContainerStats", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ContainerStats(ctx, req.(*ContainerStatsRequest)) @@ -4394,7 +4394,7 @@ func _RuntimeService_ListContainerStats_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/ListContainerStats", + FullMethod: "/runtime.v1alpha2.RuntimeService/ListContainerStats", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).ListContainerStats(ctx, req.(*ListContainerStatsRequest)) @@ -4412,7 +4412,7 @@ func _RuntimeService_UpdateRuntimeConfig_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/UpdateRuntimeConfig", + FullMethod: "/runtime.v1alpha2.RuntimeService/UpdateRuntimeConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).UpdateRuntimeConfig(ctx, req.(*UpdateRuntimeConfigRequest)) @@ -4430,7 +4430,7 @@ func _RuntimeService_Status_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.RuntimeService/Status", + FullMethod: "/runtime.v1alpha2.RuntimeService/Status", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RuntimeServiceServer).Status(ctx, req.(*StatusRequest)) @@ -4439,7 +4439,7 @@ func _RuntimeService_Status_Handler(srv interface{}, ctx context.Context, dec fu } var _RuntimeService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "runtime.RuntimeService", + ServiceName: "runtime.v1alpha2.RuntimeService", HandlerType: (*RuntimeServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -4564,7 +4564,7 @@ func NewImageServiceClient(cc *grpc.ClientConn) ImageServiceClient { func (c *imageServiceClient) ListImages(ctx context.Context, in *ListImagesRequest, opts ...grpc.CallOption) (*ListImagesResponse, error) { out := new(ListImagesResponse) - err := grpc.Invoke(ctx, "/runtime.ImageService/ListImages", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.ImageService/ListImages", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4573,7 +4573,7 @@ func (c *imageServiceClient) ListImages(ctx context.Context, in *ListImagesReque func (c *imageServiceClient) ImageStatus(ctx context.Context, in *ImageStatusRequest, opts ...grpc.CallOption) (*ImageStatusResponse, error) { out := new(ImageStatusResponse) - err := grpc.Invoke(ctx, "/runtime.ImageService/ImageStatus", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.ImageService/ImageStatus", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4582,7 +4582,7 @@ func (c *imageServiceClient) ImageStatus(ctx context.Context, in *ImageStatusReq func (c *imageServiceClient) PullImage(ctx context.Context, in *PullImageRequest, opts ...grpc.CallOption) (*PullImageResponse, error) { out := new(PullImageResponse) - err := grpc.Invoke(ctx, "/runtime.ImageService/PullImage", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.ImageService/PullImage", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4591,7 +4591,7 @@ func (c *imageServiceClient) PullImage(ctx context.Context, in *PullImageRequest func (c *imageServiceClient) RemoveImage(ctx context.Context, in *RemoveImageRequest, opts ...grpc.CallOption) (*RemoveImageResponse, error) { out := new(RemoveImageResponse) - err := grpc.Invoke(ctx, "/runtime.ImageService/RemoveImage", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.ImageService/RemoveImage", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4600,7 +4600,7 @@ func (c *imageServiceClient) RemoveImage(ctx context.Context, in *RemoveImageReq func (c *imageServiceClient) ImageFsInfo(ctx context.Context, in *ImageFsInfoRequest, opts ...grpc.CallOption) (*ImageFsInfoResponse, error) { out := new(ImageFsInfoResponse) - err := grpc.Invoke(ctx, "/runtime.ImageService/ImageFsInfo", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/runtime.v1alpha2.ImageService/ImageFsInfo", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4640,7 +4640,7 @@ func _ImageService_ListImages_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.ImageService/ListImages", + FullMethod: "/runtime.v1alpha2.ImageService/ListImages", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ImageServiceServer).ListImages(ctx, req.(*ListImagesRequest)) @@ -4658,7 +4658,7 @@ func _ImageService_ImageStatus_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.ImageService/ImageStatus", + FullMethod: "/runtime.v1alpha2.ImageService/ImageStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ImageServiceServer).ImageStatus(ctx, req.(*ImageStatusRequest)) @@ -4676,7 +4676,7 @@ func _ImageService_PullImage_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.ImageService/PullImage", + FullMethod: "/runtime.v1alpha2.ImageService/PullImage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ImageServiceServer).PullImage(ctx, req.(*PullImageRequest)) @@ -4694,7 +4694,7 @@ func _ImageService_RemoveImage_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.ImageService/RemoveImage", + FullMethod: "/runtime.v1alpha2.ImageService/RemoveImage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ImageServiceServer).RemoveImage(ctx, req.(*RemoveImageRequest)) @@ -4712,7 +4712,7 @@ func _ImageService_ImageFsInfo_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/runtime.ImageService/ImageFsInfo", + FullMethod: "/runtime.v1alpha2.ImageService/ImageFsInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ImageServiceServer).ImageFsInfo(ctx, req.(*ImageFsInfoRequest)) @@ -4721,7 +4721,7 @@ func _ImageService_ImageFsInfo_Handler(srv interface{}, ctx context.Context, dec } var _ImageService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "runtime.ImageService", + ServiceName: "runtime.v1alpha2.ImageService", HandlerType: (*ImageServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -26331,289 +26331,293 @@ var ( func init() { proto.RegisterFile("api.proto", fileDescriptorApi) } var fileDescriptorApi = []byte{ - // 4542 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5b, 0xcd, 0x6f, 0x1b, 0x49, - 0x76, 0x17, 0x49, 0x7d, 0x90, 0x8f, 0x22, 0x45, 0x95, 0x65, 0x89, 0xa2, 0x6d, 0x59, 0x6e, 0xcf, - 0x78, 0x6c, 0xef, 0xda, 0x6b, 0x6b, 0x76, 0xec, 0x8c, 0x67, 0xc6, 0x36, 0x47, 0x92, 0x1d, 0x8d, - 0x6d, 0x49, 0xdb, 0x94, 0xe6, 0x23, 0x1b, 0xa0, 0xd3, 0x62, 0x97, 0xa8, 0xde, 0x21, 0xbb, 0x7a, - 0xfa, 0xc3, 0xb6, 0x82, 0x1c, 0x92, 0x4b, 0x10, 0x04, 0x08, 0xb0, 0x01, 0x02, 0x04, 0xc9, 0x29, - 0x87, 0x00, 0x8b, 0x20, 0x40, 0x10, 0x04, 0x41, 0x90, 0x3f, 0x20, 0x48, 0xf6, 0xb2, 0x40, 0x4e, - 0x41, 0x8e, 0x59, 0xe7, 0x90, 0x43, 0x80, 0xfc, 0x0d, 0x41, 0x7d, 0x75, 0x57, 0x7f, 0xd1, 0x92, - 0x67, 0x76, 0x67, 0x4e, 0xec, 0x7a, 0xf5, 0xea, 0xd5, 0xab, 0x7a, 0x55, 0xaf, 0xde, 0xfb, 0x55, - 0x11, 0x6a, 0xa6, 0x6b, 0xdf, 0x74, 0x3d, 0x12, 0x10, 0x34, 0xe3, 0x85, 0x4e, 0x60, 0x8f, 0x70, - 0xe7, 0xc6, 0xc0, 0x0e, 0x8e, 0xc2, 0x83, 0x9b, 0x7d, 0x32, 0xfa, 0xc1, 0x80, 0x0c, 0xc8, 0x0f, - 0x58, 0xfd, 0x41, 0x78, 0xc8, 0x4a, 0xac, 0xc0, 0xbe, 0x78, 0x3b, 0xed, 0x3a, 0x34, 0x3f, 0xc5, - 0x9e, 0x6f, 0x13, 0x47, 0xc7, 0x5f, 0x85, 0xd8, 0x0f, 0x50, 0x1b, 0x66, 0x9e, 0x73, 0x4a, 0xbb, - 0xb4, 0x5a, 0xba, 0x5a, 0xd3, 0x65, 0x51, 0xfb, 0x59, 0x09, 0xe6, 0x22, 0x66, 0xdf, 0x25, 0x8e, - 0x8f, 0x8b, 0xb9, 0xd1, 0x25, 0x98, 0x15, 0x3a, 0x19, 0x8e, 0x39, 0xc2, 0xed, 0x32, 0xab, 0xae, - 0x0b, 0xda, 0xb6, 0x39, 0xc2, 0xe8, 0x1d, 0x98, 0x93, 0x2c, 0x52, 0x48, 0x85, 0x71, 0x35, 0x05, - 0x59, 0xf4, 0x86, 0x6e, 0xc2, 0x19, 0xc9, 0x68, 0xba, 0x76, 0xc4, 0x3c, 0xc9, 0x98, 0xe7, 0x45, - 0x55, 0xd7, 0xb5, 0x05, 0xbf, 0xf6, 0x63, 0xa8, 0x6d, 0x6c, 0xf7, 0xd6, 0x89, 0x73, 0x68, 0x0f, - 0xa8, 0x8a, 0x3e, 0xf6, 0x68, 0x9b, 0x76, 0x69, 0xb5, 0x42, 0x55, 0x14, 0x45, 0xd4, 0x81, 0xaa, - 0x8f, 0x4d, 0xaf, 0x7f, 0x84, 0xfd, 0x76, 0x99, 0x55, 0x45, 0x65, 0xda, 0x8a, 0xb8, 0x81, 0x4d, - 0x1c, 0xbf, 0x5d, 0xe1, 0xad, 0x44, 0x51, 0xfb, 0x8b, 0x12, 0xd4, 0x77, 0x89, 0x17, 0x3c, 0x33, - 0x5d, 0xd7, 0x76, 0x06, 0xe8, 0x06, 0x54, 0xd9, 0x5c, 0xf6, 0xc9, 0x90, 0xcd, 0x41, 0x73, 0x6d, - 0xfe, 0xa6, 0x50, 0xe9, 0xe6, 0xae, 0xa8, 0xd0, 0x23, 0x16, 0xf4, 0x36, 0x34, 0xfb, 0xc4, 0x09, - 0x4c, 0xdb, 0xc1, 0x9e, 0xe1, 0x12, 0x2f, 0x60, 0x33, 0x33, 0xa5, 0x37, 0x22, 0x2a, 0x15, 0x8e, - 0xce, 0x41, 0xed, 0x88, 0xf8, 0x01, 0xe7, 0xa8, 0x30, 0x8e, 0x2a, 0x25, 0xb0, 0xca, 0x25, 0x98, - 0x61, 0x95, 0xb6, 0x2b, 0xe6, 0x60, 0x9a, 0x16, 0xb7, 0x5c, 0xed, 0x17, 0x25, 0x98, 0x7a, 0x46, - 0x42, 0x27, 0x48, 0x75, 0x63, 0x06, 0x47, 0xc2, 0x3e, 0x4a, 0x37, 0x66, 0x70, 0x14, 0x77, 0x43, - 0x39, 0xb8, 0x89, 0x78, 0x37, 0xb4, 0xb2, 0x03, 0x55, 0x0f, 0x9b, 0x16, 0x71, 0x86, 0xc7, 0x4c, - 0x85, 0xaa, 0x1e, 0x95, 0xa9, 0xed, 0x7c, 0x3c, 0xb4, 0x9d, 0xf0, 0xa5, 0xe1, 0xe1, 0xa1, 0x79, - 0x80, 0x87, 0x4c, 0x95, 0xaa, 0xde, 0x14, 0x64, 0x9d, 0x53, 0xd1, 0x07, 0x50, 0x77, 0x3d, 0xe2, - 0x9a, 0x03, 0x93, 0x4e, 0x5f, 0x7b, 0x8a, 0xcd, 0xd0, 0x72, 0x34, 0x43, 0x4c, 0xdb, 0xdd, 0x98, - 0x41, 0x57, 0xb9, 0xb5, 0x3f, 0x2f, 0xc1, 0x1c, 0x5d, 0x2a, 0xbe, 0x6b, 0xf6, 0xf1, 0x0e, 0x33, - 0x00, 0xba, 0x05, 0x33, 0x0e, 0x0e, 0x5e, 0x10, 0xef, 0x4b, 0x31, 0xdd, 0x8b, 0x91, 0xb0, 0x88, - 0xf5, 0x19, 0xb1, 0xb0, 0x2e, 0xd9, 0xd0, 0x55, 0xa8, 0xb8, 0xb6, 0xc5, 0x86, 0x57, 0xcc, 0x4d, - 0x59, 0x28, 0xa7, 0xed, 0xf6, 0xd9, 0x60, 0xc7, 0x70, 0xda, 0x6e, 0x5f, 0xd3, 0x00, 0xb6, 0x9c, - 0xe0, 0xce, 0x0f, 0x3f, 0x35, 0x87, 0x21, 0x46, 0x0b, 0x30, 0xf5, 0x9c, 0x7e, 0x30, 0x8d, 0x2a, - 0x3a, 0x2f, 0x68, 0x7f, 0x58, 0x81, 0x73, 0x4f, 0xe9, 0x5c, 0xf4, 0x4c, 0xc7, 0x3a, 0x20, 0x2f, - 0x7b, 0xb8, 0x1f, 0x7a, 0x76, 0x70, 0xbc, 0x4e, 0x9c, 0x00, 0xbf, 0x0c, 0xd0, 0x26, 0xcc, 0x3b, - 0x52, 0xb2, 0x21, 0x57, 0x1b, 0x95, 0x50, 0x5f, 0x6b, 0x67, 0xfb, 0xe6, 0xc3, 0xd7, 0x5b, 0x4e, - 0x92, 0xe0, 0xa3, 0x07, 0xb1, 0x29, 0xa4, 0x90, 0x32, 0x13, 0x12, 0x0f, 0xa0, 0xb7, 0xc9, 0xf4, - 0x10, 0x22, 0xa4, 0x89, 0xa4, 0x80, 0x77, 0x81, 0x6e, 0x4b, 0xc3, 0xf4, 0x8d, 0xd0, 0xc7, 0x1e, - 0x1b, 0x7d, 0x7d, 0xed, 0x4c, 0xd4, 0x38, 0x1e, 0xa7, 0x5e, 0xf3, 0x42, 0xa7, 0xeb, 0xef, 0xfb, - 0xd8, 0x63, 0x9b, 0x57, 0x2c, 0x06, 0xc3, 0x23, 0x24, 0x38, 0xf4, 0xe5, 0x02, 0x90, 0x64, 0x9d, - 0x51, 0xd1, 0x0f, 0xe0, 0x8c, 0x1f, 0xba, 0xee, 0x10, 0x8f, 0xb0, 0x13, 0x98, 0x43, 0x63, 0xe0, - 0x91, 0xd0, 0xf5, 0xdb, 0x53, 0xab, 0x95, 0xab, 0x15, 0x1d, 0xa9, 0x55, 0x8f, 0x59, 0x0d, 0x5a, - 0x01, 0x70, 0x3d, 0xfb, 0xb9, 0x3d, 0xc4, 0x03, 0x6c, 0xb5, 0xa7, 0x99, 0x50, 0x85, 0x82, 0x6e, - 0xc1, 0x82, 0x8f, 0xfb, 0x7d, 0x32, 0x72, 0x0d, 0xd7, 0x23, 0x87, 0xf6, 0x10, 0xf3, 0xe5, 0x3b, - 0xc3, 0x96, 0x2f, 0x12, 0x75, 0xbb, 0xbc, 0x8a, 0x2e, 0x64, 0xed, 0xa7, 0x65, 0x38, 0xcb, 0x26, - 0x60, 0x97, 0x58, 0xc2, 0x16, 0xc2, 0x39, 0x5c, 0x86, 0x46, 0x9f, 0x29, 0x64, 0xb8, 0xa6, 0x87, - 0x9d, 0x40, 0xec, 0x92, 0x59, 0x4e, 0xdc, 0x65, 0x34, 0xb4, 0x03, 0x2d, 0x5f, 0x98, 0xce, 0xe8, - 0x73, 0xdb, 0x89, 0x19, 0x7e, 0x2b, 0x9a, 0xa4, 0x31, 0x76, 0xd6, 0xe7, 0xfc, 0x8c, 0xe1, 0x67, - 0xfc, 0x63, 0xbf, 0x1f, 0x0c, 0xb9, 0x73, 0xa9, 0xaf, 0x7d, 0x2f, 0x29, 0x27, 0xad, 0xe6, 0xcd, - 0x1e, 0xe7, 0xde, 0x74, 0x02, 0xef, 0x58, 0x97, 0x6d, 0x3b, 0xf7, 0x60, 0x56, 0xad, 0x40, 0x2d, - 0xa8, 0x7c, 0x89, 0x8f, 0xc5, 0x10, 0xe8, 0x67, 0xbc, 0x2e, 0xf9, 0xd6, 0xe6, 0x85, 0x7b, 0xe5, - 0xdf, 0x28, 0x69, 0x1e, 0xa0, 0xb8, 0x97, 0x67, 0x38, 0x30, 0x2d, 0x33, 0x30, 0x11, 0x82, 0x49, - 0xe6, 0xac, 0xb9, 0x08, 0xf6, 0x4d, 0xa5, 0x86, 0x62, 0xf7, 0xd4, 0x74, 0xfa, 0x89, 0xce, 0x43, - 0x2d, 0x5a, 0x84, 0xc2, 0x63, 0xc7, 0x04, 0xea, 0x39, 0xcd, 0x20, 0xc0, 0x23, 0x37, 0x60, 0x0b, - 0xa2, 0xa1, 0xcb, 0xa2, 0xf6, 0xcf, 0x93, 0xd0, 0xca, 0x58, 0xe0, 0x2e, 0x54, 0x47, 0xa2, 0x7b, - 0xb1, 0xf6, 0xcf, 0xc5, 0xee, 0x33, 0xa3, 0xa1, 0x1e, 0x31, 0x53, 0xef, 0x44, 0x3d, 0x95, 0x72, - 0xb8, 0x44, 0x65, 0x6a, 0xd6, 0x21, 0x19, 0x18, 0x96, 0xed, 0xe1, 0x7e, 0x40, 0xbc, 0x63, 0xa1, - 0xe5, 0xec, 0x90, 0x0c, 0x36, 0x24, 0x0d, 0xdd, 0x06, 0xb0, 0x1c, 0x9f, 0x5a, 0xf4, 0xd0, 0x1e, - 0x30, 0x5d, 0xeb, 0x6b, 0x28, 0xea, 0x3b, 0x3a, 0x40, 0xf4, 0x9a, 0xe5, 0xf8, 0x42, 0xd9, 0xf7, - 0xa1, 0x41, 0x1d, 0xb2, 0x31, 0xe2, 0xbe, 0x9f, 0xaf, 0xe2, 0xfa, 0xda, 0x82, 0xa2, 0x71, 0x74, - 0x30, 0xe8, 0xb3, 0x6e, 0x5c, 0xf0, 0xd1, 0x47, 0x30, 0xcd, 0x1c, 0xa2, 0xdf, 0x9e, 0x66, 0x6d, - 0xde, 0xce, 0x19, 0xa5, 0xb0, 0xf6, 0x53, 0xc6, 0xc7, 0x8d, 0x2d, 0x1a, 0xa1, 0xa7, 0x50, 0x37, - 0x1d, 0x87, 0x04, 0x26, 0xdf, 0xe0, 0x33, 0x4c, 0xc6, 0xf5, 0x62, 0x19, 0xdd, 0x98, 0x99, 0x0b, - 0x52, 0x9b, 0xa3, 0x1f, 0xc2, 0x14, 0xf3, 0x00, 0xed, 0x2a, 0x1b, 0xf5, 0xca, 0xf8, 0xe5, 0xa7, - 0x73, 0xe6, 0xce, 0xfb, 0x50, 0x57, 0x54, 0x3b, 0xcd, 0x72, 0xeb, 0xdc, 0x87, 0x56, 0x5a, 0xa3, - 0x53, 0x2d, 0xd7, 0x2d, 0x58, 0xd0, 0x43, 0x27, 0x56, 0x4c, 0x46, 0x2b, 0xb7, 0x61, 0x5a, 0xd8, - 0x8f, 0xaf, 0x9d, 0xe5, 0xc2, 0x19, 0xd1, 0x05, 0xa3, 0xf6, 0x11, 0x9c, 0x4d, 0x89, 0x12, 0xb1, - 0xcc, 0x5b, 0xd0, 0x74, 0x89, 0x65, 0xf8, 0x9c, 0x6c, 0xd8, 0x96, 0x74, 0x06, 0x6e, 0xc4, 0xbb, - 0x65, 0xd1, 0xe6, 0xbd, 0x80, 0xb8, 0x59, 0x55, 0x4e, 0xd6, 0xbc, 0x0d, 0x8b, 0xe9, 0xe6, 0xbc, - 0x7b, 0xed, 0x01, 0x2c, 0xe9, 0x78, 0x44, 0x9e, 0xe3, 0x37, 0x15, 0xdd, 0x81, 0x76, 0x56, 0x80, - 0x10, 0xfe, 0x05, 0x2c, 0xc5, 0xd4, 0x5e, 0x60, 0x06, 0xa1, 0x7f, 0x2a, 0xe1, 0x22, 0xd0, 0x3b, - 0x20, 0x3e, 0x37, 0x4e, 0x55, 0x97, 0x45, 0xed, 0x9a, 0x2a, 0x7a, 0x9b, 0x1f, 0xb9, 0xbc, 0x07, - 0xd4, 0x84, 0xb2, 0xed, 0x0a, 0x71, 0x65, 0xdb, 0xd5, 0x1e, 0x40, 0x2d, 0x3a, 0xce, 0xd0, 0x5a, - 0x1c, 0x61, 0x95, 0x5f, 0x73, 0xe6, 0x45, 0xb1, 0xd7, 0x93, 0x8c, 0x1f, 0x17, 0x3d, 0xad, 0x01, - 0x44, 0x1e, 0x48, 0x9e, 0xa1, 0x28, 0x2b, 0x4f, 0x57, 0xb8, 0xb4, 0xbf, 0x4e, 0xb8, 0x23, 0x45, - 0x65, 0x2b, 0x52, 0xd9, 0x4a, 0xb8, 0xa7, 0xf2, 0x69, 0xdc, 0xd3, 0x4d, 0x98, 0xf2, 0x03, 0x33, - 0xc0, 0x22, 0x98, 0x68, 0xe7, 0xb4, 0xa2, 0x5d, 0x62, 0x9d, 0xb3, 0xa1, 0x0b, 0x00, 0x7d, 0x0f, - 0x9b, 0x01, 0xb6, 0x0c, 0x93, 0x7b, 0xce, 0x8a, 0x5e, 0x13, 0x94, 0x6e, 0x80, 0xee, 0xc5, 0x51, - 0xcf, 0x14, 0x53, 0x63, 0x35, 0x47, 0x60, 0x62, 0xf6, 0xe3, 0xf8, 0x27, 0xda, 0xed, 0xd3, 0xe3, - 0x77, 0xbb, 0x68, 0xc7, 0x99, 0x15, 0x87, 0x35, 0x53, 0xe8, 0xb0, 0x78, 0x8b, 0x93, 0x38, 0xac, - 0x6a, 0xa1, 0xc3, 0x12, 0x32, 0xc6, 0x3a, 0xac, 0x6f, 0xd3, 0xf5, 0xfc, 0x5b, 0x09, 0xda, 0xd9, - 0xbd, 0x23, 0x7c, 0xc6, 0x6d, 0x98, 0xf6, 0x19, 0x65, 0x8c, 0xff, 0x11, 0x4d, 0x04, 0x23, 0x7a, - 0x00, 0x93, 0xb6, 0x73, 0x48, 0x58, 0xc6, 0xa1, 0x9e, 0xfc, 0x45, 0x7d, 0xdc, 0xdc, 0x72, 0x0e, - 0x09, 0x9f, 0x12, 0xd6, 0xb0, 0x73, 0x17, 0x6a, 0x11, 0xe9, 0x54, 0x23, 0x79, 0x04, 0x0b, 0xa9, - 0xc5, 0xc7, 0xa3, 0xd7, 0x68, 0xa9, 0x96, 0x4e, 0xb4, 0x54, 0xb5, 0xff, 0x2b, 0xa9, 0x1b, 0xe7, - 0x91, 0x3d, 0x0c, 0xb0, 0x97, 0xd9, 0x38, 0xef, 0x4a, 0xa1, 0x7c, 0xd7, 0x5c, 0x28, 0x12, 0xca, - 0x03, 0x4b, 0xb1, 0x09, 0x7a, 0xd0, 0x64, 0xcb, 0xc7, 0xf0, 0xf1, 0x90, 0x9d, 0xd2, 0x22, 0x3e, - 0xfa, 0x7e, 0x4e, 0x6b, 0xde, 0x2f, 0x5f, 0x7b, 0x3d, 0xc1, 0xce, 0xa7, 0xa9, 0x31, 0x54, 0x69, - 0x9d, 0x87, 0x80, 0xb2, 0x4c, 0xa7, 0x9a, 0xb8, 0x4f, 0xa8, 0xdb, 0xa1, 0xb9, 0x57, 0xce, 0xf1, - 0x73, 0xc8, 0xd4, 0x18, 0x63, 0x7e, 0xae, 0xa7, 0x2e, 0x18, 0xb5, 0xbf, 0xaa, 0x00, 0xc4, 0x95, - 0xdf, 0x59, 0x7f, 0x73, 0x37, 0xda, 0xfd, 0x3c, 0xc4, 0xb9, 0x98, 0x23, 0x2f, 0x77, 0xdf, 0x3f, - 0x4a, 0xee, 0x7b, 0x1e, 0xec, 0xbc, 0x95, 0xd7, 0xfa, 0x3b, 0xbb, 0xe3, 0xd7, 0x61, 0x31, 0x6d, - 0x6e, 0xb1, 0xdd, 0xaf, 0xc1, 0x94, 0x1d, 0xe0, 0x11, 0x47, 0x12, 0xd4, 0x1c, 0x49, 0xe1, 0xe5, - 0x1c, 0xda, 0x25, 0xa8, 0x6d, 0x8d, 0xcc, 0x01, 0xee, 0xb9, 0xb8, 0x4f, 0xfb, 0xb2, 0x69, 0x41, - 0xf4, 0xcf, 0x0b, 0xda, 0x1a, 0x54, 0x9f, 0xe0, 0x63, 0xbe, 0x07, 0x4f, 0xa8, 0x9f, 0xf6, 0x27, - 0x65, 0x58, 0x62, 0x6e, 0x7b, 0x5d, 0xe6, 0xf1, 0x3a, 0xf6, 0x49, 0xe8, 0xf5, 0xb1, 0xcf, 0x4c, - 0xea, 0x86, 0x86, 0x8b, 0x3d, 0x9b, 0x58, 0x22, 0x15, 0xad, 0xf5, 0xdd, 0x70, 0x97, 0x11, 0x68, - 0xae, 0x4f, 0xab, 0xbf, 0x0a, 0x89, 0x58, 0x5b, 0x15, 0xbd, 0xda, 0x77, 0xc3, 0x1f, 0xd1, 0xb2, - 0x6c, 0xeb, 0x1f, 0x99, 0x1e, 0xf6, 0xd9, 0x1a, 0xe2, 0x6d, 0x7b, 0x8c, 0x80, 0x6e, 0xc3, 0xd9, - 0x11, 0x1e, 0x11, 0xef, 0xd8, 0x18, 0xda, 0x23, 0x3b, 0x30, 0x6c, 0xc7, 0x38, 0x38, 0x0e, 0xb0, - 0x2f, 0x16, 0x0e, 0xe2, 0x95, 0x4f, 0x69, 0xdd, 0x96, 0xf3, 0x31, 0xad, 0x41, 0x1a, 0x34, 0x08, - 0x19, 0x19, 0x7e, 0x9f, 0x78, 0xd8, 0x30, 0xad, 0x9f, 0xb0, 0x73, 0xab, 0xa2, 0xd7, 0x09, 0x19, - 0xf5, 0x28, 0xad, 0x6b, 0xfd, 0x04, 0x5d, 0x84, 0x7a, 0xdf, 0x0d, 0x7d, 0x1c, 0x18, 0xf4, 0x87, - 0x9d, 0x4f, 0x35, 0x1d, 0x38, 0x69, 0xdd, 0x0d, 0x7d, 0x85, 0x61, 0x44, 0xa7, 0x7d, 0x46, 0x65, - 0x78, 0x46, 0xa7, 0xd9, 0x84, 0x46, 0x22, 0xb9, 0xa5, 0x29, 0x0c, 0xcb, 0x62, 0x45, 0x0a, 0x43, - 0xbf, 0x29, 0xcd, 0x23, 0x43, 0x39, 0x93, 0xec, 0x9b, 0xd2, 0x82, 0x63, 0x57, 0xe6, 0x2f, 0xec, - 0x9b, 0x4e, 0xf9, 0x10, 0x3f, 0x17, 0x50, 0x46, 0x4d, 0xe7, 0x05, 0xcd, 0x02, 0x58, 0x37, 0x5d, - 0xf3, 0xc0, 0x1e, 0xda, 0xc1, 0x31, 0xba, 0x06, 0x2d, 0xd3, 0xb2, 0x8c, 0xbe, 0xa4, 0xd8, 0x58, - 0xe2, 0x4a, 0x73, 0xa6, 0x65, 0xad, 0x2b, 0x64, 0xf4, 0x3d, 0x98, 0xb7, 0x3c, 0xe2, 0x26, 0x79, - 0x39, 0xd0, 0xd4, 0xa2, 0x15, 0x2a, 0xb3, 0xf6, 0x4f, 0x93, 0x70, 0x21, 0x69, 0xd8, 0x34, 0x5c, - 0x70, 0x17, 0x66, 0x53, 0xbd, 0x26, 0xf3, 0xf4, 0x58, 0x49, 0x3d, 0xc1, 0x98, 0x4a, 0xa8, 0xcb, - 0x99, 0x84, 0x3a, 0x17, 0x87, 0xa8, 0x7c, 0x13, 0x38, 0xc4, 0xe4, 0xd7, 0xc1, 0x21, 0xa6, 0x4e, - 0x84, 0x43, 0x5c, 0x61, 0x20, 0xa2, 0x6c, 0xc4, 0xb2, 0x41, 0xbe, 0x8c, 0x1a, 0x11, 0x8f, 0x23, - 0xc1, 0xc6, 0x14, 0x5e, 0x31, 0x73, 0x1a, 0xbc, 0xa2, 0x5a, 0x88, 0x57, 0xd0, 0x15, 0xe1, 0xba, - 0xa6, 0x37, 0x22, 0x9e, 0x04, 0x24, 0xda, 0x35, 0xa6, 0xc2, 0x9c, 0xa4, 0x0b, 0x30, 0xa2, 0x10, - 0xba, 0x80, 0x22, 0xe8, 0x02, 0xad, 0xc2, 0xac, 0x43, 0x0c, 0x07, 0xbf, 0x30, 0xa8, 0xc1, 0xfc, - 0x76, 0x9d, 0x5b, 0xcf, 0x21, 0xdb, 0xf8, 0xc5, 0x2e, 0xa5, 0x68, 0x7f, 0x53, 0x82, 0x85, 0xe4, - 0xc2, 0x11, 0xc9, 0xea, 0x7d, 0xa8, 0x79, 0xd2, 0x37, 0x88, 0xc5, 0xb2, 0x9a, 0x0c, 0xfd, 0xb2, - 0x3e, 0x44, 0x8f, 0x9b, 0xa0, 0x1f, 0x15, 0xc2, 0x1e, 0x57, 0x0a, 0xc4, 0xbc, 0x0e, 0xf8, 0xd0, - 0x7e, 0x0b, 0x16, 0x3f, 0xb3, 0x1d, 0x8b, 0xbc, 0xf0, 0xd3, 0xca, 0x3e, 0xcc, 0x2a, 0xab, 0x45, - 0xbd, 0xa4, 0xdb, 0xe4, 0xa9, 0xab, 0xfd, 0x6d, 0x09, 0x96, 0x0b, 0x19, 0x53, 0xfe, 0xad, 0x94, - 0xf6, 0x6f, 0xc2, 0x37, 0xf6, 0x49, 0xe8, 0x04, 0x8a, 0x6f, 0x5c, 0x67, 0x58, 0x2a, 0x77, 0x42, - 0xc6, 0xc8, 0x7c, 0x69, 0x8f, 0xc2, 0x91, 0x70, 0x8e, 0x54, 0xdc, 0x33, 0x4e, 0x79, 0x03, 0xef, - 0xa8, 0x75, 0x61, 0x3e, 0xd2, 0x72, 0x2c, 0xfc, 0xa2, 0xc0, 0x29, 0xe5, 0x24, 0x9c, 0xe2, 0xc0, - 0xf4, 0x06, 0x7e, 0x6e, 0xf7, 0xf1, 0x37, 0x02, 0xf6, 0xae, 0x42, 0xdd, 0xc5, 0xde, 0xc8, 0xf6, - 0xfd, 0x68, 0xfb, 0xd7, 0x74, 0x95, 0xa4, 0xfd, 0xd9, 0x34, 0xcc, 0xa5, 0xcd, 0x76, 0x27, 0x83, - 0xde, 0x74, 0x62, 0x7f, 0x94, 0x1e, 0x9f, 0x12, 0xad, 0x5c, 0x95, 0x07, 0x62, 0x39, 0x95, 0xaa, - 0x45, 0x67, 0xa6, 0x38, 0x24, 0xe9, 0xf8, 0xfb, 0x64, 0x34, 0x32, 0x1d, 0x4b, 0x02, 0xf1, 0xa2, - 0x48, 0x67, 0xcb, 0xf4, 0x06, 0x74, 0x92, 0x29, 0x99, 0x7d, 0x53, 0x53, 0xd1, 0x94, 0xc7, 0x76, - 0x18, 0xf8, 0xc3, 0x5c, 0x48, 0x4d, 0x07, 0x41, 0xda, 0xb0, 0x3d, 0xf4, 0x36, 0x4c, 0x62, 0xe7, - 0xb9, 0x8c, 0x4b, 0x62, 0xa4, 0x5e, 0x1e, 0xc4, 0x3a, 0xab, 0x46, 0x57, 0x60, 0x7a, 0x44, 0x6d, - 0x2f, 0x93, 0x9f, 0x66, 0x12, 0xb0, 0xd6, 0x45, 0x2d, 0xba, 0x06, 0x33, 0x16, 0xb3, 0x81, 0xcc, - 0x70, 0xe6, 0x62, 0x00, 0x89, 0xd1, 0x75, 0x59, 0x8f, 0x3e, 0x8c, 0x22, 0xaa, 0x5a, 0x2a, 0x26, - 0x4a, 0x4d, 0x6a, 0x6e, 0x58, 0xf5, 0x24, 0x19, 0x56, 0x01, 0x13, 0x71, 0xad, 0x50, 0xc4, 0x78, - 0xf8, 0x67, 0x19, 0xaa, 0x43, 0x32, 0xe0, 0xeb, 0xa0, 0xce, 0xaf, 0x6d, 0x86, 0x64, 0xc0, 0x96, - 0xc1, 0x02, 0x0d, 0x23, 0x2d, 0xdb, 0x69, 0xcf, 0x32, 0x47, 0xc3, 0x0b, 0x74, 0xf7, 0xb0, 0x0f, - 0x83, 0x38, 0x7d, 0xdc, 0x6e, 0xb0, 0xaa, 0x1a, 0xa3, 0xec, 0x38, 0x7d, 0x16, 0xbc, 0x04, 0xc1, - 0x71, 0xbb, 0xc9, 0xe8, 0xf4, 0x93, 0x46, 0xff, 0x3c, 0xe5, 0x9c, 0x4b, 0x45, 0xff, 0x79, 0x9e, - 0x4a, 0x66, 0x9c, 0xef, 0xc3, 0xcc, 0x0b, 0xbe, 0x81, 0xdb, 0x2d, 0xd6, 0xec, 0x62, 0xa1, 0x07, - 0x10, 0x0d, 0x25, 0xff, 0xb7, 0x19, 0x2d, 0xfe, 0x43, 0x09, 0x16, 0xd7, 0x59, 0xdc, 0xac, 0xb8, - 0x9d, 0xd3, 0x40, 0x2b, 0xb7, 0x22, 0x0c, 0x2b, 0x8d, 0x83, 0xa4, 0x87, 0x2b, 0xf8, 0xd0, 0x43, - 0x68, 0x4a, 0x99, 0xa2, 0x65, 0xe5, 0x75, 0xe8, 0x57, 0xc3, 0x57, 0x8b, 0xda, 0x87, 0xb0, 0x94, - 0xd1, 0x59, 0xc4, 0xb8, 0x97, 0x60, 0x36, 0x76, 0x26, 0x91, 0xca, 0xf5, 0x88, 0xb6, 0x65, 0x69, - 0xf7, 0xe0, 0x6c, 0x2f, 0x30, 0xbd, 0x20, 0x33, 0xe0, 0x13, 0xb4, 0x65, 0x00, 0x58, 0xb2, 0xad, - 0xc0, 0xa8, 0x7a, 0xb0, 0xd0, 0x0b, 0x88, 0xfb, 0x06, 0x42, 0xa9, 0x93, 0xa0, 0xc3, 0x26, 0xa1, - 0x74, 0xde, 0xb2, 0xa8, 0x2d, 0x71, 0xb8, 0x2e, 0xdb, 0xdb, 0x07, 0xb0, 0xc8, 0xd1, 0xb2, 0x37, - 0x19, 0xc4, 0xb2, 0xc4, 0xea, 0xb2, 0x72, 0x37, 0xe0, 0x4c, 0x7c, 0x1e, 0xc6, 0x39, 0xf6, 0x8d, - 0x64, 0x8e, 0xbd, 0x94, 0xb5, 0x71, 0x22, 0xc5, 0xfe, 0xd3, 0xb2, 0xe2, 0x6b, 0x0b, 0x32, 0xec, - 0xb5, 0x64, 0x86, 0x7d, 0xbe, 0x40, 0x64, 0x22, 0xc1, 0xce, 0xae, 0xc8, 0x4a, 0xce, 0x8a, 0xd4, - 0x33, 0x69, 0xf8, 0x64, 0x0a, 0xac, 0x48, 0xe9, 0xf6, 0x6b, 0xc9, 0xc2, 0xb7, 0x78, 0x16, 0x1e, - 0x75, 0x1d, 0x21, 0x98, 0xb7, 0x52, 0x59, 0x78, 0xbb, 0x48, 0xcd, 0x28, 0x09, 0xff, 0xa3, 0x49, - 0xa8, 0x45, 0x75, 0x99, 0x89, 0xcd, 0x4e, 0x52, 0x39, 0x67, 0x92, 0xd4, 0xa3, 0xaf, 0xf2, 0x26, - 0x47, 0xdf, 0xe4, 0xeb, 0x8e, 0xbe, 0x73, 0x50, 0x63, 0x1f, 0x86, 0x87, 0x0f, 0xc5, 0x51, 0x56, - 0x65, 0x04, 0x1d, 0x1f, 0xc6, 0x0b, 0x6a, 0xfa, 0x24, 0x0b, 0x2a, 0x95, 0xee, 0xcf, 0xa4, 0xd3, - 0xfd, 0x3b, 0xd1, 0xe1, 0xc4, 0x8f, 0xb1, 0x95, 0xac, 0xb8, 0xdc, 0x63, 0x69, 0x33, 0x79, 0x2c, - 0xf1, 0x93, 0xed, 0x72, 0x4e, 0xe3, 0xef, 0x6c, 0xb2, 0xff, 0x94, 0x27, 0xfb, 0xea, 0xaa, 0x12, - 0x8e, 0x70, 0x0d, 0x20, 0xda, 0xf3, 0x32, 0xe3, 0x47, 0xd9, 0xa1, 0xe9, 0x0a, 0x97, 0xb6, 0x0f, - 0x8b, 0x89, 0xf9, 0x8f, 0x61, 0xf6, 0x93, 0x79, 0xb1, 0x02, 0x8c, 0xfd, 0x5f, 0xa7, 0x14, 0x77, - 0x50, 0x80, 0x54, 0xdf, 0xc9, 0x20, 0x47, 0x27, 0x5b, 0x8f, 0x37, 0x92, 0xc0, 0xd1, 0xe9, 0x16, - 0x52, 0x06, 0x37, 0x62, 0x91, 0x82, 0xe9, 0x89, 0x6a, 0x9e, 0xf2, 0xd7, 0x04, 0xa5, 0xcb, 0x42, - 0xe9, 0x43, 0xdb, 0xb1, 0xfd, 0x23, 0x5e, 0x3f, 0xcd, 0x43, 0x69, 0x49, 0xea, 0xb2, 0x77, 0x0f, - 0xf8, 0xa5, 0x1d, 0x18, 0x7d, 0x62, 0x61, 0xb6, 0x4c, 0xa7, 0xf4, 0x2a, 0x25, 0xac, 0x13, 0x0b, - 0xc7, 0x5b, 0xa7, 0x7a, 0xaa, 0xad, 0x53, 0x4b, 0x6d, 0x9d, 0x45, 0x98, 0xf6, 0xb0, 0xe9, 0x13, - 0x47, 0xe4, 0x5d, 0xa2, 0x44, 0xe7, 0x7f, 0x84, 0x7d, 0x9f, 0x76, 0x20, 0xa2, 0x22, 0x51, 0x54, - 0x62, 0xb7, 0xd9, 0xa2, 0xd8, 0x6d, 0x0c, 0x14, 0x9e, 0x8a, 0xdd, 0x1a, 0x45, 0xb1, 0xdb, 0x49, - 0x90, 0x70, 0x25, 0x32, 0x6d, 0x8e, 0x8d, 0x4c, 0xd5, 0x18, 0x6f, 0x2e, 0x11, 0xe3, 0x7d, 0x9b, - 0xbb, 0xed, 0x5f, 0x4a, 0xb0, 0x94, 0xd9, 0x20, 0x62, 0xbf, 0xdd, 0x4a, 0x61, 0xe9, 0xed, 0xa2, - 0x19, 0x8a, 0xa0, 0xf4, 0xfb, 0x09, 0x28, 0xfd, 0x7a, 0x21, 0xff, 0x37, 0x8e, 0xa4, 0xff, 0x1e, - 0x5c, 0xdc, 0x77, 0xad, 0x54, 0xf8, 0x24, 0x52, 0xd2, 0x93, 0xef, 0xf7, 0x3b, 0x32, 0x48, 0x2e, - 0x9f, 0x30, 0x39, 0xe7, 0xec, 0x9a, 0x06, 0xab, 0xc5, 0xbd, 0x8b, 0x30, 0xe4, 0x77, 0x60, 0x6e, - 0xf3, 0x25, 0xee, 0xf7, 0x8e, 0x9d, 0xfe, 0x29, 0x34, 0x6a, 0x41, 0xa5, 0x3f, 0xb2, 0x04, 0x46, - 0x45, 0x3f, 0xd5, 0xc8, 0xaa, 0x92, 0x8c, 0xac, 0x0c, 0x68, 0xc5, 0x3d, 0x08, 0x13, 0x2e, 0x52, - 0x13, 0x5a, 0x94, 0x99, 0x0a, 0x9f, 0xd5, 0x45, 0x49, 0xd0, 0xb1, 0xe7, 0xb1, 0xa1, 0x72, 0x3a, - 0xf6, 0xbc, 0xe4, 0x6e, 0xaf, 0x24, 0x77, 0xbb, 0xf6, 0x97, 0x25, 0xa8, 0xd3, 0x1e, 0xbe, 0x96, - 0xfe, 0x22, 0x35, 0xa9, 0xc4, 0xa9, 0x49, 0x94, 0xe1, 0x4c, 0xaa, 0x19, 0x4e, 0xac, 0xf9, 0x14, - 0x23, 0x67, 0x35, 0x9f, 0x8e, 0xe8, 0xd8, 0xf3, 0xb4, 0x55, 0x98, 0xe5, 0xba, 0x89, 0x91, 0xb7, - 0xa0, 0x12, 0x7a, 0x43, 0xb9, 0x7a, 0x42, 0x6f, 0xa8, 0xfd, 0x71, 0x09, 0x1a, 0xdd, 0x20, 0x30, - 0xfb, 0x47, 0xa7, 0x18, 0x40, 0xa4, 0x5c, 0x59, 0x55, 0x2e, 0x3b, 0x88, 0x58, 0xdd, 0xc9, 0x02, - 0x75, 0xa7, 0x12, 0xea, 0x6a, 0xd0, 0x94, 0xba, 0x14, 0x2a, 0xbc, 0x0d, 0x68, 0x97, 0x78, 0xc1, - 0x23, 0xe2, 0xbd, 0x30, 0x3d, 0xeb, 0x74, 0x39, 0x0c, 0x82, 0x49, 0xf1, 0x96, 0xad, 0x72, 0x75, - 0x4a, 0x67, 0xdf, 0xda, 0x3b, 0x70, 0x26, 0x21, 0xaf, 0xb0, 0xe3, 0xbb, 0x50, 0x67, 0x0e, 0x5c, - 0xc4, 0xb9, 0x57, 0x55, 0xb0, 0x7c, 0x9c, 0x97, 0xd7, 0xba, 0x30, 0x4f, 0xcf, 0x6e, 0x46, 0x8f, - 0x36, 0xde, 0xf7, 0x53, 0xd1, 0xe0, 0x42, 0xb2, 0x7d, 0x2a, 0x12, 0xfc, 0xbb, 0x12, 0x4c, 0x31, - 0x7a, 0xe6, 0x3c, 0x3d, 0x07, 0x35, 0x0f, 0xbb, 0xc4, 0x08, 0xcc, 0x41, 0xf4, 0x3c, 0x90, 0x12, - 0xf6, 0xcc, 0x81, 0xcf, 0x5e, 0x37, 0xd2, 0x4a, 0xcb, 0x1e, 0x60, 0x3f, 0x90, 0x6f, 0x04, 0xeb, - 0x94, 0xb6, 0xc1, 0x49, 0x74, 0x4a, 0x7c, 0xfb, 0x77, 0x79, 0x98, 0x37, 0xa9, 0xb3, 0x6f, 0xf4, - 0x36, 0x7f, 0x4b, 0x33, 0x06, 0xd9, 0x64, 0x0f, 0x6c, 0x3a, 0x50, 0x4d, 0x81, 0x99, 0x51, 0x59, - 0xfb, 0x10, 0x90, 0x3a, 0x66, 0x31, 0xa9, 0x57, 0x60, 0x9a, 0x4d, 0x89, 0x8c, 0x53, 0x9a, 0xc9, - 0x41, 0xeb, 0xa2, 0x56, 0xfb, 0x1c, 0x10, 0x9f, 0xc5, 0x44, 0x6c, 0x72, 0xe2, 0x19, 0x1f, 0x13, - 0xa2, 0xfc, 0x7d, 0x09, 0xce, 0x24, 0x44, 0x47, 0xaf, 0x2a, 0x12, 0xb2, 0xd3, 0x8a, 0x09, 0xb9, - 0xf7, 0x12, 0x9e, 0xfc, 0x4a, 0x4a, 0x81, 0x5f, 0x91, 0x17, 0xff, 0x45, 0x09, 0xa0, 0x1b, 0x06, - 0x47, 0x02, 0xcb, 0x52, 0x67, 0xbd, 0x94, 0x9c, 0x75, 0x5a, 0xe7, 0x9a, 0xbe, 0xff, 0x82, 0x78, - 0x32, 0x19, 0x88, 0xca, 0x0c, 0x87, 0x0a, 0x83, 0x23, 0x79, 0x93, 0x40, 0xbf, 0xd1, 0xdb, 0xd0, - 0xe4, 0xaf, 0x4c, 0x0d, 0xd3, 0xb2, 0x3c, 0xec, 0xfb, 0xe2, 0x4a, 0xa1, 0xc1, 0xa9, 0x5d, 0x4e, - 0xa4, 0x6c, 0xb6, 0x85, 0x9d, 0xc0, 0x0e, 0x8e, 0x8d, 0x80, 0x7c, 0x89, 0x1d, 0x11, 0xe6, 0x37, - 0x24, 0x75, 0x8f, 0x12, 0x29, 0x9b, 0x87, 0x07, 0xb6, 0x1f, 0x78, 0x92, 0x4d, 0x42, 0xdc, 0x82, - 0xca, 0xd8, 0xb4, 0x9f, 0x95, 0xa0, 0xb5, 0x1b, 0x0e, 0x87, 0x7c, 0x66, 0x4f, 0x6d, 0xdb, 0x77, - 0xc4, 0x38, 0xca, 0xa9, 0xd5, 0x19, 0x4f, 0x91, 0x18, 0xdc, 0xd7, 0x87, 0x1f, 0x6e, 0xc1, 0xbc, - 0xa2, 0xa8, 0x58, 0x29, 0x89, 0x98, 0xad, 0x94, 0x8c, 0xd9, 0xb4, 0xfb, 0x80, 0x78, 0xc6, 0xfd, - 0x66, 0x83, 0xd3, 0xce, 0xc2, 0x99, 0x44, 0x7b, 0x71, 0x4c, 0x5e, 0x87, 0x86, 0x78, 0x34, 0x21, - 0x16, 0xc1, 0x32, 0x54, 0xa9, 0xbb, 0xeb, 0xdb, 0x96, 0xbc, 0x42, 0x9a, 0x71, 0x89, 0xb5, 0x6e, - 0x5b, 0x9e, 0xb6, 0x0d, 0x0d, 0x9d, 0x8b, 0x17, 0xbc, 0x1f, 0x41, 0x53, 0x3c, 0xb1, 0x30, 0x12, - 0x8f, 0x90, 0x94, 0x87, 0xa3, 0xaa, 0x6c, 0xbd, 0xe1, 0xa8, 0x45, 0xed, 0xc7, 0xd0, 0xe1, 0xc7, - 0x78, 0x42, 0xaa, 0x1c, 0xda, 0x47, 0x20, 0x5f, 0x41, 0x17, 0x09, 0x4f, 0x36, 0x6b, 0x78, 0x6a, - 0x51, 0xbb, 0x00, 0xe7, 0x72, 0x85, 0x8b, 0x71, 0xbb, 0xd0, 0x8a, 0x2b, 0x2c, 0x5b, 0xde, 0x9c, - 0xb1, 0x1b, 0xb1, 0x92, 0x72, 0x23, 0xb6, 0x18, 0xc5, 0x64, 0x65, 0x79, 0x9e, 0xb0, 0xc8, 0x2b, - 0x0e, 0xa1, 0x2b, 0x45, 0x21, 0xf4, 0x64, 0x22, 0x84, 0xd6, 0x3e, 0x89, 0x66, 0x4f, 0xe4, 0x2f, - 0xef, 0xb3, 0xf4, 0x8a, 0xf7, 0x2d, 0xdd, 0xd6, 0x72, 0xce, 0xe0, 0x38, 0x87, 0xae, 0x30, 0x6b, - 0xd7, 0xa0, 0x91, 0x74, 0x60, 0x8a, 0x5b, 0x2a, 0x65, 0xdc, 0x52, 0x33, 0xe5, 0x91, 0x6e, 0xa6, - 0xe2, 0xcc, 0xcc, 0x8c, 0xa6, 0xa2, 0xcc, 0xf7, 0x12, 0xbe, 0xe9, 0x52, 0x7c, 0x99, 0xf5, 0x2b, - 0x72, 0x4b, 0x0b, 0xc2, 0x47, 0x3f, 0xf2, 0x69, 0x7b, 0x31, 0x44, 0xed, 0x32, 0xd4, 0xf7, 0x8b, - 0x5e, 0x1c, 0x4f, 0xca, 0xdb, 0xe1, 0x77, 0x60, 0xbe, 0x17, 0x10, 0xcf, 0x1c, 0xe0, 0x2d, 0xe6, - 0x40, 0x0e, 0x6d, 0x7e, 0xfb, 0x19, 0x86, 0xd1, 0xd1, 0xc6, 0xbe, 0xb5, 0xff, 0x28, 0xc1, 0xdc, - 0x23, 0x7b, 0x88, 0xfd, 0x63, 0x3f, 0xc0, 0xa3, 0x7d, 0x96, 0xe4, 0x9c, 0x87, 0x1a, 0x1d, 0x97, - 0x1f, 0x98, 0x23, 0x57, 0xde, 0x90, 0x44, 0x04, 0x6a, 0x2e, 0x9f, 0x8b, 0x96, 0x80, 0x88, 0x9a, - 0x60, 0x66, 0x7a, 0xa5, 0x49, 0x9f, 0x20, 0xa1, 0x77, 0x01, 0x42, 0x1f, 0x5b, 0xe2, 0x4e, 0xa4, - 0x92, 0x3a, 0x95, 0xf7, 0xd5, 0x7b, 0x3d, 0xca, 0xc7, 0xaf, 0x8f, 0xdf, 0x83, 0xba, 0xed, 0x10, - 0x0b, 0xb3, 0x7b, 0x3d, 0x4b, 0x80, 0x25, 0xf9, 0xad, 0x80, 0x33, 0xee, 0xfb, 0xd8, 0xd2, 0x7e, - 0x5b, 0x9c, 0x42, 0x72, 0xf2, 0x84, 0xcd, 0x37, 0x61, 0x9e, 0xfb, 0x96, 0xc3, 0x68, 0xd0, 0x72, - 0xcd, 0xc5, 0x69, 0x46, 0x6a, 0x42, 0xf4, 0x96, 0x2d, 0x02, 0x06, 0xd9, 0x42, 0xbb, 0x07, 0x67, - 0x13, 0xb9, 0xc5, 0x29, 0xa2, 0x7d, 0xed, 0x71, 0x0a, 0x1a, 0x88, 0x17, 0xa4, 0xc8, 0xc0, 0xe5, - 0x7a, 0x2c, 0xc8, 0xc0, 0x7d, 0x9e, 0x81, 0xfb, 0x9a, 0x0e, 0xcb, 0x09, 0xc4, 0x22, 0xa1, 0xc8, - 0x7b, 0xa9, 0xe8, 0xe7, 0x42, 0x81, 0xb0, 0x54, 0x18, 0xf4, 0x3f, 0x25, 0x58, 0xc8, 0x63, 0x78, - 0x43, 0x6c, 0xec, 0xb3, 0x82, 0x77, 0x3c, 0xb7, 0xc6, 0x6a, 0xf3, 0x6b, 0x41, 0x11, 0x9f, 0x40, - 0x27, 0x6f, 0xf6, 0xb2, 0xa6, 0xa8, 0x9c, 0xc0, 0x14, 0xff, 0x5b, 0x56, 0xd0, 0xde, 0x6e, 0x10, - 0x78, 0xf6, 0x41, 0x48, 0x17, 0xef, 0x37, 0x85, 0xcd, 0x3c, 0x8c, 0x70, 0x07, 0x3e, 0x7f, 0x57, - 0xb3, 0xad, 0xe2, 0x5e, 0x73, 0xb1, 0x87, 0x9d, 0x24, 0xf6, 0xc0, 0x71, 0xdc, 0x1b, 0x63, 0xc5, - 0x7c, 0x67, 0xa1, 0xba, 0x57, 0x25, 0x68, 0x26, 0xed, 0x80, 0x3e, 0x04, 0x30, 0x23, 0xcd, 0xc5, - 0x92, 0x3f, 0x3f, 0x6e, 0x74, 0xba, 0xc2, 0x8f, 0x2e, 0x43, 0xa5, 0xef, 0x86, 0xc2, 0x22, 0xf1, - 0x5d, 0xe0, 0xba, 0x1b, 0x72, 0x07, 0x40, 0x6b, 0x69, 0x3e, 0xc1, 0xef, 0x6f, 0x33, 0x9e, 0xeb, - 0x19, 0x23, 0x73, 0x56, 0xc1, 0x83, 0x1e, 0x40, 0xf3, 0x85, 0x67, 0x07, 0xe6, 0xc1, 0x10, 0x1b, - 0x43, 0xf3, 0x18, 0x7b, 0xc2, 0x73, 0x15, 0x7b, 0x99, 0x86, 0xe4, 0x7f, 0x4a, 0xd9, 0xb5, 0x10, - 0xaa, 0xb2, 0xff, 0xd7, 0x78, 0xe4, 0x27, 0xb0, 0x14, 0x52, 0x36, 0x83, 0xbd, 0xb0, 0x71, 0x4c, - 0x87, 0x18, 0x3e, 0xa6, 0xa7, 0xa4, 0x7c, 0x50, 0x9b, 0xef, 0x2d, 0x17, 0x58, 0xa3, 0x75, 0xe2, - 0xe1, 0x6d, 0xd3, 0x21, 0x3d, 0xde, 0x42, 0x1b, 0x41, 0x5d, 0x19, 0xce, 0x6b, 0x7a, 0x7e, 0x08, - 0xf3, 0xf2, 0x96, 0xd5, 0xc7, 0x81, 0xf0, 0xeb, 0xe3, 0xfa, 0x9c, 0x13, 0xec, 0x3d, 0x1c, 0xf0, - 0xeb, 0xef, 0xfb, 0xb0, 0xac, 0x63, 0xe2, 0x62, 0x27, 0x32, 0xd1, 0x53, 0x32, 0x38, 0x85, 0x33, - 0x3d, 0x0f, 0x9d, 0xbc, 0xf6, 0x7c, 0x17, 0x5f, 0x3f, 0x0f, 0x55, 0xf9, 0xcf, 0x2b, 0x34, 0x03, - 0x95, 0xbd, 0xf5, 0xdd, 0xd6, 0x04, 0xfd, 0xd8, 0xdf, 0xd8, 0x6d, 0x95, 0xae, 0x8f, 0xa0, 0x95, - 0xfe, 0xd7, 0x11, 0x5a, 0x82, 0x33, 0xbb, 0xfa, 0xce, 0x6e, 0xf7, 0x71, 0x77, 0x6f, 0x6b, 0x67, - 0xdb, 0xd8, 0xd5, 0xb7, 0x3e, 0xed, 0xee, 0x6d, 0xb6, 0x26, 0xd0, 0x25, 0xb8, 0xa0, 0x56, 0xfc, - 0xe6, 0x4e, 0x6f, 0xcf, 0xd8, 0xdb, 0x31, 0xd6, 0x77, 0xb6, 0xf7, 0xba, 0x5b, 0xdb, 0x9b, 0x7a, - 0xab, 0x84, 0x2e, 0xc0, 0xb2, 0xca, 0xf2, 0xf1, 0xd6, 0xc6, 0x96, 0xbe, 0xb9, 0x4e, 0xbf, 0xbb, - 0x4f, 0x5b, 0xe5, 0xeb, 0xb7, 0xa1, 0x91, 0xf8, 0xff, 0x10, 0x55, 0x64, 0x77, 0x67, 0xa3, 0x35, - 0x81, 0x1a, 0x50, 0x53, 0xe5, 0x54, 0x61, 0x72, 0x7b, 0x67, 0x63, 0xb3, 0x55, 0xbe, 0x7e, 0x0f, - 0xe6, 0x52, 0xaf, 0xf6, 0xd0, 0x3c, 0x34, 0x7a, 0xdd, 0xed, 0x8d, 0x8f, 0x77, 0x3e, 0x37, 0xf4, - 0xcd, 0xee, 0xc6, 0x17, 0xad, 0x09, 0xb4, 0x00, 0x2d, 0x49, 0xda, 0xde, 0xd9, 0xe3, 0xd4, 0xd2, - 0xf5, 0x2f, 0x53, 0x7b, 0x04, 0xa3, 0xb3, 0x30, 0x1f, 0x75, 0x63, 0xac, 0xeb, 0x9b, 0xdd, 0xbd, - 0x4d, 0xda, 0x7b, 0x82, 0xac, 0xef, 0x6f, 0x6f, 0x6f, 0x6d, 0x3f, 0x6e, 0x95, 0xa8, 0xd4, 0x98, - 0xbc, 0xf9, 0xf9, 0x16, 0x65, 0x2e, 0x27, 0x99, 0xf7, 0xb7, 0x9f, 0x6c, 0xef, 0x7c, 0xb6, 0xdd, - 0xaa, 0xac, 0xfd, 0x63, 0x13, 0x9a, 0x32, 0x68, 0xc2, 0x1e, 0x7b, 0x8b, 0x70, 0x1f, 0x66, 0xe4, - 0xdf, 0xf6, 0x62, 0xef, 0x99, 0xfc, 0x8f, 0x61, 0xa7, 0x9d, 0xad, 0x10, 0x71, 0xe9, 0x04, 0xda, - 0x65, 0x71, 0xa2, 0xf2, 0x42, 0xf2, 0x82, 0x1a, 0x9e, 0x65, 0x9e, 0x60, 0x76, 0x56, 0x8a, 0xaa, - 0x23, 0x89, 0x3d, 0x1a, 0x01, 0xaa, 0x4f, 0xee, 0xd1, 0x8a, 0x1a, 0xb7, 0x64, 0x9f, 0xf2, 0x77, - 0x2e, 0x16, 0xd6, 0x47, 0x42, 0xbf, 0x80, 0x56, 0xfa, 0xb1, 0x3d, 0x8a, 0x01, 0xbc, 0x82, 0x87, - 0xfc, 0x9d, 0x4b, 0x63, 0x38, 0x54, 0xd1, 0x99, 0x67, 0xe9, 0xab, 0x63, 0x9e, 0x09, 0xa7, 0x45, - 0x17, 0x3d, 0x24, 0xe6, 0x53, 0x91, 0x7c, 0xd9, 0x88, 0xd4, 0xc7, 0xe0, 0x39, 0x2f, 0x5c, 0x95, - 0xa9, 0xc8, 0x7f, 0x12, 0xa9, 0x4d, 0xa0, 0x4f, 0x61, 0x2e, 0x75, 0x97, 0x8c, 0xe2, 0x56, 0xf9, - 0x37, 0xe3, 0x9d, 0xd5, 0x62, 0x86, 0xa4, 0xdd, 0xd4, 0x9b, 0xe2, 0x84, 0xdd, 0x72, 0xae, 0x9f, - 0x13, 0x76, 0xcb, 0xbd, 0x62, 0x66, 0xcb, 0x2b, 0x71, 0x1f, 0xac, 0x2c, 0xaf, 0xbc, 0xcb, 0xe7, - 0xce, 0x4a, 0x51, 0xb5, 0x3a, 0xfc, 0xd4, 0x5d, 0xb0, 0x32, 0xfc, 0xfc, 0x2b, 0xe6, 0xce, 0x6a, - 0x31, 0x43, 0xda, 0x56, 0xf1, 0xc5, 0x54, 0xca, 0x56, 0x99, 0x7b, 0xd0, 0x94, 0xad, 0xb2, 0x37, - 0x5a, 0xc2, 0x56, 0xa9, 0x7b, 0xa4, 0x8b, 0xc5, 0xb0, 0x79, 0xc6, 0x56, 0xf9, 0xb8, 0xba, 0x36, - 0x81, 0xbe, 0x82, 0x76, 0x11, 0x24, 0x8d, 0xe2, 0xa0, 0xe5, 0x35, 0x98, 0x79, 0xe7, 0xda, 0x09, - 0x38, 0xa3, 0x2e, 0x0d, 0x40, 0xd9, 0x23, 0x00, 0x69, 0xca, 0xcc, 0x16, 0x9c, 0x2f, 0x9d, 0xcb, - 0x63, 0x79, 0xa2, 0x0e, 0xba, 0x50, 0x95, 0x00, 0x37, 0x8a, 0x3d, 0x56, 0x0a, 0x55, 0xef, 0x2c, - 0xe7, 0xd4, 0x44, 0x22, 0xde, 0x83, 0x49, 0x4a, 0x45, 0x0b, 0x09, 0x26, 0xd9, 0xf4, 0x6c, 0x8a, - 0x1a, 0x35, 0xfb, 0x00, 0xa6, 0x39, 0x5a, 0x8b, 0xe2, 0xdc, 0x34, 0x01, 0x25, 0x77, 0x96, 0x32, - 0xf4, 0xa8, 0xf1, 0x27, 0xfc, 0xef, 0xc9, 0x02, 0x76, 0x45, 0xe7, 0x12, 0xff, 0x4d, 0x4b, 0x82, - 0xbb, 0x9d, 0xf3, 0xf9, 0x95, 0xea, 0x1a, 0x4c, 0x05, 0x5c, 0x2b, 0x45, 0x11, 0x71, 0x66, 0x0d, - 0xe6, 0x47, 0xd8, 0xdc, 0x70, 0xd9, 0x08, 0x5c, 0x31, 0x5c, 0x61, 0x72, 0xa3, 0x18, 0xae, 0x38, - 0x84, 0xd7, 0x26, 0xd0, 0x01, 0x9c, 0xc9, 0xc1, 0x3e, 0xd0, 0xe5, 0xd4, 0xea, 0xca, 0x83, 0x5d, - 0x3a, 0x6f, 0x8d, 0x67, 0x52, 0x4d, 0x24, 0xf6, 0xcf, 0x62, 0x06, 0x10, 0x48, 0x9b, 0x28, 0xbd, - 0x5b, 0xd6, 0xfe, 0xa0, 0x02, 0xb3, 0x1c, 0xa1, 0x12, 0x87, 0xe6, 0x63, 0x80, 0x18, 0xd4, 0x45, - 0x9d, 0xc4, 0x30, 0x13, 0xe8, 0x76, 0xe7, 0x5c, 0x6e, 0x9d, 0x6a, 0x7c, 0x05, 0x32, 0x55, 0x8c, - 0x9f, 0x45, 0x7d, 0x15, 0xe3, 0xe7, 0xa0, 0xac, 0xda, 0x04, 0xda, 0x80, 0x5a, 0x04, 0xd2, 0x21, - 0x05, 0xdb, 0x4b, 0x21, 0x8c, 0x9d, 0x4e, 0x5e, 0x95, 0xaa, 0x91, 0x02, 0xbc, 0x29, 0x1a, 0x65, - 0xe1, 0x3c, 0x45, 0xa3, 0x3c, 0xac, 0x2e, 0x1e, 0x1d, 0x4f, 0xee, 0xd3, 0xa3, 0x4b, 0xe0, 0x25, - 0xe9, 0xd1, 0x25, 0xf1, 0x00, 0x6d, 0xe2, 0xe3, 0xf3, 0x3f, 0xff, 0xe5, 0x4a, 0xe9, 0x3f, 0x7f, - 0xb9, 0x32, 0xf1, 0xfb, 0xaf, 0x56, 0x4a, 0x3f, 0x7f, 0xb5, 0x52, 0xfa, 0xf7, 0x57, 0x2b, 0xa5, - 0xff, 0x7a, 0xb5, 0x52, 0xfa, 0xe9, 0x7f, 0xaf, 0x4c, 0x1c, 0x4c, 0xb3, 0xff, 0xeb, 0xbf, 0xfb, - 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x91, 0xf3, 0x99, 0x55, 0x63, 0x41, 0x00, 0x00, + // 4597 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0x4d, 0x6c, 0x1b, 0x49, + 0x76, 0x56, 0x93, 0xfa, 0x21, 0x1f, 0x45, 0x89, 0x2a, 0xcb, 0x16, 0x4d, 0x8f, 0x3d, 0x76, 0x7b, + 0xfc, 0xbb, 0x63, 0x79, 0xac, 0xd9, 0xf5, 0xc4, 0xf6, 0xac, 0x6d, 0x5a, 0x92, 0x6d, 0x66, 0x6d, + 0x4a, 0x69, 0x4a, 0xf3, 0xb3, 0xb3, 0x40, 0x6f, 0x8b, 0x5d, 0xa2, 0x7a, 0x4d, 0x76, 0xf5, 0xf4, + 0x8f, 0x6d, 0xe5, 0x10, 0x2c, 0x10, 0x64, 0x0f, 0x01, 0x02, 0xe4, 0x9c, 0x5b, 0x36, 0x87, 0x1c, + 0x72, 0x0b, 0x10, 0xe4, 0x90, 0x53, 0x82, 0x3d, 0xec, 0x25, 0x40, 0x4e, 0x8b, 0xfc, 0x5c, 0xb2, + 0x13, 0xe4, 0x1a, 0x24, 0xf7, 0x1c, 0x82, 0xfa, 0x6b, 0xf6, 0x2f, 0x7f, 0x3c, 0xde, 0x9d, 0xc9, + 0x49, 0x5d, 0xaf, 0xdf, 0x7b, 0xf5, 0xea, 0xd5, 0xeb, 0x57, 0xaf, 0xbe, 0x2a, 0x0a, 0xca, 0x86, + 0x63, 0xad, 0x3b, 0x2e, 0xf1, 0x09, 0xaa, 0xb9, 0x81, 0xed, 0x5b, 0x03, 0xbc, 0xfe, 0xf2, 0x96, + 0xd1, 0x77, 0x8e, 0x8c, 0x8d, 0xc6, 0x8d, 0x9e, 0xe5, 0x1f, 0x05, 0x07, 0xeb, 0x5d, 0x32, 0xb8, + 0xd9, 0x23, 0x3d, 0x72, 0x93, 0x31, 0x1e, 0x04, 0x87, 0xac, 0xc5, 0x1a, 0xec, 0x89, 0x2b, 0x50, + 0xaf, 0xc3, 0xd2, 0x27, 0xd8, 0xf5, 0x2c, 0x62, 0x6b, 0xf8, 0xcb, 0x00, 0x7b, 0x3e, 0xaa, 0xc3, + 0xc2, 0x4b, 0x4e, 0xa9, 0x2b, 0xe7, 0x95, 0xab, 0x65, 0x4d, 0x36, 0xd5, 0xbf, 0x54, 0x60, 0x39, + 0x64, 0xf6, 0x1c, 0x62, 0x7b, 0x38, 0x9f, 0x1b, 0x5d, 0x80, 0x45, 0x61, 0x9c, 0x6e, 0x1b, 0x03, + 0x5c, 0x2f, 0xb0, 0xd7, 0x15, 0x41, 0x6b, 0x1b, 0x03, 0x8c, 0xae, 0xc0, 0xb2, 0x64, 0x91, 0x4a, + 0x8a, 0x8c, 0x6b, 0x49, 0x90, 0x45, 0x6f, 0x68, 0x1d, 0x4e, 0x48, 0x46, 0xc3, 0xb1, 0x42, 0xe6, + 0x59, 0xc6, 0xbc, 0x22, 0x5e, 0x35, 0x1d, 0x4b, 0xf0, 0xab, 0x5f, 0x40, 0x79, 0xab, 0xdd, 0xd9, + 0x24, 0xf6, 0xa1, 0xd5, 0xa3, 0x26, 0x7a, 0xd8, 0xa5, 0x32, 0x75, 0xe5, 0x7c, 0x91, 0x9a, 0x28, + 0x9a, 0xa8, 0x01, 0x25, 0x0f, 0x1b, 0x6e, 0xf7, 0x08, 0x7b, 0xf5, 0x02, 0x7b, 0x15, 0xb6, 0xa9, + 0x14, 0x71, 0x7c, 0x8b, 0xd8, 0x5e, 0xbd, 0xc8, 0xa5, 0x44, 0x53, 0xfd, 0xb9, 0x02, 0x95, 0x5d, + 0xe2, 0xfa, 0xcf, 0x0d, 0xc7, 0xb1, 0xec, 0x1e, 0xba, 0x0d, 0x25, 0xe6, 0xcb, 0x2e, 0xe9, 0x33, + 0x1f, 0x2c, 0x6d, 0x34, 0xd6, 0x93, 0xd3, 0xb2, 0xbe, 0x2b, 0x38, 0xb4, 0x90, 0x17, 0x5d, 0x82, + 0xa5, 0x2e, 0xb1, 0x7d, 0xc3, 0xb2, 0xb1, 0xab, 0x3b, 0xc4, 0xf5, 0x99, 0x8b, 0xe6, 0xb4, 0x6a, + 0x48, 0xa5, 0xbd, 0xa0, 0x33, 0x50, 0x3e, 0x22, 0x9e, 0xcf, 0x39, 0x8a, 0x8c, 0xa3, 0x44, 0x09, + 0xec, 0xe5, 0x1a, 0x2c, 0xb0, 0x97, 0x96, 0x23, 0x9c, 0x31, 0x4f, 0x9b, 0x2d, 0x47, 0xfd, 0x95, + 0x02, 0x73, 0xcf, 0x49, 0x60, 0xfb, 0x89, 0x6e, 0x0c, 0xff, 0x48, 0x4c, 0x54, 0xa4, 0x1b, 0xc3, + 0x3f, 0x1a, 0x76, 0x43, 0x39, 0xf8, 0x5c, 0xf1, 0x6e, 0xe8, 0xcb, 0x06, 0x94, 0x5c, 0x6c, 0x98, + 0xc4, 0xee, 0x1f, 0x33, 0x13, 0x4a, 0x5a, 0xd8, 0xa6, 0x93, 0xe8, 0xe1, 0xbe, 0x65, 0x07, 0xaf, + 0x75, 0x17, 0xf7, 0x8d, 0x03, 0xdc, 0x67, 0xa6, 0x94, 0xb4, 0x25, 0x41, 0xd6, 0x38, 0x15, 0x6d, + 0x41, 0xc5, 0x71, 0x89, 0x63, 0xf4, 0x0c, 0xea, 0xc7, 0xfa, 0x1c, 0x73, 0x95, 0x9a, 0x76, 0x15, + 0x33, 0x7b, 0x77, 0xc8, 0xa9, 0x45, 0xc5, 0xd4, 0xbf, 0x56, 0x60, 0x99, 0x06, 0x8f, 0xe7, 0x18, + 0x5d, 0xbc, 0xc3, 0xa6, 0x04, 0xdd, 0x81, 0x05, 0x1b, 0xfb, 0xaf, 0x88, 0xfb, 0x42, 0x4c, 0xc0, + 0xbb, 0x69, 0xad, 0xa1, 0xcc, 0x73, 0x62, 0x62, 0x4d, 0xf2, 0xa3, 0x5b, 0x50, 0x74, 0x2c, 0x93, + 0x0d, 0x78, 0x02, 0x31, 0xca, 0x4b, 0x45, 0x2c, 0xa7, 0xcb, 0xfc, 0x30, 0x89, 0x88, 0xe5, 0x74, + 0x55, 0x15, 0xa0, 0x65, 0xfb, 0xb7, 0xbf, 0xfb, 0x89, 0xd1, 0x0f, 0x30, 0x5a, 0x85, 0xb9, 0x97, + 0xf4, 0x81, 0x19, 0x5b, 0xd4, 0x78, 0x43, 0xfd, 0xf3, 0x22, 0x9c, 0x79, 0x46, 0xfd, 0xd5, 0x31, + 0x6c, 0xf3, 0x80, 0xbc, 0xee, 0xe0, 0x6e, 0xe0, 0x5a, 0xfe, 0xf1, 0x26, 0xb1, 0x7d, 0xfc, 0xda, + 0x47, 0x6d, 0x58, 0xb1, 0xa5, 0x66, 0x5d, 0x86, 0x26, 0xd5, 0x50, 0xd9, 0xb8, 0x30, 0xc2, 0x08, + 0xee, 0x22, 0xad, 0x66, 0xc7, 0x09, 0x1e, 0x7a, 0x3a, 0x9c, 0x37, 0xa9, 0xad, 0xc0, 0xb4, 0x65, + 0x0c, 0xa9, 0xb3, 0xcd, 0x2c, 0x13, 0xba, 0xe4, 0xc4, 0x4a, 0x4d, 0x1f, 0x03, 0xfd, 0xaa, 0x75, + 0xc3, 0xd3, 0x03, 0x0f, 0xbb, 0xcc, 0x31, 0x95, 0x8d, 0x77, 0xd2, 0x5a, 0x86, 0x2e, 0xd0, 0xca, + 0x6e, 0x60, 0x37, 0xbd, 0x7d, 0x0f, 0xbb, 0x2c, 0x09, 0x88, 0x58, 0xd2, 0x5d, 0x42, 0xfc, 0x43, + 0x4f, 0xc6, 0x8f, 0x24, 0x6b, 0x8c, 0x8a, 0x6e, 0xc2, 0x09, 0x2f, 0x70, 0x9c, 0x3e, 0x1e, 0x60, + 0xdb, 0x37, 0xfa, 0x7a, 0xcf, 0x25, 0x81, 0xe3, 0xd5, 0xe7, 0xce, 0x17, 0xaf, 0x16, 0x35, 0x14, + 0x7d, 0xf5, 0x84, 0xbd, 0x41, 0xe7, 0x00, 0x1c, 0xd7, 0x7a, 0x69, 0xf5, 0x71, 0x0f, 0x9b, 0xf5, + 0x79, 0xa6, 0x34, 0x42, 0x41, 0x1f, 0xc0, 0xaa, 0x87, 0xbb, 0x5d, 0x32, 0x70, 0x74, 0xc7, 0x25, + 0x87, 0x56, 0x1f, 0xf3, 0xe8, 0x5f, 0x60, 0xd1, 0x8f, 0xc4, 0xbb, 0x5d, 0xfe, 0x8a, 0x7e, 0x07, + 0xea, 0xcf, 0x0b, 0x70, 0x92, 0x79, 0x62, 0x97, 0x98, 0x62, 0x9a, 0x44, 0x92, 0xb9, 0x08, 0xd5, + 0x2e, 0x33, 0x48, 0x77, 0x0c, 0x17, 0xdb, 0xbe, 0xf8, 0xc8, 0x16, 0x39, 0x71, 0x97, 0xd1, 0xd0, + 0x67, 0x50, 0xf3, 0xc4, 0xac, 0xea, 0x5d, 0x3e, 0xad, 0xc2, 0xe7, 0x37, 0xd2, 0xde, 0x1a, 0x11, + 0x0b, 0xda, 0xb2, 0x97, 0x0a, 0x8e, 0x05, 0xef, 0xd8, 0xeb, 0xfa, 0x7d, 0x9e, 0xad, 0x2a, 0x1b, + 0xdf, 0xcd, 0x51, 0x98, 0x34, 0x7c, 0xbd, 0xc3, 0xc5, 0xb6, 0x6d, 0xdf, 0x3d, 0xd6, 0xa4, 0x92, + 0xc6, 0x5d, 0x58, 0x8c, 0xbe, 0x40, 0x35, 0x28, 0xbe, 0xc0, 0xc7, 0x62, 0x50, 0xf4, 0x71, 0x18, + 0xc4, 0x3c, 0x57, 0xf0, 0xc6, 0xdd, 0xc2, 0xef, 0x28, 0xaa, 0x0b, 0x68, 0xd8, 0xcb, 0x73, 0xec, + 0x1b, 0xa6, 0xe1, 0x1b, 0x08, 0xc1, 0x2c, 0x5b, 0x06, 0xb8, 0x0a, 0xf6, 0x4c, 0xb5, 0x06, 0xe2, + 0xe3, 0x2b, 0x6b, 0xf4, 0x11, 0xbd, 0x03, 0xe5, 0x30, 0x50, 0xc5, 0x5a, 0x30, 0x24, 0xd0, 0x9c, + 0x6c, 0xf8, 0x3e, 0x1e, 0x38, 0x3e, 0x0b, 0x91, 0xaa, 0x26, 0x9b, 0xea, 0x7f, 0xcd, 0x42, 0x2d, + 0x35, 0x27, 0x0f, 0xa1, 0x34, 0x10, 0xdd, 0x8b, 0x0f, 0xe5, 0xbd, 0x8c, 0xc4, 0x9c, 0x32, 0x55, + 0x0b, 0xa5, 0x68, 0xde, 0xa3, 0x39, 0x30, 0xb2, 0x7e, 0x85, 0x6d, 0x3a, 0xe3, 0x7d, 0xd2, 0xd3, + 0x4d, 0xcb, 0xc5, 0x5d, 0x9f, 0xb8, 0xc7, 0xc2, 0xdc, 0xc5, 0x3e, 0xe9, 0x6d, 0x49, 0x1a, 0xba, + 0x0b, 0x60, 0xda, 0x1e, 0x9d, 0xec, 0x43, 0xab, 0xc7, 0x8c, 0xae, 0x6c, 0x9c, 0x49, 0x1b, 0x11, + 0x2e, 0x56, 0x5a, 0xd9, 0xb4, 0x3d, 0x61, 0xfe, 0x23, 0xa8, 0xd2, 0x9c, 0xaf, 0x0f, 0xf8, 0x3a, + 0xc3, 0x23, 0xbd, 0xb2, 0x71, 0x36, 0x6b, 0x0c, 0xe1, 0x6a, 0xa4, 0x2d, 0x3a, 0xc3, 0x86, 0x87, + 0x1e, 0xc3, 0x3c, 0x4b, 0xbe, 0x5e, 0x7d, 0x9e, 0x09, 0xaf, 0x8f, 0x72, 0x80, 0x88, 0x88, 0x67, + 0x4c, 0x80, 0x07, 0x84, 0x90, 0x46, 0xfb, 0x50, 0x31, 0x6c, 0x9b, 0xf8, 0x06, 0x4f, 0x14, 0x0b, + 0x4c, 0xd9, 0x87, 0x13, 0x28, 0x6b, 0x0e, 0xa5, 0xb8, 0xc6, 0xa8, 0x1e, 0xf4, 0x7d, 0x98, 0x63, + 0x99, 0xa4, 0x5e, 0x62, 0x9e, 0xb9, 0x32, 0x61, 0xd0, 0x6a, 0x5c, 0xaa, 0x71, 0x07, 0x2a, 0x11, + 0x63, 0xa7, 0x09, 0xd2, 0xc6, 0x7d, 0xa8, 0x25, 0x4d, 0x9b, 0x2a, 0xc8, 0x35, 0x58, 0xd5, 0x02, + 0x7b, 0x68, 0x98, 0xac, 0x9e, 0xee, 0xc2, 0xbc, 0x98, 0x6c, 0x1e, 0x71, 0xea, 0x78, 0x1f, 0x69, + 0x42, 0x42, 0xfd, 0x3e, 0x9c, 0x4c, 0xe8, 0x14, 0x45, 0xd6, 0x7b, 0xb0, 0xe4, 0x10, 0x53, 0xf7, + 0x38, 0x59, 0xb7, 0x4c, 0x99, 0x5d, 0x9c, 0x90, 0xb7, 0x65, 0x52, 0xf1, 0x8e, 0x4f, 0x9c, 0xb4, + 0x4d, 0x93, 0x89, 0xd7, 0xe1, 0x54, 0x52, 0x9c, 0x77, 0xaf, 0x3e, 0x80, 0x35, 0x0d, 0x0f, 0xc8, + 0x4b, 0xfc, 0xa6, 0xaa, 0x1b, 0x50, 0x4f, 0x2b, 0x10, 0xca, 0x3f, 0x87, 0xb5, 0x21, 0xb5, 0xe3, + 0x1b, 0x7e, 0xe0, 0x4d, 0xa5, 0x5c, 0x54, 0xa0, 0x07, 0xc4, 0xe3, 0xb3, 0x54, 0xd2, 0x64, 0x53, + 0xbd, 0x16, 0x55, 0xdd, 0xe6, 0x0b, 0x3e, 0xef, 0x01, 0x2d, 0x41, 0xc1, 0x72, 0x84, 0xba, 0x82, + 0xe5, 0xa8, 0x4f, 0xa1, 0x1c, 0xae, 0x98, 0xe8, 0xde, 0xb0, 0xf4, 0x2b, 0x4c, 0xba, 0xbe, 0x86, + 0xd5, 0xe1, 0x5e, 0x6a, 0x85, 0x10, 0x5d, 0xde, 0x03, 0x08, 0x33, 0x99, 0x5c, 0xb8, 0xcf, 0x8c, + 0x50, 0xac, 0x45, 0xd8, 0xd5, 0x7f, 0x8d, 0xe5, 0xb7, 0xc8, 0x20, 0xcc, 0x70, 0x10, 0x66, 0x2c, + 0xdf, 0x15, 0xde, 0x28, 0xdf, 0x7d, 0x04, 0x73, 0x9e, 0x6f, 0xf8, 0x58, 0x14, 0x37, 0x17, 0x46, + 0x89, 0x53, 0x23, 0xb0, 0xc6, 0xf9, 0xd1, 0x59, 0x80, 0xae, 0x8b, 0x0d, 0x1f, 0x9b, 0xba, 0xc1, + 0x93, 0x73, 0x51, 0x2b, 0x0b, 0x4a, 0xd3, 0x47, 0x9b, 0xc3, 0x02, 0x6d, 0x8e, 0x19, 0x76, 0x6d, + 0x94, 0xe6, 0xd8, 0x54, 0x0d, 0x4b, 0xb5, 0x30, 0x59, 0xcc, 0x4f, 0x98, 0x2c, 0x84, 0x02, 0x2e, + 0x15, 0x49, 0x85, 0x0b, 0xe3, 0x53, 0x21, 0x17, 0x9d, 0x24, 0x15, 0x96, 0xc6, 0xa7, 0x42, 0xa1, + 0x6c, 0x64, 0x2a, 0xfc, 0x26, 0x73, 0xd9, 0xbf, 0x28, 0x50, 0x4f, 0x7f, 0x83, 0x22, 0xf7, 0xdc, + 0x85, 0x79, 0x8f, 0x51, 0x26, 0x49, 0x68, 0x42, 0x56, 0x48, 0xa0, 0xa7, 0x30, 0x6b, 0xd9, 0x87, + 0x84, 0xed, 0xad, 0x32, 0x4b, 0x92, 0xbc, 0x5e, 0xd7, 0x5b, 0xf6, 0x21, 0xe1, 0x4e, 0x62, 0x1a, + 0x1a, 0x1f, 0x41, 0x39, 0x24, 0x4d, 0x35, 0xb6, 0x1d, 0x58, 0x4d, 0x84, 0x2c, 0xaf, 0xc1, 0xc3, + 0x48, 0x57, 0xa6, 0x8b, 0x74, 0xf5, 0xa7, 0x85, 0xe8, 0x97, 0xf8, 0xd8, 0xea, 0xfb, 0xd8, 0x4d, + 0x7d, 0x89, 0x1f, 0x4b, 0xed, 0xfc, 0x33, 0xbc, 0x3c, 0x56, 0x3b, 0xaf, 0x8a, 0xc5, 0xc7, 0xf4, + 0x23, 0x58, 0x62, 0xb1, 0xa6, 0x7b, 0xb8, 0xcf, 0xea, 0x08, 0x51, 0xd3, 0x7d, 0x6f, 0x94, 0x1a, + 0x6e, 0x09, 0x8f, 0xd8, 0x8e, 0x90, 0xe3, 0x1e, 0xac, 0xf6, 0xa3, 0xb4, 0xc6, 0x43, 0x40, 0x69, + 0xa6, 0xa9, 0x7c, 0xda, 0xa1, 0x29, 0x8e, 0x6e, 0x40, 0x33, 0x16, 0xbf, 0x43, 0x66, 0xc6, 0x24, + 0xb1, 0xc2, 0x0d, 0xd6, 0x84, 0x84, 0xfa, 0x8b, 0x22, 0xc0, 0xf0, 0xe5, 0xff, 0xa3, 0xdc, 0xf6, + 0x30, 0xcc, 0x2b, 0xbc, 0x3e, 0xbb, 0x3a, 0x4a, 0x71, 0x66, 0x46, 0xd9, 0x89, 0x67, 0x14, 0x5e, + 0xa9, 0xdd, 0x18, 0xa9, 0xe6, 0x5b, 0x9b, 0x4b, 0x9e, 0xc1, 0xa9, 0x64, 0x6c, 0x88, 0x44, 0xb2, + 0x01, 0x73, 0x96, 0x8f, 0x07, 0x1c, 0x84, 0xc9, 0xdc, 0x1f, 0x46, 0x84, 0x38, 0xab, 0x7a, 0x01, + 0xca, 0xad, 0x81, 0xd1, 0xc3, 0x1d, 0x07, 0x77, 0x69, 0xa7, 0x16, 0x6d, 0x08, 0x43, 0x78, 0x43, + 0xdd, 0x80, 0xd2, 0x0f, 0xf0, 0x31, 0xff, 0xa8, 0x27, 0x34, 0x54, 0xfd, 0x93, 0x02, 0xac, 0xb1, + 0xb5, 0x62, 0x53, 0x42, 0x20, 0x1a, 0xf6, 0x48, 0xe0, 0x76, 0xb1, 0xc7, 0x66, 0xdb, 0x09, 0x74, + 0x07, 0xbb, 0x16, 0x31, 0xc5, 0x0e, 0xbd, 0xdc, 0x75, 0x82, 0x5d, 0x46, 0x40, 0x67, 0x80, 0x36, + 0xf4, 0x2f, 0x03, 0x22, 0x02, 0xb1, 0xa8, 0x95, 0xba, 0x4e, 0xf0, 0x7b, 0xb4, 0x2d, 0x65, 0xbd, + 0x23, 0xc3, 0xc5, 0x1e, 0x8b, 0x33, 0x2e, 0xdb, 0x61, 0x04, 0x74, 0x0b, 0x4e, 0x0e, 0xf0, 0x80, + 0xb8, 0xc7, 0x7a, 0xdf, 0x1a, 0x58, 0xbe, 0x6e, 0xd9, 0xfa, 0xc1, 0xb1, 0x8f, 0x3d, 0x11, 0x53, + 0x88, 0xbf, 0x7c, 0x46, 0xdf, 0xb5, 0xec, 0x47, 0xf4, 0x0d, 0x52, 0xa1, 0x4a, 0xc8, 0x40, 0xf7, + 0xba, 0xc4, 0xc5, 0xba, 0x61, 0xfe, 0x84, 0x2d, 0x9f, 0x45, 0xad, 0x42, 0xc8, 0xa0, 0x43, 0x69, + 0x4d, 0xf3, 0x27, 0xe8, 0x5d, 0xa8, 0x74, 0x9d, 0xc0, 0xc3, 0xbe, 0x4e, 0xff, 0xb0, 0xd5, 0xb1, + 0xac, 0x01, 0x27, 0x6d, 0x3a, 0x81, 0x17, 0x61, 0x18, 0x50, 0xff, 0x2f, 0x44, 0x19, 0x9e, 0x53, + 0x37, 0x1b, 0x50, 0x8d, 0xed, 0xf0, 0xe9, 0x66, 0x8d, 0x6d, 0xe5, 0xc5, 0x66, 0x8d, 0x3e, 0x53, + 0x9a, 0x4b, 0xfa, 0xd2, 0x93, 0xec, 0x99, 0xd2, 0xfc, 0x63, 0x47, 0xee, 0xd4, 0xd8, 0x33, 0x75, + 0x79, 0x1f, 0xbf, 0x14, 0x28, 0x50, 0x59, 0xe3, 0x0d, 0xd5, 0x04, 0xd8, 0x34, 0x1c, 0xe3, 0xc0, + 0xea, 0x5b, 0xfe, 0x31, 0xba, 0x06, 0x35, 0xc3, 0x34, 0xf5, 0xae, 0xa4, 0x58, 0x58, 0x62, 0x73, + 0xcb, 0x86, 0x69, 0x6e, 0x46, 0xc8, 0xe8, 0x3b, 0xb0, 0x62, 0xba, 0xc4, 0x89, 0xf3, 0x72, 0xb0, + 0xae, 0x46, 0x5f, 0x44, 0x99, 0x69, 0x99, 0x74, 0x36, 0x3e, 0xb1, 0x49, 0x14, 0xe5, 0x21, 0x2c, + 0x26, 0x7a, 0xcd, 0x01, 0x2b, 0x86, 0xd6, 0x6a, 0x31, 0x89, 0x04, 0xaa, 0x50, 0x48, 0xa1, 0x0a, + 0x99, 0x38, 0x4d, 0xf1, 0xad, 0xe2, 0x34, 0xb3, 0x6f, 0x05, 0xa7, 0x99, 0x9b, 0x0e, 0xa7, 0xb9, + 0xcc, 0xc0, 0x5a, 0x29, 0xcd, 0xb6, 0xc4, 0x3c, 0xd4, 0xaa, 0x21, 0x8f, 0x2d, 0x41, 0xdd, 0x04, + 0x9e, 0xb3, 0x30, 0x0d, 0x9e, 0x53, 0xca, 0xc5, 0x73, 0x68, 0xd4, 0x38, 0x8e, 0xe1, 0x0e, 0x88, + 0x2b, 0x01, 0x9b, 0x7a, 0x99, 0x99, 0xb0, 0x2c, 0xe9, 0x02, 0xac, 0xc9, 0x85, 0x76, 0x20, 0x0f, + 0xda, 0x41, 0xe7, 0x61, 0xd1, 0x26, 0xba, 0x8d, 0x5f, 0xe9, 0x74, 0x2e, 0xbd, 0x7a, 0x85, 0x4f, + 0xac, 0x4d, 0xda, 0xf8, 0xd5, 0x2e, 0xa5, 0xa8, 0x7f, 0xa7, 0xc0, 0x6a, 0x3c, 0xb8, 0xc4, 0x46, + 0xfd, 0x09, 0x94, 0x5d, 0x99, 0x3f, 0x44, 0x40, 0x5d, 0xcb, 0x29, 0x4e, 0xd3, 0x09, 0x47, 0x1b, + 0xca, 0xa2, 0x1f, 0xe6, 0xe2, 0x43, 0x37, 0xc7, 0xe9, 0x1b, 0x87, 0x10, 0xa9, 0x5d, 0x38, 0xf5, + 0xa9, 0x65, 0x9b, 0xe4, 0x95, 0x97, 0x34, 0xbf, 0x95, 0x36, 0xff, 0x3b, 0xe9, 0xee, 0x92, 0xc2, + 0x59, 0x03, 0x50, 0xff, 0x4a, 0x81, 0xd3, 0xb9, 0x8c, 0x89, 0xf4, 0xa8, 0x24, 0xd3, 0xa3, 0x48, + 0xad, 0x5d, 0x12, 0xd8, 0x7e, 0x24, 0xb5, 0x6e, 0x32, 0x14, 0x9b, 0xe7, 0x30, 0x7d, 0x60, 0xbc, + 0xb6, 0x06, 0xc1, 0x40, 0xe4, 0x56, 0xaa, 0xee, 0x39, 0xa7, 0xbc, 0x41, 0x72, 0x55, 0x9b, 0xb0, + 0x12, 0x5a, 0x39, 0x12, 0xa7, 0x8a, 0xe0, 0x4e, 0x85, 0x38, 0xee, 0x64, 0xc3, 0xfc, 0x16, 0x7e, + 0x69, 0x75, 0xf1, 0x5b, 0x81, 0xd9, 0xcf, 0x43, 0xc5, 0xc1, 0xee, 0xc0, 0xf2, 0xbc, 0x30, 0x69, + 0x94, 0xb5, 0x28, 0x49, 0xfd, 0xcf, 0x79, 0x58, 0x4e, 0xce, 0xdf, 0x83, 0x14, 0xcc, 0x75, 0x31, + 0x23, 0x9d, 0x25, 0x07, 0x1a, 0xa9, 0x8c, 0x6e, 0xc9, 0x85, 0xb5, 0x90, 0xb7, 0x29, 0x0d, 0x17, + 0x61, 0xb1, 0xea, 0x52, 0x8f, 0x74, 0xc9, 0x60, 0x60, 0xd8, 0xa6, 0x3c, 0x1d, 0x11, 0x4d, 0xea, + 0x3f, 0xc3, 0xed, 0x51, 0xb7, 0x53, 0x32, 0x7b, 0xa6, 0x93, 0x47, 0x77, 0x70, 0x96, 0xcd, 0xe0, + 0x32, 0x96, 0x78, 0xca, 0x1a, 0x08, 0xd2, 0x96, 0xe5, 0xa2, 0x75, 0x98, 0xc5, 0xf6, 0x4b, 0x59, + 0xfa, 0x64, 0x1c, 0x9f, 0xc8, 0x25, 0x5e, 0x63, 0x7c, 0xe8, 0x26, 0xcc, 0x0f, 0x68, 0x58, 0xc8, + 0xbd, 0xdc, 0x5a, 0xce, 0x29, 0x82, 0x26, 0xd8, 0xd0, 0x06, 0x2c, 0x98, 0x6c, 0x9e, 0xe4, 0x86, + 0xad, 0x9e, 0x01, 0xc2, 0x31, 0x06, 0x4d, 0x32, 0xa2, 0xed, 0xb0, 0xb0, 0x2b, 0xe7, 0x55, 0x64, + 0x89, 0xa9, 0xc8, 0xac, 0xee, 0xf6, 0xe2, 0xd5, 0x1d, 0x30, 0x5d, 0x1b, 0xe3, 0x75, 0x8d, 0x46, + 0xce, 0x4e, 0x43, 0xa9, 0x4f, 0x7a, 0x3c, 0x8c, 0x2a, 0xfc, 0xe0, 0xad, 0x4f, 0x7a, 0x2c, 0x8a, + 0x56, 0x69, 0xa1, 0x6b, 0x5a, 0x76, 0x7d, 0x91, 0xa5, 0x30, 0xde, 0xa0, 0x1f, 0x1f, 0x7b, 0xd0, + 0x89, 0xdd, 0xc5, 0xf5, 0x2a, 0x7b, 0x55, 0x66, 0x94, 0x1d, 0xbb, 0xcb, 0x4a, 0x27, 0xdf, 0x3f, + 0xae, 0x2f, 0x31, 0x3a, 0x7d, 0xa4, 0x7b, 0x18, 0xbe, 0xdd, 0x5e, 0xce, 0xdb, 0xc3, 0x64, 0x25, + 0x43, 0xb9, 0xdb, 0x7e, 0x04, 0x0b, 0xaf, 0x78, 0x22, 0xa8, 0xd7, 0x98, 0xfc, 0xd5, 0xf1, 0x29, + 0x45, 0x68, 0x90, 0x82, 0xdf, 0x64, 0x19, 0xfb, 0x0b, 0x05, 0x4e, 0x6d, 0xb2, 0x12, 0x3f, 0x92, + 0xc7, 0xa6, 0x41, 0xa5, 0xee, 0x84, 0x38, 0x60, 0x2e, 0x84, 0x94, 0x1c, 0xb7, 0x10, 0x40, 0x2d, + 0x58, 0x92, 0xca, 0x85, 0x8a, 0xe2, 0xc4, 0x50, 0x62, 0xd5, 0x8b, 0x36, 0xd5, 0x8f, 0x61, 0x2d, + 0x35, 0x0a, 0x51, 0x8e, 0x5f, 0x80, 0xc5, 0x61, 0xbe, 0x0a, 0x07, 0x51, 0x09, 0x69, 0x2d, 0x53, + 0xbd, 0x0b, 0x27, 0x3b, 0xbe, 0xe1, 0xfa, 0x29, 0x17, 0x4c, 0x20, 0xcb, 0xd0, 0xc4, 0xb8, 0xac, + 0x00, 0xfc, 0x3a, 0xb0, 0xda, 0xf1, 0x89, 0xf3, 0x06, 0x4a, 0x69, 0xd6, 0xa1, 0xe3, 0x27, 0x81, + 0x5c, 0x1f, 0x64, 0x53, 0x5d, 0xe3, 0xd8, 0x67, 0xba, 0xb7, 0x7b, 0x70, 0x8a, 0x43, 0x8f, 0x6f, + 0x32, 0x88, 0xd3, 0x12, 0xf8, 0x4c, 0xeb, 0x7d, 0x0e, 0x27, 0x86, 0x6b, 0xef, 0x10, 0x56, 0xb8, + 0x1d, 0x87, 0x15, 0xce, 0x8f, 0x98, 0xf5, 0x18, 0xaa, 0xf0, 0x17, 0x85, 0x48, 0x5e, 0xcf, 0x01, + 0x15, 0xee, 0xc5, 0x41, 0x85, 0x4b, 0xe3, 0x74, 0xc7, 0x30, 0x85, 0x74, 0xd4, 0x16, 0x33, 0xa2, + 0xf6, 0x8b, 0x14, 0xf2, 0x30, 0x9b, 0x07, 0xdd, 0x24, 0xac, 0xfd, 0xad, 0x00, 0x0f, 0x1a, 0x07, + 0x1e, 0xc2, 0xae, 0x43, 0xa4, 0xf8, 0x4e, 0x02, 0x78, 0xb8, 0x30, 0xd6, 0xde, 0x10, 0x77, 0xf8, + 0x9b, 0x59, 0x28, 0x87, 0xef, 0x52, 0x3e, 0x4f, 0xbb, 0xad, 0x90, 0xe1, 0xb6, 0xe8, 0x0a, 0x5c, + 0xfc, 0x5a, 0x2b, 0xf0, 0xec, 0xc4, 0x2b, 0xf0, 0x19, 0x28, 0xb3, 0x07, 0xdd, 0xc5, 0x87, 0x62, + 0x45, 0x2d, 0x31, 0x82, 0x86, 0x0f, 0x87, 0x61, 0x38, 0x3f, 0x55, 0x18, 0x26, 0xa0, 0x8e, 0x85, + 0x24, 0xd4, 0xf1, 0x20, 0x5c, 0x11, 0xf9, 0x22, 0x7a, 0x65, 0x84, 0xde, 0xcc, 0xb5, 0xb0, 0x1d, + 0x5f, 0x0b, 0xf9, 0xba, 0xfa, 0xfe, 0x28, 0x2d, 0xdf, 0x5a, 0xa0, 0x63, 0x9f, 0x03, 0x1d, 0xd1, + 0x58, 0x14, 0x99, 0xf5, 0x1e, 0x40, 0x98, 0x44, 0x24, 0xda, 0x71, 0x66, 0xc4, 0x18, 0xb5, 0x08, + 0x3b, 0x55, 0x1b, 0x9b, 0x9a, 0xe1, 0x69, 0xc8, 0x64, 0xf9, 0x31, 0xe7, 0x28, 0xe4, 0x7f, 0xe7, + 0x22, 0xf9, 0x25, 0xe7, 0xf8, 0xe0, 0x41, 0x0a, 0x62, 0x9b, 0x32, 0x8a, 0x6f, 0xc7, 0x11, 0xb6, + 0x37, 0x8c, 0xba, 0x14, 0xc0, 0xc6, 0x2a, 0x17, 0xc3, 0x15, 0xaf, 0x39, 0x00, 0x52, 0x16, 0x94, + 0x26, 0xdb, 0x19, 0x1c, 0x5a, 0xb6, 0xe5, 0x1d, 0xf1, 0xf7, 0xf3, 0x7c, 0x67, 0x20, 0x49, 0x4d, + 0x76, 0x81, 0x06, 0xbf, 0xb6, 0x7c, 0xbd, 0x4b, 0x4c, 0xcc, 0x62, 0x7a, 0x4e, 0x2b, 0x51, 0xc2, + 0x26, 0x31, 0xf1, 0xf0, 0xcb, 0x2b, 0xbd, 0xd9, 0x97, 0x57, 0x4e, 0x7c, 0x79, 0xa7, 0x60, 0xde, + 0xc5, 0x86, 0x47, 0x6c, 0xb1, 0xd5, 0x14, 0x2d, 0x3a, 0x35, 0x03, 0xec, 0x79, 0xb4, 0x27, 0x51, + 0xae, 0x89, 0x66, 0xa4, 0xcc, 0x5c, 0x1c, 0x5b, 0x66, 0x8e, 0x38, 0x96, 0x48, 0x94, 0x99, 0xd5, + 0xb1, 0x65, 0xe6, 0x24, 0xa7, 0x12, 0x91, 0x42, 0x7b, 0x69, 0xb2, 0x42, 0x3b, 0x5a, 0x97, 0x2e, + 0xc7, 0xea, 0xd2, 0x6f, 0xf2, 0x63, 0xfd, 0x95, 0x02, 0x6b, 0xa9, 0xcf, 0x4a, 0x7c, 0xae, 0x77, + 0x12, 0x07, 0x1c, 0x17, 0xc6, 0xfa, 0x2c, 0x3c, 0xdf, 0x78, 0x12, 0x3b, 0xdf, 0xf8, 0x70, 0xbc, + 0xe0, 0x5b, 0x3f, 0xde, 0xf8, 0x23, 0x05, 0xde, 0xdd, 0x77, 0xcc, 0x44, 0x85, 0x27, 0x36, 0xe6, + 0x93, 0x27, 0x8e, 0x07, 0xb2, 0xd6, 0x2f, 0x4c, 0x8b, 0x5e, 0x70, 0x39, 0x55, 0x85, 0xf3, 0xf9, + 0x66, 0x88, 0x92, 0xe9, 0xc7, 0xb0, 0xbc, 0xfd, 0x1a, 0x77, 0x3b, 0xc7, 0x76, 0x77, 0x0a, 0xd3, + 0x6a, 0x50, 0xec, 0x0e, 0x4c, 0x81, 0xf8, 0xd1, 0xc7, 0x68, 0x15, 0x58, 0x8c, 0x57, 0x81, 0x3a, + 0xd4, 0x86, 0x3d, 0x88, 0xe9, 0x3d, 0x45, 0xa7, 0xd7, 0xa4, 0xcc, 0x54, 0xf9, 0xa2, 0x26, 0x5a, + 0x82, 0x8e, 0x5d, 0x97, 0x8d, 0x99, 0xd3, 0xb1, 0xeb, 0xc6, 0xb3, 0x45, 0x31, 0x9e, 0x2d, 0xd4, + 0x3f, 0x53, 0xa0, 0x42, 0x7b, 0xf8, 0x5a, 0xf6, 0x8b, 0xad, 0x56, 0x71, 0xb8, 0xd5, 0x0a, 0x77, + 0x6c, 0xb3, 0xd1, 0x1d, 0xdb, 0xd0, 0xf2, 0x39, 0x46, 0x4e, 0x5b, 0x3e, 0x1f, 0xd2, 0xb1, 0xeb, + 0xaa, 0xe7, 0x61, 0x91, 0xdb, 0x26, 0x46, 0x5e, 0x83, 0x62, 0xe0, 0xf6, 0x65, 0x1c, 0x05, 0x6e, + 0x5f, 0xfd, 0x63, 0x05, 0xaa, 0x4d, 0xdf, 0x37, 0xba, 0x47, 0x53, 0x0c, 0x20, 0x34, 0xae, 0x10, + 0x35, 0x2e, 0x3d, 0x88, 0xa1, 0xb9, 0xb3, 0x39, 0xe6, 0xce, 0xc5, 0xcc, 0x55, 0x61, 0x49, 0xda, + 0x92, 0x6b, 0x70, 0x1b, 0xd0, 0x2e, 0x71, 0xfd, 0xc7, 0xc4, 0x7d, 0x65, 0xb8, 0xe6, 0x74, 0x3b, + 0x30, 0x04, 0xb3, 0xe2, 0x52, 0x65, 0xf1, 0xea, 0x9c, 0xc6, 0x9e, 0xd5, 0x2b, 0x70, 0x22, 0xa6, + 0x2f, 0xb7, 0xe3, 0x87, 0x50, 0x61, 0x79, 0x5f, 0x94, 0xe2, 0xb7, 0xa2, 0x47, 0x0f, 0x13, 0xad, + 0x12, 0xea, 0xef, 0xc2, 0x0a, 0xad, 0x0f, 0x18, 0x3d, 0xfc, 0x14, 0xbf, 0x97, 0xa8, 0x53, 0xcf, + 0xe6, 0x28, 0x4a, 0xd4, 0xa8, 0x7f, 0xab, 0xc0, 0x1c, 0xa3, 0xa7, 0xd6, 0xec, 0x33, 0x50, 0x76, + 0xb1, 0x43, 0x74, 0xdf, 0xe8, 0x85, 0x57, 0x58, 0x29, 0x61, 0xcf, 0xe8, 0x79, 0xec, 0x06, 0x2e, + 0x7d, 0x69, 0x5a, 0x3d, 0xec, 0xf9, 0xf2, 0x1e, 0x6b, 0x85, 0xd2, 0xb6, 0x38, 0x89, 0x3a, 0xc9, + 0xb3, 0x7e, 0x9f, 0xd7, 0x9d, 0xb3, 0x1a, 0x7b, 0x46, 0xeb, 0xfc, 0x56, 0xd6, 0x24, 0xf0, 0x30, + 0xbb, 0xb3, 0xd5, 0x80, 0x52, 0x02, 0x11, 0x0e, 0xdb, 0xea, 0x36, 0xa0, 0xa8, 0x17, 0x84, 0xbf, + 0x6f, 0xc2, 0x3c, 0x73, 0x92, 0xac, 0x8e, 0xd6, 0x72, 0xdc, 0xa0, 0x09, 0x36, 0xd5, 0x00, 0xc4, + 0x1d, 0x1c, 0xab, 0x88, 0xa6, 0x9f, 0x95, 0x11, 0x15, 0xd2, 0x3f, 0x28, 0x70, 0x22, 0xd6, 0x87, + 0xb0, 0xf5, 0x46, 0xbc, 0x93, 0x5c, 0x53, 0x45, 0x07, 0x9b, 0xb1, 0x25, 0xe1, 0x66, 0x9e, 0x49, + 0xbf, 0xa1, 0xe5, 0xe0, 0x1f, 0x15, 0x80, 0x66, 0xe0, 0x1f, 0x09, 0x64, 0x30, 0x3a, 0x33, 0x4a, + 0x7c, 0x66, 0xe8, 0x3b, 0xc7, 0xf0, 0xbc, 0x57, 0xc4, 0x95, 0x7b, 0x9a, 0xb0, 0xcd, 0x30, 0xbc, + 0xc0, 0x3f, 0x92, 0xc7, 0x3a, 0xf4, 0x19, 0x5d, 0x82, 0x25, 0x7e, 0x6d, 0x5a, 0x37, 0x4c, 0xd3, + 0xc5, 0x9e, 0x27, 0xce, 0x77, 0xaa, 0x9c, 0xda, 0xe4, 0x44, 0xca, 0x66, 0x99, 0xd8, 0xf6, 0x2d, + 0xff, 0x58, 0xf7, 0xc9, 0x0b, 0x6c, 0x8b, 0xbd, 0x49, 0x55, 0x52, 0xf7, 0x28, 0x91, 0xb2, 0xb9, + 0xb8, 0x67, 0x79, 0xbe, 0x2b, 0xd9, 0xe4, 0x59, 0x82, 0xa0, 0x32, 0x36, 0x3a, 0x29, 0xb5, 0xdd, + 0xa0, 0xdf, 0xe7, 0x2e, 0x7e, 0xf3, 0x69, 0xff, 0x40, 0x0c, 0xa8, 0x90, 0x17, 0xd3, 0x43, 0xa7, + 0x89, 0xe1, 0xbe, 0x45, 0x10, 0xe6, 0x03, 0x58, 0x89, 0x8c, 0x41, 0x84, 0x55, 0xac, 0x88, 0x54, + 0xe2, 0x45, 0xa4, 0xfa, 0x04, 0x10, 0xc7, 0x1d, 0xbe, 0xe6, 0xb8, 0xd5, 0x93, 0x70, 0x22, 0xa6, + 0x48, 0xac, 0xc4, 0xd7, 0xa1, 0x2a, 0xee, 0xd8, 0x88, 0x40, 0x39, 0x0d, 0x25, 0x9a, 0x51, 0xbb, + 0x96, 0x29, 0xcf, 0xfc, 0x16, 0x1c, 0x62, 0x6e, 0x5a, 0xa6, 0xab, 0x7e, 0x0a, 0x55, 0x8d, 0xf7, + 0x23, 0x78, 0x1f, 0xc3, 0x92, 0xb8, 0x91, 0xa3, 0xc7, 0x6e, 0xba, 0x65, 0xdd, 0x84, 0x8e, 0x76, + 0xa2, 0x55, 0xed, 0x68, 0x53, 0x35, 0xa1, 0xc1, 0x4b, 0x86, 0x98, 0x7a, 0x39, 0xd8, 0xc7, 0x20, + 0x7f, 0x03, 0x30, 0xb6, 0x97, 0xb8, 0x7c, 0xd5, 0x8d, 0x36, 0xd5, 0xb3, 0x70, 0x26, 0xb3, 0x17, + 0xe1, 0x09, 0x07, 0x6a, 0xc3, 0x17, 0xa6, 0x25, 0x0f, 0x3f, 0xd9, 0xa1, 0xa6, 0x12, 0x39, 0xd4, + 0x3c, 0x15, 0x16, 0x89, 0x05, 0xb9, 0x88, 0xb1, 0x0a, 0x70, 0x58, 0xee, 0x17, 0xf3, 0xca, 0xfd, + 0xd9, 0x58, 0xb9, 0xaf, 0x76, 0x42, 0x7f, 0x8a, 0x6d, 0xd8, 0x23, 0xb6, 0x5d, 0xe4, 0x7d, 0xcb, + 0x84, 0xa8, 0x8e, 0x1a, 0x25, 0x67, 0xd5, 0x22, 0x52, 0xea, 0x35, 0xa8, 0xc6, 0x53, 0x63, 0x24, + 0xcf, 0x29, 0xa9, 0x3c, 0xb7, 0x94, 0x48, 0x71, 0x1f, 0x25, 0x2a, 0xe0, 0x7c, 0x1f, 0x27, 0xea, + 0xdf, 0xfb, 0xb1, 0x64, 0x77, 0x3d, 0xe3, 0x3c, 0xf2, 0x37, 0x94, 0xe7, 0x56, 0xc5, 0x7a, 0xf0, + 0xd8, 0xa3, 0xf2, 0x62, 0xd0, 0xea, 0x45, 0xa8, 0xec, 0xe7, 0x5d, 0xb3, 0x9f, 0x95, 0x67, 0xff, + 0x57, 0x60, 0xa5, 0xe3, 0x13, 0xd7, 0xe8, 0xe1, 0x16, 0xcb, 0x48, 0x87, 0x16, 0x3f, 0xdb, 0x0e, + 0x82, 0x70, 0x61, 0x65, 0xcf, 0xea, 0xff, 0x28, 0xb0, 0xfc, 0xd8, 0xea, 0x63, 0xef, 0xd8, 0xf3, + 0xf1, 0x60, 0x9f, 0xed, 0xd5, 0xde, 0x81, 0x32, 0x1d, 0xa0, 0xe7, 0x1b, 0x03, 0x47, 0x1e, 0x60, + 0x85, 0x04, 0x3a, 0x93, 0x1e, 0x57, 0x2d, 0x81, 0xa2, 0xcc, 0x2d, 0x74, 0xaa, 0x7b, 0xba, 0x9b, + 0x15, 0x24, 0xf4, 0x31, 0x40, 0xe0, 0x61, 0x53, 0x9c, 0x5d, 0x15, 0xf3, 0xaa, 0x84, 0xfd, 0xe8, + 0x19, 0x2d, 0x15, 0xe0, 0xd7, 0x05, 0xee, 0x43, 0xc5, 0xb2, 0x89, 0x89, 0xd9, 0x19, 0xad, 0x29, + 0xd0, 0xa4, 0x31, 0xe2, 0xc0, 0x25, 0xf6, 0x3d, 0x6c, 0xaa, 0x58, 0xac, 0x81, 0xd2, 0xaf, 0x22, + 0x40, 0xda, 0xb0, 0xc2, 0x93, 0xd5, 0x61, 0xe8, 0x0f, 0x19, 0xa9, 0x19, 0xbb, 0xa5, 0x84, 0xd3, + 0xb4, 0x9a, 0x25, 0x4a, 0x1a, 0x29, 0xaa, 0xde, 0x85, 0x93, 0xb1, 0x9d, 0xd1, 0x14, 0x5b, 0x15, + 0x75, 0x37, 0x01, 0x90, 0x0c, 0xc3, 0x58, 0xc0, 0x0f, 0x32, 0x8a, 0xc7, 0xc1, 0x0f, 0x1e, 0x87, + 0x1f, 0x3c, 0xf5, 0x0b, 0x38, 0x1d, 0x43, 0x72, 0x62, 0x16, 0xdd, 0x4f, 0x54, 0x6c, 0x97, 0xc7, + 0x69, 0x4d, 0x94, 0x6e, 0xff, 0xad, 0xc0, 0x6a, 0x16, 0xc3, 0x1b, 0x22, 0x8d, 0x3f, 0xce, 0xb9, + 0x1a, 0x76, 0x67, 0x32, 0xb3, 0x7e, 0x2b, 0x28, 0xed, 0x1e, 0x34, 0xb2, 0xfc, 0x99, 0x9e, 0xa5, + 0xe2, 0x34, 0xb3, 0xf4, 0xb3, 0x62, 0x04, 0x71, 0x6f, 0xfa, 0xbe, 0x6b, 0x1d, 0x04, 0x34, 0xe4, + 0xdf, 0x3a, 0x8a, 0xd5, 0x0a, 0xf1, 0x18, 0xee, 0xda, 0x5b, 0x23, 0xc4, 0x87, 0x76, 0x64, 0x62, + 0x32, 0x9f, 0xc5, 0x31, 0x19, 0x8e, 0xa5, 0xdf, 0x9e, 0x4c, 0xdf, 0xb7, 0x16, 0xf8, 0xfc, 0x59, + 0x01, 0x96, 0xe2, 0x53, 0x84, 0xb6, 0x01, 0x8c, 0xd0, 0x72, 0xf1, 0xa1, 0x5c, 0x9a, 0x68, 0x98, + 0x5a, 0x44, 0x10, 0xbd, 0x0f, 0xc5, 0xae, 0x13, 0x88, 0x59, 0xcb, 0x38, 0x04, 0xde, 0x74, 0x02, + 0x9e, 0x51, 0x28, 0x1b, 0xdd, 0x4b, 0xf1, 0x33, 0xfd, 0xfc, 0x2c, 0xf9, 0x9c, 0xbd, 0xe7, 0x32, + 0x82, 0x19, 0x3d, 0x85, 0xa5, 0x57, 0xae, 0xe5, 0x1b, 0x07, 0x7d, 0xac, 0xf7, 0x8d, 0x63, 0xec, + 0x8a, 0x2c, 0x39, 0x41, 0x22, 0xab, 0x4a, 0xc1, 0x67, 0x54, 0x4e, 0xfd, 0x03, 0x28, 0x49, 0x8b, + 0xc6, 0x2c, 0x0c, 0x7b, 0xb0, 0x16, 0x50, 0x36, 0x9d, 0x5d, 0xe3, 0xb2, 0x0d, 0x9b, 0xe8, 0x1e, + 0xa6, 0xcb, 0xb7, 0xbc, 0x60, 0x3e, 0x26, 0x45, 0xaf, 0x32, 0xe9, 0x4d, 0xe2, 0xe2, 0xb6, 0x61, + 0x93, 0x0e, 0x17, 0x55, 0x5f, 0x42, 0x25, 0x32, 0xc0, 0x31, 0x26, 0xb4, 0x60, 0x45, 0x1e, 0xc1, + 0x7b, 0xd8, 0x17, 0xcb, 0xcb, 0x44, 0x9d, 0x2f, 0x0b, 0xb9, 0x0e, 0xf6, 0xf9, 0xb5, 0x89, 0xfb, + 0x70, 0x5a, 0xc3, 0xc4, 0xc1, 0x76, 0x38, 0x9f, 0xcf, 0x48, 0x6f, 0x8a, 0x0c, 0xfe, 0x0e, 0x34, + 0xb2, 0xe4, 0x79, 0x7e, 0xb8, 0xfe, 0x0e, 0x94, 0xe4, 0x6f, 0x25, 0xd1, 0x02, 0x14, 0xf7, 0x36, + 0x77, 0x6b, 0x33, 0xf4, 0x61, 0x7f, 0x6b, 0xb7, 0xa6, 0x5c, 0x1f, 0x40, 0x2d, 0xf9, 0xf3, 0x40, + 0xb4, 0x06, 0x27, 0x76, 0xb5, 0x9d, 0xdd, 0xe6, 0x93, 0xe6, 0x5e, 0x6b, 0xa7, 0xad, 0xef, 0x6a, + 0xad, 0x4f, 0x9a, 0x7b, 0xdb, 0xb5, 0x19, 0x74, 0x01, 0xce, 0x46, 0x5f, 0x3c, 0xdd, 0xe9, 0xec, + 0xe9, 0x7b, 0x3b, 0xfa, 0xe6, 0x4e, 0x7b, 0xaf, 0xd9, 0x6a, 0x6f, 0x6b, 0x35, 0x05, 0x9d, 0x85, + 0xd3, 0x51, 0x96, 0x47, 0xad, 0xad, 0x96, 0xb6, 0xbd, 0x49, 0x9f, 0x9b, 0xcf, 0x6a, 0x85, 0xeb, + 0xb7, 0xa0, 0x1a, 0xfb, 0x35, 0x1f, 0x35, 0x64, 0x77, 0x67, 0xab, 0x36, 0x83, 0xaa, 0x50, 0x8e, + 0xea, 0x29, 0xc1, 0x6c, 0x7b, 0x67, 0x6b, 0xbb, 0x56, 0xb8, 0x7e, 0x17, 0x96, 0x13, 0xf7, 0x48, + 0xd1, 0x0a, 0x54, 0x3b, 0xcd, 0xf6, 0xd6, 0xa3, 0x9d, 0xcf, 0x74, 0x6d, 0xbb, 0xb9, 0xf5, 0x79, + 0x6d, 0x06, 0xad, 0x42, 0x4d, 0x92, 0xda, 0x3b, 0x7b, 0x9c, 0xaa, 0x5c, 0x7f, 0x91, 0xf8, 0xb2, + 0x30, 0x3a, 0x09, 0x2b, 0x61, 0x37, 0xfa, 0xa6, 0xb6, 0xdd, 0xdc, 0xdb, 0xa6, 0xbd, 0xc7, 0xc8, + 0xda, 0x7e, 0xbb, 0xdd, 0x6a, 0x3f, 0xa9, 0x29, 0x54, 0xeb, 0x90, 0xbc, 0xfd, 0x59, 0x8b, 0x32, + 0x17, 0xe2, 0xcc, 0xfb, 0xed, 0x1f, 0xb4, 0x77, 0x3e, 0x6d, 0xd7, 0x8a, 0x1b, 0x7f, 0xbf, 0x02, + 0x4b, 0xb2, 0xac, 0xc3, 0x2e, 0xbb, 0xc3, 0xb2, 0x0b, 0x0b, 0xf2, 0x17, 0xb7, 0x19, 0x79, 0x39, + 0xfe, 0x3b, 0xe1, 0xc6, 0x85, 0x11, 0x1c, 0xa2, 0xba, 0x9e, 0x41, 0x07, 0xac, 0xda, 0x8d, 0xdc, + 0xeb, 0xbd, 0x9c, 0x59, 0x5b, 0xa6, 0xae, 0x12, 0x37, 0xae, 0x8c, 0xe5, 0x0b, 0xfb, 0xc0, 0xb4, + 0xa0, 0x8d, 0xfe, 0x70, 0x05, 0x5d, 0xc9, 0x2c, 0xba, 0xd2, 0xbf, 0x8c, 0x69, 0x5c, 0x1d, 0xcf, + 0x18, 0x76, 0xf3, 0x02, 0x6a, 0xc9, 0x1f, 0xb1, 0xa0, 0x0c, 0xa0, 0x34, 0xe7, 0x97, 0x32, 0x8d, + 0xeb, 0x93, 0xb0, 0x46, 0x3b, 0x4b, 0xfd, 0xdc, 0xe3, 0xda, 0x24, 0xf7, 0xe7, 0x73, 0x3b, 0xcb, + 0xbb, 0x6a, 0xcf, 0x1d, 0x18, 0xbf, 0xb3, 0x8b, 0x32, 0x7f, 0x5b, 0x91, 0x71, 0xe3, 0x3b, 0xcb, + 0x81, 0xd9, 0xd7, 0x7f, 0xd5, 0x19, 0x74, 0x04, 0xcb, 0x89, 0xcb, 0x08, 0x28, 0x43, 0x3c, 0xfb, + 0xd6, 0x45, 0xe3, 0xda, 0x04, 0x9c, 0xf1, 0x88, 0x88, 0x5e, 0x3e, 0xc8, 0x8e, 0x88, 0x8c, 0xab, + 0x0d, 0xd9, 0x11, 0x91, 0x79, 0x8f, 0x81, 0x05, 0x77, 0xec, 0xd2, 0x41, 0x56, 0x70, 0x67, 0x5d, + 0x75, 0x68, 0x5c, 0x19, 0xcb, 0x17, 0x75, 0x5a, 0xe2, 0x0a, 0x42, 0x96, 0xd3, 0xb2, 0xaf, 0x38, + 0x34, 0xae, 0x4d, 0xc0, 0x99, 0x8c, 0x82, 0xe1, 0x81, 0x66, 0x5e, 0x14, 0xa4, 0x8e, 0xdf, 0xf3, + 0xa2, 0x20, 0x7d, 0x36, 0x2a, 0xa2, 0x20, 0x71, 0x10, 0x79, 0x75, 0x82, 0x83, 0x93, 0xfc, 0x28, + 0xc8, 0x3e, 0x62, 0x51, 0x67, 0xd0, 0x1f, 0x2a, 0x50, 0xcf, 0x3b, 0x94, 0x40, 0x19, 0x55, 0xdd, + 0x98, 0x73, 0x94, 0xc6, 0xc6, 0x34, 0x22, 0xa1, 0x15, 0x5f, 0x02, 0x4a, 0xaf, 0x76, 0xe8, 0x3b, + 0x59, 0x33, 0x93, 0xb3, 0xa6, 0x36, 0xde, 0x9f, 0x8c, 0x39, 0xec, 0xb2, 0x03, 0x25, 0x79, 0x0c, + 0x82, 0x32, 0xb2, 0x74, 0xe2, 0x10, 0xa6, 0xa1, 0x8e, 0x62, 0x09, 0x95, 0x3e, 0x81, 0x59, 0x4a, + 0x45, 0x67, 0xb3, 0xb9, 0xa5, 0xb2, 0x73, 0x79, 0xaf, 0x43, 0x45, 0xcf, 0x61, 0x9e, 0xe3, 0xfe, + 0x28, 0x03, 0x67, 0x88, 0x9d, 0x4e, 0x34, 0xce, 0xe7, 0x33, 0x84, 0xea, 0x7e, 0xc4, 0xff, 0x19, + 0x83, 0x80, 0xf4, 0xd1, 0x7b, 0xd9, 0xbf, 0x8e, 0x8d, 0x9f, 0x20, 0x34, 0x2e, 0x8d, 0xe1, 0x8a, + 0x7e, 0x14, 0x89, 0x5a, 0xf7, 0xca, 0xd8, 0x0d, 0x4b, 0xfe, 0x47, 0x91, 0xbd, 0x25, 0xe2, 0x41, + 0x92, 0xde, 0x32, 0x65, 0x05, 0x49, 0xee, 0x46, 0x35, 0x2b, 0x48, 0xf2, 0x77, 0x61, 0xea, 0x0c, + 0xf2, 0xe1, 0x44, 0x06, 0x30, 0x86, 0xde, 0xcf, 0x0b, 0xf2, 0x2c, 0x94, 0xae, 0x71, 0x63, 0x42, + 0xee, 0xe8, 0xe4, 0x8b, 0x8f, 0xfe, 0xdd, 0x7c, 0xb4, 0x28, 0x77, 0xf2, 0x93, 0x9f, 0xf8, 0xc6, + 0xbf, 0x15, 0x61, 0x91, 0x83, 0x9e, 0xa2, 0x82, 0xf9, 0x1c, 0x60, 0x78, 0xde, 0x80, 0x2e, 0x66, + 0xfb, 0x24, 0x76, 0x26, 0xd3, 0x78, 0x6f, 0x34, 0x53, 0x34, 0xd0, 0x22, 0xd8, 0x7d, 0x56, 0xa0, + 0xa5, 0x8f, 0x28, 0xb2, 0x02, 0x2d, 0xe3, 0x00, 0x40, 0x9d, 0x41, 0x9f, 0x40, 0x39, 0x04, 0x89, + 0x51, 0x16, 0xc8, 0x9c, 0x40, 0xc1, 0x1b, 0x17, 0x47, 0xf2, 0x44, 0xad, 0x8e, 0x20, 0xc0, 0x59, + 0x56, 0xa7, 0x91, 0xe6, 0x2c, 0xab, 0xb3, 0x60, 0xe4, 0xa1, 0x4f, 0x38, 0x5e, 0x94, 0xeb, 0x93, + 0x18, 0x4c, 0x97, 0xeb, 0x93, 0x38, 0xe8, 0xa4, 0xce, 0x3c, 0xba, 0xfc, 0xcb, 0x5f, 0x9f, 0x53, + 0xfe, 0xf9, 0xd7, 0xe7, 0x66, 0x7e, 0xfa, 0xd5, 0x39, 0xe5, 0x97, 0x5f, 0x9d, 0x53, 0xfe, 0xe9, + 0xab, 0x73, 0xca, 0xbf, 0x7f, 0x75, 0x4e, 0xf9, 0xd3, 0xff, 0x38, 0x37, 0xf3, 0xc3, 0x92, 0x94, + 0x3e, 0x98, 0x67, 0xff, 0x52, 0xe5, 0xc3, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x92, 0x3f, 0x16, + 0xfa, 0x18, 0x47, 0x00, 0x00, } diff --git a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto b/pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto similarity index 99% rename from pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto rename to pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto index 7468e0f1ea..8c36e385be 100644 --- a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto +++ b/pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto @@ -1,7 +1,8 @@ // To regenerate api.pb.go run hack/update-generated-runtime.sh syntax = 'proto3'; -package runtime; +package runtime.v1alpha2; +option go_package = "v1alpha2"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/pkg/kubelet/apis/cri/v1alpha1/runtime/constants.go b/pkg/kubelet/apis/cri/runtime/v1alpha2/constants.go similarity index 99% rename from pkg/kubelet/apis/cri/v1alpha1/runtime/constants.go rename to pkg/kubelet/apis/cri/runtime/v1alpha2/constants.go index f10ae68284..0e141b7d79 100644 --- a/pkg/kubelet/apis/cri/v1alpha1/runtime/constants.go +++ b/pkg/kubelet/apis/cri/runtime/v1alpha2/constants.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package runtime +package v1alpha2 // This file contains all constants defined in CRI. diff --git a/pkg/kubelet/apis/cri/services.go b/pkg/kubelet/apis/cri/services.go index 31f2bc32a7..45bc5ef323 100644 --- a/pkg/kubelet/apis/cri/services.go +++ b/pkg/kubelet/apis/cri/services.go @@ -19,7 +19,7 @@ package cri import ( "time" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // RuntimeVersioner contains methods for runtime name, version and API version. diff --git a/pkg/kubelet/apis/cri/testing/BUILD b/pkg/kubelet/apis/cri/testing/BUILD index f0db746b10..673e98d3f4 100644 --- a/pkg/kubelet/apis/cri/testing/BUILD +++ b/pkg/kubelet/apis/cri/testing/BUILD @@ -14,7 +14,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", ], diff --git a/pkg/kubelet/apis/cri/testing/fake_image_service.go b/pkg/kubelet/apis/cri/testing/fake_image_service.go index b3e8e0ce2e..7a65963298 100644 --- a/pkg/kubelet/apis/cri/testing/fake_image_service.go +++ b/pkg/kubelet/apis/cri/testing/fake_image_service.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" ) diff --git a/pkg/kubelet/apis/cri/testing/fake_runtime_service.go b/pkg/kubelet/apis/cri/testing/fake_runtime_service.go index 770ca1c331..02799c09fa 100644 --- a/pkg/kubelet/apis/cri/testing/fake_runtime_service.go +++ b/pkg/kubelet/apis/cri/testing/fake_runtime_service.go @@ -22,7 +22,7 @@ import ( "sync" "time" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) var ( diff --git a/pkg/kubelet/apis/cri/testing/utils.go b/pkg/kubelet/apis/cri/testing/utils.go index 2aaee3bfba..faf3e78620 100644 --- a/pkg/kubelet/apis/cri/testing/utils.go +++ b/pkg/kubelet/apis/cri/testing/utils.go @@ -19,7 +19,7 @@ package testing import ( "fmt" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func BuildContainerName(metadata *runtimeapi.ContainerMetadata, sandboxID string) string { diff --git a/pkg/kubelet/cm/cpumanager/BUILD b/pkg/kubelet/cm/cpumanager/BUILD index a270b6a052..a880385dc9 100644 --- a/pkg/kubelet/cm/cpumanager/BUILD +++ b/pkg/kubelet/cm/cpumanager/BUILD @@ -14,7 +14,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/core/v1/helper/qos:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/cm/cpumanager/state:go_default_library", "//pkg/kubelet/cm/cpumanager/topology:go_default_library", "//pkg/kubelet/cm/cpuset:go_default_library", @@ -39,7 +39,7 @@ go_test( embed = [":go_default_library"], importpath = "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/cm/cpumanager/state:go_default_library", "//pkg/kubelet/cm/cpumanager/topology:go_default_library", "//pkg/kubelet/cm/cpuset:go_default_library", diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go index 6c59dca18d..b52fe59a12 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager.go @@ -27,7 +27,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go index 704060fb38..1371ded6f1 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" "os" diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index 00c403b2ca..e35e7046bc 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -54,7 +54,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/util/format:go_default_library", "//pkg/kubelet/util/ioutils:go_default_library", "//pkg/util/hash:go_default_library", diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index cc3f188113..d16bb2171b 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" hashutil "k8s.io/kubernetes/pkg/util/hash" diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index d2a7716536..56aeaf8136 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/util/flowcontrol" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/kubelet/container/testing/BUILD b/pkg/kubelet/container/testing/BUILD index c56ccc4d8f..9db886c0ca 100644 --- a/pkg/kubelet/container/testing/BUILD +++ b/pkg/kubelet/container/testing/BUILD @@ -14,7 +14,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/container/testing", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/volume:go_default_library", "//vendor/github.com/golang/mock/gomock:go_default_library", diff --git a/pkg/kubelet/container/testing/fake_runtime_helper.go b/pkg/kubelet/container/testing/fake_runtime_helper.go index 9d41bcd287..373022c350 100644 --- a/pkg/kubelet/container/testing/fake_runtime_helper.go +++ b/pkg/kubelet/container/testing/fake_runtime_helper.go @@ -19,7 +19,7 @@ package testing import ( "k8s.io/api/core/v1" kubetypes "k8s.io/apimachinery/pkg/types" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index ba420b45a5..7fb4f83a3e 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -85,7 +85,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim", deps = [ "//pkg/credentialprovider:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", @@ -157,7 +157,7 @@ go_test( embed = [":go_default_library"], importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/dockershim/libdocker:go_default_library", diff --git a/pkg/kubelet/dockershim/convert.go b/pkg/kubelet/dockershim/convert.go index 0ce30959a7..f1c9b0e852 100644 --- a/pkg/kubelet/dockershim/convert.go +++ b/pkg/kubelet/dockershim/convert.go @@ -23,7 +23,7 @@ import ( dockertypes "github.com/docker/docker/api/types" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/convert_test.go b/pkg/kubelet/dockershim/convert_test.go index a05ab9dd91..8ae600b2de 100644 --- a/pkg/kubelet/dockershim/convert_test.go +++ b/pkg/kubelet/dockershim/convert_test.go @@ -22,7 +22,7 @@ import ( dockertypes "github.com/docker/docker/api/types" "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func TestConvertDockerStatusToRuntimeAPIState(t *testing.T) { diff --git a/pkg/kubelet/dockershim/doc.go b/pkg/kubelet/dockershim/doc.go index 323a941c45..943e59d3e5 100644 --- a/pkg/kubelet/dockershim/doc.go +++ b/pkg/kubelet/dockershim/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Docker integration using pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go +// Docker integration using pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go package dockershim diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index 522649845c..e103636360 100644 --- a/pkg/kubelet/dockershim/docker_container.go +++ b/pkg/kubelet/dockershim/docker_container.go @@ -29,7 +29,7 @@ import ( "github.com/golang/glog" "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/docker_container_test.go b/pkg/kubelet/dockershim/docker_container_test.go index c96e6e970d..640ab2d50d 100644 --- a/pkg/kubelet/dockershim/docker_container_test.go +++ b/pkg/kubelet/dockershim/docker_container_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/dockershim/docker_image.go b/pkg/kubelet/dockershim/docker_image.go index 622945a8ec..a81c9d7631 100644 --- a/pkg/kubelet/dockershim/docker_image.go +++ b/pkg/kubelet/dockershim/docker_image.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/pkg/jsonmessage" "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/docker_image_linux.go b/pkg/kubelet/dockershim/docker_image_linux.go index 3ecc6599e9..c823f91376 100644 --- a/pkg/kubelet/dockershim/docker_image_linux.go +++ b/pkg/kubelet/dockershim/docker_image_linux.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ImageFsInfo returns information of the filesystem that is used to store images. diff --git a/pkg/kubelet/dockershim/docker_image_test.go b/pkg/kubelet/dockershim/docker_image_test.go index 91a502629e..51363cab4b 100644 --- a/pkg/kubelet/dockershim/docker_image_test.go +++ b/pkg/kubelet/dockershim/docker_image_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/docker_image_unsupported.go b/pkg/kubelet/dockershim/docker_image_unsupported.go index b4fb70b3a4..36fbd7cc63 100644 --- a/pkg/kubelet/dockershim/docker_image_unsupported.go +++ b/pkg/kubelet/dockershim/docker_image_unsupported.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ImageFsInfo returns information of the filesystem that is used to store images. diff --git a/pkg/kubelet/dockershim/docker_image_windows.go b/pkg/kubelet/dockershim/docker_image_windows.go index 385b054587..b6ee9e156b 100644 --- a/pkg/kubelet/dockershim/docker_image_windows.go +++ b/pkg/kubelet/dockershim/docker_image_windows.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ImageFsInfo returns information of the filesystem that is used to store images. diff --git a/pkg/kubelet/dockershim/docker_logs.go b/pkg/kubelet/dockershim/docker_logs.go index ccd8f020a2..5366c29827 100644 --- a/pkg/kubelet/dockershim/docker_logs.go +++ b/pkg/kubelet/dockershim/docker_logs.go @@ -21,7 +21,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ReopenContainerLog reopens the container log file. diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index fc5621e26a..b314969a6c 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -29,7 +29,7 @@ import ( "golang.org/x/net/context" utilerrors "k8s.io/apimachinery/pkg/util/errors" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/qos" diff --git a/pkg/kubelet/dockershim/docker_sandbox_test.go b/pkg/kubelet/dockershim/docker_sandbox_test.go index b70a441d1b..a9c55a1104 100644 --- a/pkg/kubelet/dockershim/docker_sandbox_test.go +++ b/pkg/kubelet/dockershim/docker_sandbox_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index 4c90c4ac54..867ec7bc01 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -28,7 +28,7 @@ import ( "golang.org/x/net/context" "k8s.io/api/core/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecm "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/dockershim/docker_service_test.go b/pkg/kubelet/dockershim/docker_service_test.go index 77a0f05c72..750d3f4259 100644 --- a/pkg/kubelet/dockershim/docker_service_test.go +++ b/pkg/kubelet/dockershim/docker_service_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/clock" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/dockershim/docker_stats_linux.go b/pkg/kubelet/dockershim/docker_stats_linux.go index e6bc458e21..e8b54ac1df 100644 --- a/pkg/kubelet/dockershim/docker_stats_linux.go +++ b/pkg/kubelet/dockershim/docker_stats_linux.go @@ -22,7 +22,7 @@ import ( "fmt" "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ContainerStats returns stats for a container stats request based on container id. diff --git a/pkg/kubelet/dockershim/docker_stats_unsupported.go b/pkg/kubelet/dockershim/docker_stats_unsupported.go index 009362bb51..72b6409c7e 100644 --- a/pkg/kubelet/dockershim/docker_stats_unsupported.go +++ b/pkg/kubelet/dockershim/docker_stats_unsupported.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ContainerStats returns stats for a container stats request based on container id. diff --git a/pkg/kubelet/dockershim/docker_stats_windows.go b/pkg/kubelet/dockershim/docker_stats_windows.go index 49bd2b6671..644dffd584 100644 --- a/pkg/kubelet/dockershim/docker_stats_windows.go +++ b/pkg/kubelet/dockershim/docker_stats_windows.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ContainerStats returns stats for a container stats request based on container id. diff --git a/pkg/kubelet/dockershim/docker_streaming.go b/pkg/kubelet/dockershim/docker_streaming.go index c55e0829cd..bb0a4a6372 100644 --- a/pkg/kubelet/dockershim/docker_streaming.go +++ b/pkg/kubelet/dockershim/docker_streaming.go @@ -30,7 +30,7 @@ import ( "golang.org/x/net/context" "k8s.io/client-go/tools/remotecommand" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" diff --git a/pkg/kubelet/dockershim/helpers.go b/pkg/kubelet/dockershim/helpers.go index 8066b7b03c..3caa2441da 100644 --- a/pkg/kubelet/dockershim/helpers.go +++ b/pkg/kubelet/dockershim/helpers.go @@ -30,7 +30,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/kubernetes/pkg/credentialprovider" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/security/apparmor" diff --git a/pkg/kubelet/dockershim/helpers_linux.go b/pkg/kubelet/dockershim/helpers_linux.go index a9e04b1875..431150c31d 100644 --- a/pkg/kubelet/dockershim/helpers_linux.go +++ b/pkg/kubelet/dockershim/helpers_linux.go @@ -30,7 +30,7 @@ import ( "github.com/blang/semver" dockertypes "github.com/docker/docker/api/types" dockercontainer "github.com/docker/docker/api/types/container" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func DefaultMemorySwap() int64 { diff --git a/pkg/kubelet/dockershim/helpers_test.go b/pkg/kubelet/dockershim/helpers_test.go index 03809c4c5f..a88cfa0de8 100644 --- a/pkg/kubelet/dockershim/helpers_test.go +++ b/pkg/kubelet/dockershim/helpers_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/security/apparmor" ) diff --git a/pkg/kubelet/dockershim/helpers_unsupported.go b/pkg/kubelet/dockershim/helpers_unsupported.go index fe904426c1..2867898f30 100644 --- a/pkg/kubelet/dockershim/helpers_unsupported.go +++ b/pkg/kubelet/dockershim/helpers_unsupported.go @@ -24,7 +24,7 @@ import ( "github.com/blang/semver" dockertypes "github.com/docker/docker/api/types" "github.com/golang/glog" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func DefaultMemorySwap() int64 { diff --git a/pkg/kubelet/dockershim/helpers_windows.go b/pkg/kubelet/dockershim/helpers_windows.go index f7a82fc3a5..4e3dbd0ba1 100644 --- a/pkg/kubelet/dockershim/helpers_windows.go +++ b/pkg/kubelet/dockershim/helpers_windows.go @@ -29,7 +29,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) const ( diff --git a/pkg/kubelet/dockershim/naming.go b/pkg/kubelet/dockershim/naming.go index 3a7ef13bec..a2a97c2da4 100644 --- a/pkg/kubelet/dockershim/naming.go +++ b/pkg/kubelet/dockershim/naming.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/leaky" ) diff --git a/pkg/kubelet/dockershim/naming_test.go b/pkg/kubelet/dockershim/naming_test.go index 54358668a0..aecea1d04b 100644 --- a/pkg/kubelet/dockershim/naming_test.go +++ b/pkg/kubelet/dockershim/naming_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func TestSandboxNameRoundTrip(t *testing.T) { diff --git a/pkg/kubelet/dockershim/remote/BUILD b/pkg/kubelet/dockershim/remote/BUILD index b44e4d39d6..4ac86b9d37 100644 --- a/pkg/kubelet/dockershim/remote/BUILD +++ b/pkg/kubelet/dockershim/remote/BUILD @@ -10,7 +10,7 @@ go_library( srcs = ["docker_server.go"], importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim/remote", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/dockershim:go_default_library", "//pkg/kubelet/util:go_default_library", "//pkg/util/interrupt:go_default_library", diff --git a/pkg/kubelet/dockershim/remote/docker_server.go b/pkg/kubelet/dockershim/remote/docker_server.go index b118500560..53f52526e9 100644 --- a/pkg/kubelet/dockershim/remote/docker_server.go +++ b/pkg/kubelet/dockershim/remote/docker_server.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "google.golang.org/grpc" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/dockershim" "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/util/interrupt" diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go index 5eac5e8bf9..51a58e7be8 100644 --- a/pkg/kubelet/dockershim/security_context.go +++ b/pkg/kubelet/dockershim/security_context.go @@ -24,7 +24,7 @@ import ( "github.com/blang/semver" dockercontainer "github.com/docker/docker/api/types/container" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" knetwork "k8s.io/kubernetes/pkg/kubelet/network" ) diff --git a/pkg/kubelet/dockershim/security_context_test.go b/pkg/kubelet/dockershim/security_context_test.go index 4248750cfb..382f004aca 100644 --- a/pkg/kubelet/dockershim/security_context_test.go +++ b/pkg/kubelet/dockershim/security_context_test.go @@ -25,7 +25,7 @@ import ( dockercontainer "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func TestModifyContainerConfig(t *testing.T) { diff --git a/pkg/kubelet/dockershim/selinux_util.go b/pkg/kubelet/dockershim/selinux_util.go index e8e2a07f62..d9a59cf0aa 100644 --- a/pkg/kubelet/dockershim/selinux_util.go +++ b/pkg/kubelet/dockershim/selinux_util.go @@ -19,7 +19,7 @@ package dockershim import ( "fmt" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // selinuxLabelUser returns the fragment of a Docker security opt that diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index 73fddb56e5..d70fa06a13 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 91811d36db..10a9d64694 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -49,7 +49,7 @@ import ( v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/fieldpath" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/envvars" diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index a993ca2a84..70e561b2b8 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -42,7 +42,7 @@ import ( // to "v1"? "k8s.io/kubernetes/pkg/api/legacyscheme" _ "k8s.io/kubernetes/pkg/apis/core/install" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/server/portforward" diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index c27f04ef31..4a6fc209a9 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -31,7 +31,7 @@ go_library( "//pkg/credentialprovider/secrets:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/events:go_default_library", @@ -85,8 +85,8 @@ go_test( importpath = "k8s.io/kubernetes/pkg/kubelet/kuberuntime", deps = [ "//pkg/credentialprovider:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/cri/testing:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", diff --git a/pkg/kubelet/kuberuntime/helpers.go b/pkg/kubelet/kuberuntime/helpers.go index 2a0f51efcf..ef087171b3 100644 --- a/pkg/kubelet/kuberuntime/helpers.go +++ b/pkg/kubelet/kuberuntime/helpers.go @@ -26,7 +26,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/helpers_test.go b/pkg/kubelet/kuberuntime/helpers_test.go index 0500bfe61d..d0c0d8e4c9 100644 --- a/pkg/kubelet/kuberuntime/helpers_test.go +++ b/pkg/kubelet/kuberuntime/helpers_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" runtimetesting "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/instrumented_services.go b/pkg/kubelet/kuberuntime/instrumented_services.go index 870c83da11..8540ddb475 100644 --- a/pkg/kubelet/kuberuntime/instrumented_services.go +++ b/pkg/kubelet/kuberuntime/instrumented_services.go @@ -20,7 +20,7 @@ import ( "time" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/metrics" ) diff --git a/pkg/kubelet/kuberuntime/instrumented_services_test.go b/pkg/kubelet/kuberuntime/instrumented_services_test.go index 933fc29959..d56d23ca96 100644 --- a/pkg/kubelet/kuberuntime/instrumented_services_test.go +++ b/pkg/kubelet/kuberuntime/instrumented_services_test.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/metrics" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 8f0c817ec9..43b3bf42b7 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -39,7 +39,7 @@ import ( kubetypes "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/qos" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go index 4f3cad7b54..e99abf75b1 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/core/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/lifecycle" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc.go b/pkg/kubelet/kuberuntime/kuberuntime_gc.go index 4bf35638c3..a66a07370c 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go index ebd306fd75..e55ec10662 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go @@ -25,7 +25,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "k8s.io/api/core/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_image.go b/pkg/kubelet/kuberuntime/kuberuntime_image.go index a7ba8ca5be..a8f2c1c060 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_image.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_image.go @@ -22,7 +22,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/kubernetes/pkg/credentialprovider" credentialprovidersecrets "k8s.io/kubernetes/pkg/credentialprovider/secrets" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util/parsers" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_image_test.go b/pkg/kubelet/kuberuntime/kuberuntime_image_test.go index 542d54f14f..3d20455cc1 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_image_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_image_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/credentialprovider" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index ae9468d22b..dfce8b11d9 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/credentialprovider" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index c688f077da..f39d2f3942 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/credentialprovider" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go index 9ae3bc908d..cddf3385d9 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" kubetypes "k8s.io/apimachinery/pkg/types" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go index e2ef0a386b..34694b7050 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/logs/BUILD b/pkg/kubelet/kuberuntime/logs/BUILD index 6385e44885..18ddfa31e6 100644 --- a/pkg/kubelet/kuberuntime/logs/BUILD +++ b/pkg/kubelet/kuberuntime/logs/BUILD @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/util/tail:go_default_library", "//vendor/github.com/docker/docker/pkg/jsonlog:go_default_library", "//vendor/github.com/fsnotify/fsnotify:go_default_library", @@ -22,7 +22,7 @@ go_test( embed = [":go_default_library"], importpath = "k8s.io/kubernetes/pkg/kubelet/kuberuntime/logs", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/kubelet/kuberuntime/logs/logs.go b/pkg/kubelet/kuberuntime/logs/logs.go index e029d40d6c..3d61d40dac 100644 --- a/pkg/kubelet/kuberuntime/logs/logs.go +++ b/pkg/kubelet/kuberuntime/logs/logs.go @@ -33,7 +33,7 @@ import ( "k8s.io/api/core/v1" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/util/tail" ) diff --git a/pkg/kubelet/kuberuntime/logs/logs_test.go b/pkg/kubelet/kuberuntime/logs/logs_test.go index 17b074a01f..66b6edb8dc 100644 --- a/pkg/kubelet/kuberuntime/logs/logs_test.go +++ b/pkg/kubelet/kuberuntime/logs/logs_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) func TestLogOptions(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/security_context.go b/pkg/kubelet/kuberuntime/security_context.go index fe0ec076e0..c01fd52061 100644 --- a/pkg/kubelet/kuberuntime/security_context.go +++ b/pkg/kubelet/kuberuntime/security_context.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/api/core/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/securitycontext" ) diff --git a/pkg/kubelet/network/dns/BUILD b/pkg/kubelet/network/dns/BUILD index 3088a32b80..296c839ede 100644 --- a/pkg/kubelet/network/dns/BUILD +++ b/pkg/kubelet/network/dns/BUILD @@ -8,7 +8,7 @@ go_library( deps = [ "//pkg/apis/core/validation:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/util/format:go_default_library", "//vendor/github.com/golang/glog:go_default_library", @@ -24,7 +24,7 @@ go_test( embed = [":go_default_library"], importpath = "k8s.io/kubernetes/pkg/kubelet/network/dns", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubelet/network/dns/dns.go b/pkg/kubelet/network/dns/dns.go index bcc717e01c..0fae93a72b 100644 --- a/pkg/kubelet/network/dns/dns.go +++ b/pkg/kubelet/network/dns/dns.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/apis/core/validation" "k8s.io/kubernetes/pkg/features" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/kubelet/network/dns/dns_test.go b/pkg/kubelet/network/dns/dns_test.go index 3ff551f4a6..c784f081b7 100644 --- a/pkg/kubelet/network/dns/dns_test.go +++ b/pkg/kubelet/network/dns/dns_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/kubelet/pleg/BUILD b/pkg/kubelet/pleg/BUILD index 2033ea4be7..bebd9b42e4 100644 --- a/pkg/kubelet/pleg/BUILD +++ b/pkg/kubelet/pleg/BUILD @@ -15,7 +15,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/pleg", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/kubelet/pleg/generic.go b/pkg/kubelet/pleg/generic.go index b873efb005..d9286c96c6 100644 --- a/pkg/kubelet/pleg/generic.go +++ b/pkg/kubelet/pleg/generic.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/metrics" ) diff --git a/pkg/kubelet/remote/BUILD b/pkg/kubelet/remote/BUILD index 33400529ad..ccdeed5ce1 100644 --- a/pkg/kubelet/remote/BUILD +++ b/pkg/kubelet/remote/BUILD @@ -17,7 +17,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/remote", deps = [ "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/util:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/golang.org/x/net/context:go_default_library", diff --git a/pkg/kubelet/remote/fake/BUILD b/pkg/kubelet/remote/fake/BUILD index 909c88edb2..883c78248d 100644 --- a/pkg/kubelet/remote/fake/BUILD +++ b/pkg/kubelet/remote/fake/BUILD @@ -52,8 +52,8 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/remote/fake", tags = ["automanaged"], deps = [ + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/cri/testing:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/util:go_default_library", "//vendor/golang.org/x/net/context:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", diff --git a/pkg/kubelet/remote/fake/fake_image_service.go b/pkg/kubelet/remote/fake/fake_image_service.go index 09e0df35d1..cdb90b927d 100644 --- a/pkg/kubelet/remote/fake/fake_image_service.go +++ b/pkg/kubelet/remote/fake/fake_image_service.go @@ -18,7 +18,7 @@ package fake import ( "golang.org/x/net/context" - kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // ListImages lists existing images. diff --git a/pkg/kubelet/remote/fake/fake_runtime.go b/pkg/kubelet/remote/fake/fake_runtime.go index 6c6fe96429..e6a7ce93b3 100644 --- a/pkg/kubelet/remote/fake/fake_runtime.go +++ b/pkg/kubelet/remote/fake/fake_runtime.go @@ -22,8 +22,8 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" + kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" - kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/kubelet/remote/remote_image.go b/pkg/kubelet/remote/remote_image.go index d685f07ace..21bcaea63b 100644 --- a/pkg/kubelet/remote/remote_image.go +++ b/pkg/kubelet/remote/remote_image.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/util" ) diff --git a/pkg/kubelet/remote/remote_runtime.go b/pkg/kubelet/remote/remote_runtime.go index 1ef805ad91..9860d73565 100644 --- a/pkg/kubelet/remote/remote_runtime.go +++ b/pkg/kubelet/remote/remote_runtime.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/util" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/kubelet/remote/utils.go b/pkg/kubelet/remote/utils.go index 47a37fd09a..bd86492ac3 100644 --- a/pkg/kubelet/remote/utils.go +++ b/pkg/kubelet/remote/utils.go @@ -22,7 +22,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) // getContextWithTimeout returns a context with timeout. diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/server/streaming/BUILD index 1f0e2949ec..9c9f9c0c48 100644 --- a/pkg/kubelet/server/streaming/BUILD +++ b/pkg/kubelet/server/streaming/BUILD @@ -15,7 +15,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/server/streaming", deps = [ - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", @@ -38,7 +38,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/kubelet/server/streaming", deps = [ "//pkg/apis/core:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", diff --git a/pkg/kubelet/server/streaming/server.go b/pkg/kubelet/server/streaming/server.go index ba9f12ff10..64bd52f335 100644 --- a/pkg/kubelet/server/streaming/server.go +++ b/pkg/kubelet/server/streaming/server.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" "k8s.io/client-go/tools/remotecommand" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/server/portforward" remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" ) diff --git a/pkg/kubelet/server/streaming/server_test.go b/pkg/kubelet/server/streaming/server_test.go index 77ccc721cd..214dfded10 100644 --- a/pkg/kubelet/server/streaming/server_test.go +++ b/pkg/kubelet/server/streaming/server_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/transport/spdy" api "k8s.io/kubernetes/pkg/apis/core" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward" ) diff --git a/pkg/kubelet/stats/BUILD b/pkg/kubelet/stats/BUILD index e272ed4f00..68463fc0a6 100644 --- a/pkg/kubelet/stats/BUILD +++ b/pkg/kubelet/stats/BUILD @@ -12,7 +12,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm:go_default_library", @@ -57,8 +57,8 @@ go_test( embed = [":go_default_library"], importpath = "k8s.io/kubernetes/pkg/kubelet/stats", deps = [ + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/cri/testing:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/container:go_default_library", diff --git a/pkg/kubelet/stats/cri_stats_provider.go b/pkg/kubelet/stats/cri_stats_provider.go index 950368b6ea..2de4f8bd8c 100644 --- a/pkg/kubelet/stats/cri_stats_provider.go +++ b/pkg/kubelet/stats/cri_stats_provider.go @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/server/stats" diff --git a/pkg/kubelet/stats/cri_stats_provider_test.go b/pkg/kubelet/stats/cri_stats_provider_test.go index 931b368ec5..01d90e8422 100644 --- a/pkg/kubelet/stats/cri_stats_provider_test.go +++ b/pkg/kubelet/stats/cri_stats_provider_test.go @@ -25,8 +25,8 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" critest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index b6ff87517f..c363c42ab0 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -29,7 +29,7 @@ go_library( "//pkg/api/v1/pod:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", @@ -121,7 +121,7 @@ go_test( "//pkg/features:go_default_library", "//pkg/kubelet:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", + "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", diff --git a/test/e2e_node/container_manager_test.go b/test/e2e_node/container_manager_test.go index fa123c4d54..7e48e445fd 100644 --- a/test/e2e_node/container_manager_test.go +++ b/test/e2e_node/container_manager_test.go @@ -31,7 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e_node/cpu_manager_test.go b/test/e2e_node/cpu_manager_test.go index 61a3b66cb5..5518107df6 100644 --- a/test/e2e_node/cpu_manager_test.go +++ b/test/e2e_node/cpu_manager_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" diff --git a/test/e2e_node/garbage_collector_test.go b/test/e2e_node/garbage_collector_test.go index 04010cd6ac..96045f09ca 100644 --- a/test/e2e_node/garbage_collector_test.go +++ b/test/e2e_node/garbage_collector_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index b857700c14..bd55bf59e8 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image"