diff --git a/pkg/containerd/opts/spec_unix.go b/pkg/containerd/opts/spec_unix.go index 3bfeb0703..d69e4d743 100644 --- a/pkg/containerd/opts/spec_unix.go +++ b/pkg/containerd/opts/spec_unix.go @@ -423,10 +423,11 @@ func WithResources(resources *runtime.LinuxContainerResources) oci.SpecOpts { s.Linux.Resources.Memory = &runtimespec.LinuxMemory{} } var ( - p = uint64(resources.GetCpuPeriod()) - q = resources.GetCpuQuota() - shares = uint64(resources.GetCpuShares()) - limit = resources.GetMemoryLimitInBytes() + p = uint64(resources.GetCpuPeriod()) + q = resources.GetCpuQuota() + shares = uint64(resources.GetCpuShares()) + limit = resources.GetMemoryLimitInBytes() + hugepages = resources.GetHugepageLimits() ) if p != 0 { @@ -447,6 +448,12 @@ func WithResources(resources *runtime.LinuxContainerResources) oci.SpecOpts { if limit != 0 { s.Linux.Resources.Memory.Limit = &limit } + for _, limit := range hugepages { + s.Linux.Resources.HugepageLimits = append(s.Linux.Resources.HugepageLimits, runtimespec.LinuxHugepageLimit{ + Pagesize: limit.PageSize, + Limit: limit.Limit, + }) + } return nil } } diff --git a/vendor.conf b/vendor.conf index 0d2682b66..081bd5672 100644 --- a/vendor.conf +++ b/vendor.conf @@ -60,13 +60,13 @@ github.com/cilium/ebpf 60c3aa43f488292fe2ee50fb8b833b383ca8ebbb # kubernetes dependencies sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0 k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5 -k8s.io/kubernetes v1.17.1 +k8s.io/kubernetes v1.18.0-alpha.1 k8s.io/klog v1.0.0 -k8s.io/cri-api kubernetes-1.17.1 -k8s.io/client-go kubernetes-1.17.1 -k8s.io/api kubernetes-1.17.1 -k8s.io/apiserver kubernetes-1.17.1 -k8s.io/apimachinery kubernetes-1.17.1 +k8s.io/cri-api kubernetes-1.18.0-alpha.1 +k8s.io/client-go kubernetes-1.18.0-alpha.1 +k8s.io/api kubernetes-1.18.0-alpha.1 +k8s.io/apiserver kubernetes-1.18.0-alpha.1 +k8s.io/apimachinery kubernetes-1.18.0-alpha.1 gopkg.in/yaml.v2 53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8 gopkg.in/inf.v0 v0.9.1 golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef diff --git a/vendor/k8s.io/api/core/v1/resource.go b/vendor/k8s.io/api/core/v1/resource.go index bb8041254..5bc9cd5bf 100644 --- a/vendor/k8s.io/api/core/v1/resource.go +++ b/vendor/k8s.io/api/core/v1/resource.go @@ -41,6 +41,14 @@ func (self *ResourceList) Memory() *resource.Quantity { return &resource.Quantity{Format: resource.BinarySI} } +// Returns the Storage limit if specified. +func (self *ResourceList) Storage() *resource.Quantity { + if val, ok := (*self)[ResourceStorage]; ok { + return &val + } + return &resource.Quantity{Format: resource.BinarySI} +} + func (self *ResourceList) Pods() *resource.Quantity { if val, ok := (*self)[ResourcePods]; ok { return &val diff --git a/vendor/k8s.io/api/go.mod b/vendor/k8s.io/api/go.mod index 636b71b2f..db7f5e7bb 100644 --- a/vendor/k8s.io/api/go.mod +++ b/vendor/k8s.io/api/go.mod @@ -2,16 +2,16 @@ module k8s.io/api -go 1.12 +go 1.13 require ( github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d github.com/stretchr/testify v1.4.0 - k8s.io/apimachinery v0.17.1 + k8s.io/apimachinery v0.18.0-alpha.1 ) replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/apimachinery => k8s.io/apimachinery v0.17.1 + k8s.io/apimachinery => k8s.io/apimachinery v0.18.0-alpha.1 ) diff --git a/vendor/k8s.io/apimachinery/go.mod b/vendor/k8s.io/apimachinery/go.mod index 658480e5b..7e71fca5e 100644 --- a/vendor/k8s.io/apimachinery/go.mod +++ b/vendor/k8s.io/apimachinery/go.mod @@ -2,7 +2,7 @@ module k8s.io/apimachinery -go 1.12 +go 1.13 require ( github.com/davecgh/go-spew v1.1.1 diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go index b56140de5..ceb645278 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go @@ -47,19 +47,6 @@ func addToGroupVersion(scheme *runtime.Scheme) error { if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil { return err } - err := scheme.AddConversionFuncs( - metav1.Convert_string_To_labels_Selector, - metav1.Convert_labels_Selector_To_string, - - metav1.Convert_string_To_fields_Selector, - metav1.Convert_fields_Selector_To_string, - - metav1.Convert_Map_string_To_string_To_v1_LabelSelector, - metav1.Convert_v1_LabelSelector_To_Map_string_To_string, - ) - if err != nil { - return err - } // ListOptions is the only options struct which needs conversion (it exposes labels and fields // as selectors for convenience). The other types have only a single representation today. scheme.AddKnownTypes(SchemeGroupVersion, @@ -71,8 +58,8 @@ func addToGroupVersion(scheme *runtime.Scheme) error { &metav1.UpdateOptions{}, ) scheme.AddKnownTypes(SchemeGroupVersion, - &metav1beta1.Table{}, - &metav1beta1.TableOptions{}, + &metav1.Table{}, + &metav1.TableOptions{}, &metav1beta1.PartialObjectMetadata{}, &metav1beta1.PartialObjectMetadataList{}, ) @@ -87,6 +74,7 @@ func addToGroupVersion(scheme *runtime.Scheme) error { &metav1.DeleteOptions{}, &metav1.CreateOptions{}, &metav1.UpdateOptions{}) + metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion) return nil } @@ -95,5 +83,4 @@ func addToGroupVersion(scheme *runtime.Scheme) error { // the logic for conversion private. func init() { localSchemeBuilder.Register(addToGroupVersion) - localSchemeBuilder.Register(metav1.RegisterConversions) } diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go index 285a41a42..b937398cd 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go @@ -26,69 +26,10 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" ) -func AddConversionFuncs(scheme *runtime.Scheme) error { - return scheme.AddConversionFuncs( - Convert_v1_TypeMeta_To_v1_TypeMeta, - - Convert_v1_ListMeta_To_v1_ListMeta, - - Convert_v1_DeleteOptions_To_v1_DeleteOptions, - - Convert_intstr_IntOrString_To_intstr_IntOrString, - Convert_Pointer_intstr_IntOrString_To_intstr_IntOrString, - Convert_intstr_IntOrString_To_Pointer_intstr_IntOrString, - - Convert_Pointer_v1_Duration_To_v1_Duration, - Convert_v1_Duration_To_Pointer_v1_Duration, - - Convert_Slice_string_To_v1_Time, - Convert_Slice_string_To_Pointer_v1_Time, - - Convert_v1_Time_To_v1_Time, - Convert_v1_MicroTime_To_v1_MicroTime, - - Convert_resource_Quantity_To_resource_Quantity, - - Convert_string_To_labels_Selector, - Convert_labels_Selector_To_string, - - Convert_string_To_fields_Selector, - Convert_fields_Selector_To_string, - - Convert_Pointer_bool_To_bool, - Convert_bool_To_Pointer_bool, - - Convert_Pointer_string_To_string, - Convert_string_To_Pointer_string, - - Convert_Pointer_int64_To_int, - Convert_int_To_Pointer_int64, - - Convert_Pointer_int32_To_int32, - Convert_int32_To_Pointer_int32, - - Convert_Pointer_int64_To_int64, - Convert_int64_To_Pointer_int64, - - Convert_Pointer_float64_To_float64, - Convert_float64_To_Pointer_float64, - - Convert_Map_string_To_string_To_v1_LabelSelector, - Convert_v1_LabelSelector_To_Map_string_To_string, - - Convert_Slice_string_To_Slice_int32, - - Convert_Slice_string_To_Pointer_v1_DeletionPropagation, - - Convert_Slice_string_To_v1_IncludeObjectPolicy, - ) -} - func Convert_Pointer_float64_To_float64(in **float64, out *float64, s conversion.Scope) error { if *in == nil { *out = 0 diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go index a7b8aa34f..c1a077178 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go @@ -53,15 +53,6 @@ var scheme = runtime.NewScheme() // ParameterCodec knows about query parameters used with the meta v1 API spec. var ParameterCodec = runtime.NewParameterCodec(scheme) -func addEventConversionFuncs(scheme *runtime.Scheme) error { - return scheme.AddConversionFuncs( - Convert_v1_WatchEvent_To_watch_Event, - Convert_v1_InternalEvent_To_v1_WatchEvent, - Convert_watch_Event_To_v1_WatchEvent, - Convert_v1_WatchEvent_To_v1_InternalEvent, - ) -} - var optionsTypes = []runtime.Object{ &ListOptions{}, &ExportOptions{}, @@ -90,10 +81,8 @@ func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) &APIResourceList{}, ) - utilruntime.Must(addEventConversionFuncs(scheme)) - // register manually. This usually goes through the SchemeBuilder, which we cannot use here. - utilruntime.Must(AddConversionFuncs(scheme)) + utilruntime.Must(RegisterConversions(scheme)) utilruntime.Must(RegisterDefaults(scheme)) } @@ -106,9 +95,7 @@ func AddMetaToScheme(scheme *runtime.Scheme) error { &PartialObjectMetadataList{}, ) - return scheme.AddConversionFuncs( - Convert_Slice_string_To_v1_IncludeObjectPolicy, - ) + return nil } func init() { diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go index 5fae30ae8..dd6f5475c 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go @@ -81,28 +81,27 @@ func init() { } var fileDescriptor_90ec10f86b91f9a8 = []byte{ - // 321 bytes of a gzipped FileDescriptorProto + // 317 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x4b, 0xf3, 0x30, - 0x18, 0xc7, 0x9b, 0xf7, 0x65, 0x38, 0x3a, 0x04, 0xd9, 0x69, 0xee, 0x90, 0x0d, 0x4f, 0xf3, 0xb0, - 0x84, 0x0d, 0x11, 0xc1, 0xdb, 0x6e, 0x82, 0xa2, 0xec, 0x28, 0x1e, 0x4c, 0xbb, 0xc7, 0x2e, 0xd6, - 0x34, 0x25, 0x79, 0x3a, 0xf0, 0xe6, 0x47, 0xf0, 0x63, 0xed, 0xb8, 0xe3, 0x40, 0x18, 0xae, 0x7e, - 0x11, 0x49, 0x57, 0x45, 0xa6, 0x62, 0x6f, 0x79, 0xfe, 0xe1, 0xf7, 0xcb, 0x3f, 0x89, 0x3f, 0x8e, - 0x4f, 0x2c, 0x93, 0x9a, 0xc7, 0x59, 0x00, 0x26, 0x01, 0x04, 0xcb, 0x67, 0x90, 0x4c, 0xb4, 0xe1, - 0xe5, 0x86, 0x48, 0xa5, 0x12, 0xe1, 0x54, 0x26, 0x60, 0x1e, 0x79, 0x1a, 0x47, 0x2e, 0xb0, 0x5c, - 0x01, 0x0a, 0x3e, 0x1b, 0x04, 0x80, 0x62, 0xc0, 0x23, 0x48, 0xc0, 0x08, 0x84, 0x09, 0x4b, 0x8d, - 0x46, 0xdd, 0x3c, 0xdc, 0xa0, 0xec, 0x2b, 0xca, 0xd2, 0x38, 0x72, 0x81, 0x65, 0x0e, 0x65, 0x25, - 0xda, 0xee, 0x47, 0x12, 0xa7, 0x59, 0xc0, 0x42, 0xad, 0x78, 0xa4, 0x23, 0xcd, 0x0b, 0x43, 0x90, - 0xdd, 0x15, 0x53, 0x31, 0x14, 0xab, 0x8d, 0xb9, 0x7d, 0x54, 0xa5, 0xd4, 0x76, 0x9f, 0xf6, 0xaf, - 0x57, 0x31, 0x59, 0x82, 0x52, 0xc1, 0x37, 0xe0, 0xf8, 0x2f, 0xc0, 0x86, 0x53, 0x50, 0x62, 0x9b, - 0x3b, 0x78, 0x21, 0xfe, 0xfe, 0x95, 0x30, 0x28, 0xc5, 0xc3, 0x65, 0x70, 0x0f, 0x21, 0x5e, 0x00, - 0x8a, 0x89, 0x40, 0x71, 0x2e, 0x2d, 0x36, 0x6f, 0xfc, 0xba, 0x2a, 0xe7, 0xd6, 0xbf, 0x2e, 0xe9, - 0x35, 0x86, 0x8c, 0x55, 0x79, 0x29, 0xe6, 0x68, 0x67, 0x1a, 0xed, 0xcd, 0x57, 0x1d, 0x2f, 0x5f, - 0x75, 0xea, 0x1f, 0xc9, 0xf8, 0xd3, 0xd8, 0xbc, 0xf5, 0x6b, 0x12, 0x41, 0xd9, 0x16, 0xe9, 0xfe, - 0xef, 0x35, 0x86, 0xa7, 0xd5, 0xd4, 0x3f, 0xb6, 0x1d, 0xed, 0x96, 0xe7, 0xd4, 0xce, 0x9c, 0x71, - 0xbc, 0x11, 0x8f, 0xfa, 0xf3, 0x35, 0xf5, 0x16, 0x6b, 0xea, 0x2d, 0xd7, 0xd4, 0x7b, 0xca, 0x29, - 0x99, 0xe7, 0x94, 0x2c, 0x72, 0x4a, 0x96, 0x39, 0x25, 0xaf, 0x39, 0x25, 0xcf, 0x6f, 0xd4, 0xbb, - 0xde, 0x29, 0xbf, 0xf6, 0x3d, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x7e, 0x00, 0x08, 0x5a, 0x02, 0x00, - 0x00, + 0x1c, 0xc6, 0x9b, 0xf7, 0x65, 0x38, 0x3a, 0x04, 0xd9, 0x69, 0xee, 0x90, 0x0d, 0x4f, 0xf3, 0xb0, + 0x84, 0x0d, 0x11, 0xc1, 0xdb, 0x6e, 0x82, 0xa2, 0xec, 0x28, 0x1e, 0x4c, 0xbb, 0xbf, 0x5d, 0xac, + 0x69, 0x4a, 0xf2, 0xef, 0xc0, 0x9b, 0x1f, 0xc1, 0x8f, 0xb5, 0xe3, 0x8e, 0x03, 0x61, 0xb8, 0xf8, + 0x45, 0x24, 0x5d, 0x15, 0x19, 0x0a, 0xbb, 0xf5, 0x79, 0xca, 0xef, 0x97, 0x27, 0x24, 0x1c, 0xa7, + 0x67, 0x96, 0x49, 0xcd, 0xd3, 0x22, 0x02, 0x93, 0x01, 0x82, 0xe5, 0x33, 0xc8, 0x26, 0xda, 0xf0, + 0xea, 0x87, 0xc8, 0xa5, 0x12, 0xf1, 0x54, 0x66, 0x60, 0x9e, 0x79, 0x9e, 0x26, 0xbe, 0xb0, 0x5c, + 0x01, 0x0a, 0x3e, 0x1b, 0x44, 0x80, 0x62, 0xc0, 0x13, 0xc8, 0xc0, 0x08, 0x84, 0x09, 0xcb, 0x8d, + 0x46, 0xdd, 0x3c, 0xde, 0xa0, 0xec, 0x27, 0xca, 0xf2, 0x34, 0xf1, 0x85, 0x65, 0x1e, 0x65, 0x15, + 0xda, 0xee, 0x27, 0x12, 0xa7, 0x45, 0xc4, 0x62, 0xad, 0x78, 0xa2, 0x13, 0xcd, 0x4b, 0x43, 0x54, + 0x3c, 0x94, 0xa9, 0x0c, 0xe5, 0xd7, 0xc6, 0xdc, 0x3e, 0xd9, 0x65, 0xd4, 0xf6, 0x9e, 0xf6, 0xe9, + 0x5f, 0x94, 0x29, 0x32, 0x94, 0x0a, 0xb8, 0x8d, 0xa7, 0xa0, 0xc4, 0x36, 0x77, 0xf4, 0x46, 0xc2, + 0xc3, 0x1b, 0x61, 0x50, 0x8a, 0xa7, 0xeb, 0xe8, 0x11, 0x62, 0xbc, 0x02, 0x14, 0x13, 0x81, 0xe2, + 0x52, 0x5a, 0x6c, 0xde, 0x85, 0x75, 0x55, 0xe5, 0xd6, 0xbf, 0x2e, 0xe9, 0x35, 0x86, 0x8c, 0xed, + 0x72, 0x71, 0xe6, 0x69, 0x6f, 0x1a, 0x1d, 0xcc, 0x57, 0x9d, 0xc0, 0xad, 0x3a, 0xf5, 0xaf, 0x66, + 0xfc, 0x6d, 0x6c, 0xde, 0x87, 0x35, 0x89, 0xa0, 0x6c, 0x8b, 0x74, 0xff, 0xf7, 0x1a, 0xc3, 0xf3, + 0xdd, 0xd4, 0xbf, 0xae, 0x1d, 0xed, 0x57, 0xe7, 0xd4, 0x2e, 0xbc, 0x71, 0xbc, 0x11, 0x8f, 0xfa, + 0xf3, 0x35, 0x0d, 0x16, 0x6b, 0x1a, 0x2c, 0xd7, 0x34, 0x78, 0x71, 0x94, 0xcc, 0x1d, 0x25, 0x0b, + 0x47, 0xc9, 0xd2, 0x51, 0xf2, 0xee, 0x28, 0x79, 0xfd, 0xa0, 0xc1, 0xed, 0x5e, 0xf5, 0x52, 0x9f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x82, 0x5b, 0x80, 0x29, 0x02, 0x00, 0x00, } func (m *PartialObjectMetadataList) Marshal() (dAtA []byte, err error) { diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto index 19606666f..59ce74376 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto @@ -22,7 +22,6 @@ syntax = 'proto2'; package k8s.io.apimachinery.pkg.apis.meta.v1beta1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go index 4b4acd72f..8d11399fb 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go @@ -19,7 +19,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) // GroupName is the group name for this API. @@ -33,12 +32,6 @@ func Kind(kind string) schema.GroupKind { return SchemeGroupVersion.WithKind(kind).GroupKind() } -// scheme is the registry for the common types that adhere to the meta v1beta1 API spec. -var scheme = runtime.NewScheme() - -// ParameterCodec knows about query parameters used with the meta v1beta1 API spec. -var ParameterCodec = runtime.NewParameterCodec(scheme) - // AddMetaToScheme registers base meta types into schemas. func AddMetaToScheme(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, @@ -48,14 +41,5 @@ func AddMetaToScheme(scheme *runtime.Scheme) error { &PartialObjectMetadataList{}, ) - return scheme.AddConversionFuncs( - Convert_Slice_string_To_v1beta1_IncludeObjectPolicy, - ) -} - -func init() { - utilruntime.Must(AddMetaToScheme(scheme)) - - // register manually. This usually goes through the SchemeBuilder, which we cannot use here. - utilruntime.Must(RegisterDefaults(scheme)) + return nil } diff --git a/vendor/k8s.io/apimachinery/pkg/conversion/converter.go b/vendor/k8s.io/apimachinery/pkg/conversion/converter.go index bc615dc3a..7ee233c7e 100644 --- a/vendor/k8s.io/apimachinery/pkg/conversion/converter.go +++ b/vendor/k8s.io/apimachinery/pkg/conversion/converter.go @@ -54,7 +54,8 @@ type Converter struct { generatedConversionFuncs ConversionFuncs // Set of conversions that should be treated as a no-op - ignoredConversions map[typePair]struct{} + ignoredConversions map[typePair]struct{} + ignoredUntypedConversions map[typePair]struct{} // This is a map from a source field type and name, to a list of destination // field type and name. @@ -83,17 +84,23 @@ type Converter struct { // NewConverter creates a new Converter object. func NewConverter(nameFn NameFunc) *Converter { c := &Converter{ - conversionFuncs: NewConversionFuncs(), - generatedConversionFuncs: NewConversionFuncs(), - ignoredConversions: make(map[typePair]struct{}), - nameFunc: nameFn, - structFieldDests: make(map[typeNamePair][]typeNamePair), - structFieldSources: make(map[typeNamePair][]typeNamePair), + conversionFuncs: NewConversionFuncs(), + generatedConversionFuncs: NewConversionFuncs(), + ignoredConversions: make(map[typePair]struct{}), + ignoredUntypedConversions: make(map[typePair]struct{}), + nameFunc: nameFn, + structFieldDests: make(map[typeNamePair][]typeNamePair), + structFieldSources: make(map[typeNamePair][]typeNamePair), inputFieldMappingFuncs: make(map[reflect.Type]FieldMappingFunc), inputDefaultFlags: make(map[reflect.Type]FieldMatchingFlags), } - c.RegisterConversionFunc(Convert_Slice_byte_To_Slice_byte) + c.RegisterUntypedConversionFunc( + (*[]byte)(nil), (*[]byte)(nil), + func(a, b interface{}, s Scope) error { + return Convert_Slice_byte_To_Slice_byte(a.(*[]byte), b.(*[]byte), s) + }, + ) return c } @@ -153,31 +160,14 @@ type FieldMappingFunc func(key string, sourceTag, destTag reflect.StructTag) (so func NewConversionFuncs() ConversionFuncs { return ConversionFuncs{ - fns: make(map[typePair]reflect.Value), untyped: make(map[typePair]ConversionFunc), } } type ConversionFuncs struct { - fns map[typePair]reflect.Value untyped map[typePair]ConversionFunc } -// Add adds the provided conversion functions to the lookup table - they must have the signature -// `func(type1, type2, Scope) error`. Functions are added in the order passed and will override -// previously registered pairs. -func (c ConversionFuncs) Add(fns ...interface{}) error { - for _, fn := range fns { - fv := reflect.ValueOf(fn) - ft := fv.Type() - if err := verifyConversionFunctionSignature(ft); err != nil { - return err - } - c.fns[typePair{ft.In(0).Elem(), ft.In(1).Elem()}] = fv - } - return nil -} - // AddUntyped adds the provided conversion function to the lookup table for the types that are // supplied as a and b. a and b must be pointers or an error is returned. This method overwrites // previously defined functions. @@ -197,12 +187,6 @@ func (c ConversionFuncs) AddUntyped(a, b interface{}, fn ConversionFunc) error { // both other and c, with other conversions taking precedence. func (c ConversionFuncs) Merge(other ConversionFuncs) ConversionFuncs { merged := NewConversionFuncs() - for k, v := range c.fns { - merged.fns[k] = v - } - for k, v := range other.fns { - merged.fns[k] = v - } for k, v := range c.untyped { merged.untyped[k] = v } @@ -360,29 +344,6 @@ func verifyConversionFunctionSignature(ft reflect.Type) error { return nil } -// RegisterConversionFunc registers a conversion func with the -// Converter. conversionFunc must take three parameters: a pointer to the input -// type, a pointer to the output type, and a conversion.Scope (which should be -// used if recursive conversion calls are desired). It must return an error. -// -// Example: -// c.RegisterConversionFunc( -// func(in *Pod, out *v1.Pod, s Scope) error { -// // conversion logic... -// return nil -// }) -// DEPRECATED: Will be removed in favor of RegisterUntypedConversionFunc -func (c *Converter) RegisterConversionFunc(conversionFunc interface{}) error { - return c.conversionFuncs.Add(conversionFunc) -} - -// Similar to RegisterConversionFunc, but registers conversion function that were -// automatically generated. -// DEPRECATED: Will be removed in favor of RegisterGeneratedUntypedConversionFunc -func (c *Converter) RegisterGeneratedConversionFunc(conversionFunc interface{}) error { - return c.generatedConversionFuncs.Add(conversionFunc) -} - // RegisterUntypedConversionFunc registers a function that converts between a and b by passing objects of those // types to the provided function. The function *must* accept objects of a and b - this machinery will not enforce // any other guarantee. @@ -409,6 +370,7 @@ func (c *Converter) RegisterIgnoredConversion(from, to interface{}) error { return fmt.Errorf("expected pointer arg for 'to' param 1, got: %v", typeTo) } c.ignoredConversions[typePair{typeFrom.Elem(), typeTo.Elem()}] = struct{}{} + c.ignoredUntypedConversions[typePair{typeFrom, typeTo}] = struct{}{} return nil } @@ -491,6 +453,11 @@ func (c *Converter) doConversion(src, dest interface{}, flags FieldMatchingFlags flags: flags, meta: meta, } + + // ignore conversions of this type + if _, ok := c.ignoredUntypedConversions[pair]; ok { + return nil + } if fn, ok := c.conversionFuncs.untyped[pair]; ok { return fn(src, dest, scope) } @@ -517,33 +484,20 @@ func (c *Converter) doConversion(src, dest interface{}, flags FieldMatchingFlags return f(sv, dv, scope) } -// callCustom calls 'custom' with sv & dv. custom must be a conversion function. -func (c *Converter) callCustom(sv, dv, custom reflect.Value, scope *scope) error { - if !sv.CanAddr() { - sv2 := reflect.New(sv.Type()) - sv2.Elem().Set(sv) - sv = sv2 - } else { - sv = sv.Addr() - } +// callUntyped calls predefined conversion func. +func (c *Converter) callUntyped(sv, dv reflect.Value, f ConversionFunc, scope *scope) error { if !dv.CanAddr() { - if !dv.CanSet() { - return scope.errorf("can't addr or set dest.") - } - dvOrig := dv - dv := reflect.New(dvOrig.Type()) - defer func() { dvOrig.Set(dv) }() - } else { - dv = dv.Addr() + return scope.errorf("cant addr dest") } - args := []reflect.Value{sv, dv, reflect.ValueOf(scope)} - ret := custom.Call(args)[0].Interface() - // This convolution is necessary because nil interfaces won't convert - // to errors. - if ret == nil { - return nil + var svPointer reflect.Value + if sv.CanAddr() { + svPointer = sv.Addr() + } else { + svPointer = reflect.New(sv.Type()) + svPointer.Elem().Set(sv) } - return ret.(error) + dvPointer := dv.Addr() + return f(svPointer.Interface(), dvPointer.Interface(), scope) } // convert recursively copies sv into dv, calling an appropriate conversion function if @@ -561,17 +515,12 @@ func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error { } // Convert sv to dv. - if fv, ok := c.conversionFuncs.fns[pair]; ok { - if c.Debug != nil { - c.Debug.Logf("Calling custom conversion of '%v' to '%v'", st, dt) - } - return c.callCustom(sv, dv, fv, scope) + pair = typePair{reflect.PtrTo(sv.Type()), reflect.PtrTo(dv.Type())} + if f, ok := c.conversionFuncs.untyped[pair]; ok { + return c.callUntyped(sv, dv, f, scope) } - if fv, ok := c.generatedConversionFuncs.fns[pair]; ok { - if c.Debug != nil { - c.Debug.Logf("Calling generated conversion of '%v' to '%v'", st, dt) - } - return c.callCustom(sv, dv, fv, scope) + if f, ok := c.generatedConversionFuncs.untyped[pair]; ok { + return c.callUntyped(sv, dv, f, scope) } return c.defaultConvert(sv, dv, scope) diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go b/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go index 0947dce73..d04d701f3 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go @@ -53,14 +53,6 @@ func JSONKeyMapper(key string, sourceTag, destTag reflect.StructTag) (string, st return key, key } -// DefaultStringConversions are helpers for converting []string and string to real values. -var DefaultStringConversions = []interface{}{ - Convert_Slice_string_To_string, - Convert_Slice_string_To_int, - Convert_Slice_string_To_bool, - Convert_Slice_string_To_int64, -} - func Convert_Slice_string_To_string(in *[]string, out *string, s conversion.Scope) error { if len(*in) == 0 { *out = "" @@ -178,3 +170,27 @@ func Convert_Slice_string_To_Pointer_int64(in *[]string, out **int64, s conversi *out = &i return nil } + +func RegisterStringConversions(s *Scheme) error { + if err := s.AddConversionFunc((*[]string)(nil), (*string)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_Slice_string_To_string(a.(*[]string), b.(*string), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*[]string)(nil), (*int)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_Slice_string_To_int(a.(*[]string), b.(*int), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*[]string)(nil), (*bool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_Slice_string_To_bool(a.(*[]string), b.(*bool), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*[]string)(nil), (*int64)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_Slice_string_To_int64(a.(*[]string), b.(*int64), scope) + }); err != nil { + return err + } + return nil +} diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go b/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go index db11eb8bc..7251e65f6 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go @@ -134,9 +134,16 @@ func Convert_runtime_RawExtension_To_runtime_Object(in *RawExtension, out *Objec return nil } -func DefaultEmbeddedConversions() []interface{} { - return []interface{}{ - Convert_runtime_Object_To_runtime_RawExtension, - Convert_runtime_RawExtension_To_runtime_Object, +func RegisterEmbeddedConversions(s *Scheme) error { + if err := s.AddConversionFunc((*Object)(nil), (*RawExtension)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_runtime_Object_To_runtime_RawExtension(a.(*Object), b.(*RawExtension), scope) + }); err != nil { + return err } + if err := s.AddConversionFunc((*RawExtension)(nil), (*Object)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_runtime_RawExtension_To_runtime_Object(a.(*RawExtension), b.(*Object), scope) + }); err != nil { + return err + } + return nil } diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go b/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go index fd37e293a..4b739ec38 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go @@ -102,10 +102,10 @@ func NewScheme() *Scheme { } s.converter = conversion.NewConverter(s.nameFunc) - utilruntime.Must(s.AddConversionFuncs(DefaultEmbeddedConversions()...)) + // Enable couple default conversions by default. + utilruntime.Must(RegisterEmbeddedConversions(s)) + utilruntime.Must(RegisterStringConversions(s)) - // Enable map[string][]string conversions by default - utilruntime.Must(s.AddConversionFuncs(DefaultStringConversions...)) utilruntime.Must(s.RegisterInputDefaults(&map[string][]string{}, JSONKeyMapper, conversion.AllowDifferentFieldTypeNames|conversion.IgnoreMissingFields)) utilruntime.Must(s.RegisterInputDefaults(&url.Values{}, JSONKeyMapper, conversion.AllowDifferentFieldTypeNames|conversion.IgnoreMissingFields)) return s @@ -308,45 +308,6 @@ func (s *Scheme) AddIgnoredConversionType(from, to interface{}) error { return s.converter.RegisterIgnoredConversion(from, to) } -// AddConversionFuncs adds functions to the list of conversion functions. The given -// functions should know how to convert between two of your API objects, or their -// sub-objects. We deduce how to call these functions from the types of their two -// parameters; see the comment for Converter.Register. -// -// Note that, if you need to copy sub-objects that didn't change, you can use the -// conversion.Scope object that will be passed to your conversion function. -// Additionally, all conversions started by Scheme will set the SrcVersion and -// DestVersion fields on the Meta object. Example: -// -// s.AddConversionFuncs( -// func(in *InternalObject, out *ExternalObject, scope conversion.Scope) error { -// // You can depend on Meta() being non-nil, and this being set to -// // the source version, e.g., "" -// s.Meta().SrcVersion -// // You can depend on this being set to the destination version, -// // e.g., "v1". -// s.Meta().DestVersion -// // Call scope.Convert to copy sub-fields. -// s.Convert(&in.SubFieldThatMoved, &out.NewLocation.NewName, 0) -// return nil -// }, -// ) -// -// (For more detail about conversion functions, see Converter.Register's comment.) -// -// Also note that the default behavior, if you don't add a conversion function, is to -// sanely copy fields that have the same names and same type names. It's OK if the -// destination type has extra fields, but it must not remove any. So you only need to -// add conversion functions for things with changed/removed fields. -func (s *Scheme) AddConversionFuncs(conversionFuncs ...interface{}) error { - for _, f := range conversionFuncs { - if err := s.converter.RegisterConversionFunc(f); err != nil { - return err - } - } - return nil -} - // AddConversionFunc registers a function that converts between a and b by passing objects of those // types to the provided function. The function *must* accept objects of a and b - this machinery will not enforce // any other guarantee. diff --git a/vendor/k8s.io/apimachinery/pkg/util/clock/clock.go b/vendor/k8s.io/apimachinery/pkg/util/clock/clock.go index 1689e62e8..6cf13d83d 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/clock/clock.go +++ b/vendor/k8s.io/apimachinery/pkg/util/clock/clock.go @@ -52,23 +52,26 @@ func (RealClock) Since(ts time.Time) time.Duration { return time.Since(ts) } -// Same as time.After(d). +// After is the same as time.After(d). func (RealClock) After(d time.Duration) <-chan time.Time { return time.After(d) } +// NewTimer returns a new Timer. func (RealClock) NewTimer(d time.Duration) Timer { return &realTimer{ timer: time.NewTimer(d), } } +// NewTicker returns a new Ticker. func (RealClock) NewTicker(d time.Duration) Ticker { return &realTicker{ ticker: time.NewTicker(d), } } +// Sleep pauses the RealClock for duration d. func (RealClock) Sleep(d time.Duration) { time.Sleep(d) } @@ -94,12 +97,14 @@ type fakeClockWaiter struct { destChan chan time.Time } +// NewFakePassiveClock returns a new FakePassiveClock. func NewFakePassiveClock(t time.Time) *FakePassiveClock { return &FakePassiveClock{ time: t, } } +// NewFakeClock returns a new FakeClock func NewFakeClock(t time.Time) *FakeClock { return &FakeClock{ FakePassiveClock: *NewFakePassiveClock(t), @@ -120,14 +125,14 @@ func (f *FakePassiveClock) Since(ts time.Time) time.Duration { return f.time.Sub(ts) } -// Sets the time. +// SetTime sets the time on the FakePassiveClock. func (f *FakePassiveClock) SetTime(t time.Time) { f.lock.Lock() defer f.lock.Unlock() f.time = t } -// Fake version of time.After(d). +// After is the Fake version of time.After(d). func (f *FakeClock) After(d time.Duration) <-chan time.Time { f.lock.Lock() defer f.lock.Unlock() @@ -140,7 +145,7 @@ func (f *FakeClock) After(d time.Duration) <-chan time.Time { return ch } -// Fake version of time.NewTimer(d). +// NewTimer is the Fake version of time.NewTimer(d). func (f *FakeClock) NewTimer(d time.Duration) Timer { f.lock.Lock() defer f.lock.Unlock() @@ -157,6 +162,7 @@ func (f *FakeClock) NewTimer(d time.Duration) Timer { return timer } +// NewTicker returns a new Ticker. func (f *FakeClock) NewTicker(d time.Duration) Ticker { f.lock.Lock() defer f.lock.Unlock() @@ -174,14 +180,14 @@ func (f *FakeClock) NewTicker(d time.Duration) Ticker { } } -// Move clock by Duration, notify anyone that's called After, Tick, or NewTimer +// Step moves clock by Duration, notifies anyone that's called After, Tick, or NewTimer func (f *FakeClock) Step(d time.Duration) { f.lock.Lock() defer f.lock.Unlock() f.setTimeLocked(f.time.Add(d)) } -// Sets the time. +// SetTime sets the time on a FakeClock. func (f *FakeClock) SetTime(t time.Time) { f.lock.Lock() defer f.lock.Unlock() @@ -219,7 +225,7 @@ func (f *FakeClock) setTimeLocked(t time.Time) { f.waiters = newWaiters } -// Returns true if After has been called on f but not yet satisfied (so you can +// HasWaiters returns true if After has been called on f but not yet satisfied (so you can // write race-free tests). func (f *FakeClock) HasWaiters() bool { f.lock.RLock() @@ -227,6 +233,7 @@ func (f *FakeClock) HasWaiters() bool { return len(f.waiters) > 0 } +// Sleep pauses the FakeClock for duration d. func (f *FakeClock) Sleep(d time.Duration) { f.Step(d) } @@ -248,24 +255,25 @@ func (i *IntervalClock) Since(ts time.Time) time.Duration { return i.Time.Sub(ts) } -// Unimplemented, will panic. +// After is currently unimplemented, will panic. // TODO: make interval clock use FakeClock so this can be implemented. func (*IntervalClock) After(d time.Duration) <-chan time.Time { panic("IntervalClock doesn't implement After") } -// Unimplemented, will panic. +// NewTimer is currently unimplemented, will panic. // TODO: make interval clock use FakeClock so this can be implemented. func (*IntervalClock) NewTimer(d time.Duration) Timer { panic("IntervalClock doesn't implement NewTimer") } -// Unimplemented, will panic. +// NewTicker is currently unimplemented, will panic. // TODO: make interval clock use FakeClock so this can be implemented. func (*IntervalClock) NewTicker(d time.Duration) Ticker { panic("IntervalClock doesn't implement NewTicker") } +// Sleep is currently unimplemented; will panic. func (*IntervalClock) Sleep(d time.Duration) { panic("IntervalClock doesn't implement Sleep") } @@ -355,6 +363,7 @@ func (f *fakeTimer) Reset(d time.Duration) bool { return false } +// Ticker defines the Ticker interface type Ticker interface { C() <-chan time.Time Stop() diff --git a/vendor/k8s.io/apimachinery/pkg/watch/watch.go b/vendor/k8s.io/apimachinery/pkg/watch/watch.go index 3945be3ae..988aba3ed 100644 --- a/vendor/k8s.io/apimachinery/pkg/watch/watch.go +++ b/vendor/k8s.io/apimachinery/pkg/watch/watch.go @@ -90,7 +90,7 @@ func (w emptyWatch) ResultChan() <-chan Event { // FakeWatcher lets you test anything that consumes a watch.Interface; threadsafe. type FakeWatcher struct { result chan Event - Stopped bool + stopped bool sync.Mutex } @@ -110,24 +110,24 @@ func NewFakeWithChanSize(size int, blocking bool) *FakeWatcher { func (f *FakeWatcher) Stop() { f.Lock() defer f.Unlock() - if !f.Stopped { + if !f.stopped { klog.V(4).Infof("Stopping fake watcher.") close(f.result) - f.Stopped = true + f.stopped = true } } func (f *FakeWatcher) IsStopped() bool { f.Lock() defer f.Unlock() - return f.Stopped + return f.stopped } // Reset prepares the watcher to be reused. func (f *FakeWatcher) Reset() { f.Lock() defer f.Unlock() - f.Stopped = false + f.stopped = false f.result = make(chan Event) } diff --git a/vendor/k8s.io/apiserver/go.mod b/vendor/k8s.io/apiserver/go.mod index d77582e8b..0aa156d1c 100644 --- a/vendor/k8s.io/apiserver/go.mod +++ b/vendor/k8s.io/apiserver/go.mod @@ -2,7 +2,7 @@ module k8s.io/apiserver -go 1.12 +go 1.13 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect @@ -38,16 +38,17 @@ require ( go.uber.org/zap v1.10.0 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect google.golang.org/grpc v1.23.1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.17.1 - k8s.io/apimachinery v0.17.1 - k8s.io/client-go v0.17.1 - k8s.io/component-base v0.17.1 + k8s.io/api v0.18.0-alpha.1 + k8s.io/apimachinery v0.18.0-alpha.1 + k8s.io/client-go v0.18.0-alpha.1 + k8s.io/component-base v0.18.0-alpha.1 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a k8s.io/utils v0.0.0-20191114184206-e782cd3c129f @@ -58,8 +59,8 @@ require ( replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.17.1 - k8s.io/apimachinery => k8s.io/apimachinery v0.17.1 - k8s.io/client-go => k8s.io/client-go v0.17.1 - k8s.io/component-base => k8s.io/component-base v0.17.1 + k8s.io/api => k8s.io/api v0.18.0-alpha.1 + k8s.io/apimachinery => k8s.io/apimachinery v0.18.0-alpha.1 + k8s.io/client-go => k8s.io/client-go v0.18.0-alpha.1 + k8s.io/component-base => k8s.io/component-base v0.18.0-alpha.1 ) diff --git a/vendor/k8s.io/apiserver/pkg/server/httplog/httplog.go b/vendor/k8s.io/apiserver/pkg/server/httplog/httplog.go index e529edabe..156fa16f3 100644 --- a/vendor/k8s.io/apiserver/pkg/server/httplog/httplog.go +++ b/vendor/k8s.io/apiserver/pkg/server/httplog/httplog.go @@ -158,7 +158,7 @@ func (rl *respLogger) Log() { latency := time.Since(rl.startTime) if klog.V(3) { if !rl.hijacked { - klog.InfoDepth(1, fmt.Sprintf("%s %s: (%v) %v%v%v [%s %s]", rl.req.Method, rl.req.RequestURI, latency, rl.status, rl.statusStack, rl.addedInfo, rl.req.UserAgent(), rl.req.RemoteAddr)) + klog.InfoDepth(1, fmt.Sprintf("%s %s: (%v) %v [%s %s]%v%v", rl.req.Method, rl.req.RequestURI, latency, rl.status, rl.req.UserAgent(), rl.req.RemoteAddr, rl.statusStack, rl.addedInfo)) } else { klog.InfoDepth(1, fmt.Sprintf("%s %s: (%v) hijacked [%s %s]", rl.req.Method, rl.req.RequestURI, latency, rl.req.UserAgent(), rl.req.RemoteAddr)) } diff --git a/vendor/k8s.io/client-go/README.md b/vendor/k8s.io/client-go/README.md index 44499b51b..890c683ee 100644 --- a/vendor/k8s.io/client-go/README.md +++ b/vendor/k8s.io/client-go/README.md @@ -2,7 +2,8 @@ Go clients for talking to a [kubernetes](http://kubernetes.io/) cluster. -We recommend using the `kubernetes-1.x.y` tag matching the current Kubernetes release (`kubernetes-1.15.3` at the time this was written). +We recommend using the `v0.x.y` tags for Kubernetes releases >= `v1.17.0` and +`kubernetes-1.x.y` tags for Kubernetes releases < `v1.17.0`. See [INSTALL.md](/INSTALL.md) for detailed installation instructions. `go get k8s.io/client-go@master` works, but will fetch `master`, which may be less stable than a tagged release. @@ -44,42 +45,31 @@ See [INSTALL.md](/INSTALL.md) for detailed installation instructions. ### Versioning -`client-go` follows [semver](http://semver.org/). We will not make -backwards-incompatible changes without incrementing the major version number. A -change is backwards-incompatible either if it *i)* changes the public interfaces -of `client-go`, or *ii)* makes `client-go` incompatible with otherwise supported -versions of Kubernetes clusters. +- For each `v1.x.y` Kubernetes release, the major version (first digit) +would remain `0`. -Changes that add features in a backwards-compatible way will result in bumping -the minor version (second digit) number. - -Bugfixes will result in the patch version (third digit) changing. PRs that are +- Bugfixes will result in the patch version (third digit) changing. PRs that are cherry-picked into an older Kubernetes release branch will result in an update to the corresponding branch in `client-go`, with a corresponding new tag changing the patch version. -A consequence of this is that `client-go` version numbers will be unrelated to -Kubernetes version numbers. - #### Branches and tags. -We will create a new branch and tag for each increment in the major version number or -minor version number. We will create only a new tag for each increment in the patch +We will create a new branch and tag for each increment in the minor version +number. We will create only a new tag for each increment in the patch version number. See [semver](http://semver.org/) for definitions of major, minor, and patch. -The master branch will track HEAD in the main Kubernetes repo and -accumulate changes. Consider HEAD to have the version `x.(y+1).0-alpha` or -`(x+1).0.0-alpha` (depending on whether it has accumulated a breaking change or -not), where `x` and `y` are the current major and minor versions. +The HEAD of the master branch in client-go will track the HEAD of the master +branch in the main Kubernetes repo. #### Compatibility: your code <-> client-go -`client-go` follows [semver](http://semver.org/), so until the major version of -client-go gets increased, your code will compile and will continue to work with -explicitly supported versions of Kubernetes clusters. You must use a dependency -management system and pin a specific major version of `client-go` to get this -benefit, as HEAD follows the upstream Kubernetes repo. +The `v0.x.y` tags indicate that go APIs may change in incompatible ways in +different versions. + +See [INSTALL.md](INSTALL.md) for guidelines on requiring a specific +version of client-go. #### Compatibility: client-go <-> Kubernetes clusters @@ -92,16 +82,12 @@ We will backport bugfixes--but not new features--into older versions of #### Compatibility matrix -| | Kubernetes 1.9 | Kubernetes 1.10 | Kubernetes 1.11 | Kubernetes 1.12 | Kubernetes 1.13 | Kubernetes 1.14 | Kubernetes 1.15 | -|---------------------|----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------| -| client-go 6.0 | ✓ | +- | +- | +- | +- | +- | +- | -| client-go 7.0 | +- | ✓ | +- | +- | +- | +- | +- | -| client-go 8.0 | +- | +- | ✓ | +- | +- | +- | +- | -| client-go 9.0 | +- | +- | +- | ✓ | +- | +- | +- | -| client-go 10.0 | +- | +- | +- | +- | ✓ | +- | +- | -| client-go 11.0 | +- | +- | +- | +- | +- | ✓ | +- | -| client-go 12.0 | +- | +- | +- | +- | +- | +- | ✓ | -| client-go HEAD | +- | +- | +- | +- | +- | +- | +- | +| | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | +|-------------------------------|-----------------|-----------------|-----------------| +| `kubernetes-1.15.0` | ✓ | +- | +- | +| `kubernetes-1.16.0` | +- | ✓ | +- | +| `kubernetes-1.17.0`/`v0.17.0` | +- | +- | ✓ | +| `HEAD` | +- | +- | +- | Key: @@ -122,19 +108,21 @@ between client-go versions. | Branch | Canonical source code location | Maintenance status | |----------------|--------------------------------------|-------------------------------| -| client-go 1.4 | Kubernetes main repo, 1.4 branch | = - | -| client-go 1.5 | Kubernetes main repo, 1.5 branch | = - | -| client-go 2.0 | Kubernetes main repo, 1.5 branch | = - | -| client-go 3.0 | Kubernetes main repo, 1.6 branch | = - | -| client-go 4.0 | Kubernetes main repo, 1.7 branch | = - | -| client-go 5.0 | Kubernetes main repo, 1.8 branch | = - | -| client-go 6.0 | Kubernetes main repo, 1.9 branch | = - | -| client-go 7.0 | Kubernetes main repo, 1.10 branch | = - | -| client-go 8.0 | Kubernetes main repo, 1.11 branch | =- | -| client-go 9.0 | Kubernetes main repo, 1.12 branch | =- | -| client-go 10.0 | Kubernetes main repo, 1.13 branch | ✓ | -| client-go 11.0 | Kubernetes main repo, 1.14 branch | ✓ | -| client-go 12.0 | Kubernetes main repo, 1.15 branch | ✓ | +| `release-1.4` | Kubernetes main repo, 1.4 branch | = - | +| `release-1.5` | Kubernetes main repo, 1.5 branch | = - | +| `release-2.0` | Kubernetes main repo, 1.5 branch | = - | +| `release-3.0` | Kubernetes main repo, 1.6 branch | = - | +| `release-4.0` | Kubernetes main repo, 1.7 branch | = - | +| `release-5.0` | Kubernetes main repo, 1.8 branch | = - | +| `release-6.0` | Kubernetes main repo, 1.9 branch | = - | +| `release-7.0` | Kubernetes main repo, 1.10 branch | = - | +| `release-8.0` | Kubernetes main repo, 1.11 branch | =- | +| `release-9.0` | Kubernetes main repo, 1.12 branch | =- | +| `release-10.0` | Kubernetes main repo, 1.13 branch | =- | +| `release-11.0` | Kubernetes main repo, 1.14 branch | ✓ | +| `release-12.0` | Kubernetes main repo, 1.15 branch | ✓ | +| `release-13.0` | Kubernetes main repo, 1.16 branch | ✓ | +| `release-14.0` | Kubernetes main repo, 1.17 branch | ✓ | | client-go HEAD | Kubernetes main repo, master branch | ✓ | Key: @@ -161,14 +149,19 @@ existing users won't be broken. This repository is still a mirror of [k8s.io/kubernetes/staging/src/client-go](https://github.com/kubernetes/kubernetes/tree/master/staging/src/k8s.io/client-go), -the code development is still done in the staging area. Since Kubernetes 1.8 -release, when syncing the code from the staging area, we also sync the Kubernetes -version tags to client-go, prefixed with "kubernetes-". For example, if you check -out the `kubernetes-1.15.3` tag in client-go, the code you get is exactly the -same as if you check out the `v1.15.3` tag in Kubernetes, and change directory to -`staging/src/k8s.io/client-go`. The purpose is to let users quickly find matching -commits among published repos, like -[sample-apiserver](https://github.com/kubernetes/sample-apiserver), +the code development is still done in the staging area. + +Since Kubernetes `v1.8.0`, when syncing the code from the staging area, +we also sync the Kubernetes version tags to client-go, prefixed with +`kubernetes-`. From Kubernetes `v1.17.0`, we also create matching semver +`v0.x.y` tags for each `v1.x.y` Kubernetes release. + +For example, if you check out the `kubernetes-1.17.0` or the `v0.17.0` tag in +client-go, the code you get is exactly the same as if you check out the `v1.17.0` +tag in Kubernetes, and change directory to `staging/src/k8s.io/client-go`. + +The purpose is to let users quickly find matching commits among published repos, +like [sample-apiserver](https://github.com/kubernetes/sample-apiserver), [apiextension-apiserver](https://github.com/kubernetes/apiextensions-apiserver), etc. The Kubernetes version tag does NOT claim any backwards compatibility guarantees for client-go. Please check the [semantic versions](#versioning) if @@ -179,7 +172,7 @@ you care about backwards compatibility. Use go1.11+ and fetch the desired version using the `go get` command. For example: ``` -go get k8s.io/client-go@kubernetes-1.15.3 +go get k8s.io/client-go@v0.17.0 ``` See [INSTALL.md](/INSTALL.md) for detailed instructions. diff --git a/vendor/k8s.io/client-go/go.mod b/vendor/k8s.io/client-go/go.mod index 7ddb715d6..c9276406b 100644 --- a/vendor/k8s.io/client-go/go.mod +++ b/vendor/k8s.io/client-go/go.mod @@ -2,7 +2,7 @@ module k8s.io/client-go -go 1.12 +go 1.13 require ( cloud.google.com/go v0.38.0 // indirect @@ -28,8 +28,8 @@ require ( golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.17.1 - k8s.io/apimachinery v0.17.1 + k8s.io/api v0.18.0-alpha.1 + k8s.io/apimachinery v0.18.0-alpha.1 k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f sigs.k8s.io/yaml v1.1.0 @@ -38,6 +38,6 @@ require ( replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.17.1 - k8s.io/apimachinery => k8s.io/apimachinery v0.17.1 + k8s.io/api => k8s.io/api v0.18.0-alpha.1 + k8s.io/apimachinery => k8s.io/apimachinery v0.18.0-alpha.1 ) diff --git a/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go b/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go index 741729bb5..71ed045ac 100644 --- a/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go +++ b/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go @@ -20,6 +20,7 @@ import ( "bytes" "context" "crypto/tls" + "crypto/x509" "errors" "fmt" "io" @@ -42,6 +43,7 @@ import ( "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1" "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1" "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/client-go/tools/metrics" "k8s.io/client-go/transport" "k8s.io/client-go/util/connrotation" "k8s.io/klog" @@ -260,6 +262,7 @@ func (a *Authenticator) cert() (*tls.Certificate, error) { func (a *Authenticator) getCreds() (*credentials, error) { a.mu.Lock() defer a.mu.Unlock() + if a.cachedCreds != nil && !a.credsExpired() { return a.cachedCreds, nil } @@ -267,6 +270,7 @@ func (a *Authenticator) getCreds() (*credentials, error) { if err := a.refreshCredsLocked(nil); err != nil { return nil, err } + return a.cachedCreds, nil } @@ -355,6 +359,17 @@ func (a *Authenticator) refreshCredsLocked(r *clientauthentication.Response) err if err != nil { return fmt.Errorf("failed parsing client key/certificate: %v", err) } + + // Leaf is initialized to be nil: + // https://golang.org/pkg/crypto/tls/#X509KeyPair + // Leaf certificate is the first certificate: + // https://golang.org/pkg/crypto/tls/#Certificate + // Populating leaf is useful for quickly accessing the underlying x509 + // certificate values. + cert.Leaf, err = x509.ParseCertificate(cert.Certificate[0]) + if err != nil { + return fmt.Errorf("failed parsing client leaf certificate: %v", err) + } newCreds.cert = &cert } @@ -362,10 +377,20 @@ func (a *Authenticator) refreshCredsLocked(r *clientauthentication.Response) err a.cachedCreds = newCreds // Only close all connections when TLS cert rotates. Token rotation doesn't // need the extra noise. - if len(a.onRotateList) > 0 && oldCreds != nil && !reflect.DeepEqual(oldCreds.cert, a.cachedCreds.cert) { + if oldCreds != nil && !reflect.DeepEqual(oldCreds.cert, a.cachedCreds.cert) { + // Can be nil if the exec auth plugin only returned token auth. + if oldCreds.cert != nil && oldCreds.cert.Leaf != nil { + metrics.ClientCertRotationAge.Observe(time.Now().Sub(oldCreds.cert.Leaf.NotBefore)) + } for _, onRotate := range a.onRotateList { onRotate() } } + + expiry := time.Time{} + if a.cachedCreds.cert != nil && a.cachedCreds.cert.Leaf != nil { + expiry = a.cachedCreds.cert.Leaf.NotAfter + } + expirationMetrics.set(a, expiry) return nil } diff --git a/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/metrics.go b/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/metrics.go new file mode 100644 index 000000000..caf0cca3e --- /dev/null +++ b/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/metrics.go @@ -0,0 +1,60 @@ +/* +Copyright 2018 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package exec + +import ( + "sync" + "time" + + "k8s.io/client-go/tools/metrics" +) + +type certificateExpirationTracker struct { + mu sync.RWMutex + m map[*Authenticator]time.Time + metricSet func(*time.Time) +} + +var expirationMetrics = &certificateExpirationTracker{ + m: map[*Authenticator]time.Time{}, + metricSet: func(e *time.Time) { + metrics.ClientCertExpiry.Set(e) + }, +} + +// set stores the given expiration time and updates the updates the certificate +// expiry metric to the earliest expiration time. +func (c *certificateExpirationTracker) set(a *Authenticator, t time.Time) { + c.mu.Lock() + defer c.mu.Unlock() + c.m[a] = t + + earliest := time.Time{} + for _, t := range c.m { + if t.IsZero() { + continue + } + if earliest.IsZero() || earliest.After(t) { + earliest = t + } + } + if earliest.IsZero() { + c.metricSet(nil) + } else { + c.metricSet(&earliest) + } +} diff --git a/vendor/k8s.io/client-go/rest/request.go b/vendor/k8s.io/client-go/rest/request.go index 9e0c26110..51b76e305 100644 --- a/vendor/k8s.io/client-go/rest/request.go +++ b/vendor/k8s.io/client-go/rest/request.go @@ -562,7 +562,7 @@ func (r *Request) tryThrottle() error { } if latency := time.Since(now); latency > longThrottleLatency { - klog.V(4).Infof("Throttling request took %v, request: %s:%s", latency, r.verb, r.URL().String()) + klog.V(3).Infof("Throttling request took %v, request: %s:%s", latency, r.verb, r.URL().String()) } return err @@ -806,19 +806,24 @@ func (r *Request) request(fn func(*http.Request, *http.Response)) error { r.backoff.UpdateBackoff(r.URL(), err, resp.StatusCode) } if err != nil { - // "Connection reset by peer" is usually a transient error. + // "Connection reset by peer", "Connection refused" or "apiserver is shutting down" are usually a transient errors. // Thus in case of "GET" operations, we simply retry it. // We are not automatically retrying "write" operations, as // they are not idempotent. - if !net.IsConnectionReset(err) || r.verb != "GET" { + if r.verb != "GET" { return err } - // For the purpose of retry, we set the artificial "retry-after" response. - // TODO: Should we clean the original response if it exists? - resp = &http.Response{ - StatusCode: http.StatusInternalServerError, - Header: http.Header{"Retry-After": []string{"1"}}, - Body: ioutil.NopCloser(bytes.NewReader([]byte{})), + // For connection errors and apiserver shutdown errors retry. + if net.IsConnectionReset(err) || net.IsConnectionRefused(err) { + // For the purpose of retry, we set the artificial "retry-after" response. + // TODO: Should we clean the original response if it exists? + resp = &http.Response{ + StatusCode: http.StatusInternalServerError, + Header: http.Header{"Retry-After": []string{"1"}}, + Body: ioutil.NopCloser(bytes.NewReader([]byte{})), + } + } else { + return err } } diff --git a/vendor/k8s.io/client-go/tools/metrics/metrics.go b/vendor/k8s.io/client-go/tools/metrics/metrics.go index a01306c65..6a8f25a94 100644 --- a/vendor/k8s.io/client-go/tools/metrics/metrics.go +++ b/vendor/k8s.io/client-go/tools/metrics/metrics.go @@ -26,6 +26,16 @@ import ( var registerMetrics sync.Once +// DurationMetric is a measurement of some amount of time. +type DurationMetric interface { + Observe(duration time.Duration) +} + +// ExpiryMetric sets some time of expiry. If nil, assume not relevant. +type ExpiryMetric interface { + Set(expiry *time.Time) +} + // LatencyMetric observes client latency partitioned by verb and url. type LatencyMetric interface { Observe(verb string, u url.URL, latency time.Duration) @@ -37,21 +47,51 @@ type ResultMetric interface { } var ( + // ClientCertExpiry is the expiry time of a client certificate + ClientCertExpiry ExpiryMetric = noopExpiry{} + // ClientCertRotationAge is the age of a certificate that has just been rotated. + ClientCertRotationAge DurationMetric = noopDuration{} // RequestLatency is the latency metric that rest clients will update. RequestLatency LatencyMetric = noopLatency{} // RequestResult is the result metric that rest clients will update. RequestResult ResultMetric = noopResult{} ) +// RegisterOpts contains all the metrics to register. Metrics may be nil. +type RegisterOpts struct { + ClientCertExpiry ExpiryMetric + ClientCertRotationAge DurationMetric + RequestLatency LatencyMetric + RequestResult ResultMetric +} + // Register registers metrics for the rest client to use. This can // only be called once. -func Register(lm LatencyMetric, rm ResultMetric) { +func Register(opts RegisterOpts) { registerMetrics.Do(func() { - RequestLatency = lm - RequestResult = rm + if opts.ClientCertExpiry != nil { + ClientCertExpiry = opts.ClientCertExpiry + } + if opts.ClientCertRotationAge != nil { + ClientCertRotationAge = opts.ClientCertRotationAge + } + if opts.RequestLatency != nil { + RequestLatency = opts.RequestLatency + } + if opts.RequestResult != nil { + RequestResult = opts.RequestResult + } }) } +type noopDuration struct{} + +func (noopDuration) Observe(time.Duration) {} + +type noopExpiry struct{} + +func (noopExpiry) Set(*time.Time) {} + type noopLatency struct{} func (noopLatency) Observe(string, url.URL, time.Duration) {} diff --git a/vendor/k8s.io/cri-api/go.mod b/vendor/k8s.io/cri-api/go.mod index 6f1eff44b..285484d69 100644 --- a/vendor/k8s.io/cri-api/go.mod +++ b/vendor/k8s.io/cri-api/go.mod @@ -2,7 +2,7 @@ module k8s.io/cri-api -go 1.12 +go 1.13 require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go index 2d3e1f7b0..b28f1f548 100644 --- a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go +++ b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go @@ -2215,9 +2215,11 @@ type LinuxContainerResources struct { // CpusetCpus constrains the allowed set of logical CPUs. Default: "" (not specified). CpusetCpus string `protobuf:"bytes,6,opt,name=cpuset_cpus,json=cpusetCpus,proto3" json:"cpuset_cpus,omitempty"` // CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified). - CpusetMems string `protobuf:"bytes,7,opt,name=cpuset_mems,json=cpusetMems,proto3" json:"cpuset_mems,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_sizecache int32 `json:"-"` + CpusetMems string `protobuf:"bytes,7,opt,name=cpuset_mems,json=cpusetMems,proto3" json:"cpuset_mems,omitempty"` + // List of HugepageLimits to limit the HugeTLB usage of container per page size. Default: nil (not specified). + HugepageLimits []*HugepageLimit `protobuf:"bytes,8,rep,name=hugepage_limits,json=hugepageLimits,proto3" json:"hugepage_limits,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LinuxContainerResources) Reset() { *m = LinuxContainerResources{} } @@ -2301,6 +2303,72 @@ func (m *LinuxContainerResources) GetCpusetMems() string { return "" } +func (m *LinuxContainerResources) GetHugepageLimits() []*HugepageLimit { + if m != nil { + return m.HugepageLimits + } + return nil +} + +// HugepageLimit corresponds to the file`hugetlb..limit_in_byte` in container level cgroup. +// For example, `PageSize=1GB`, `Limit=1073741824` means setting `1073741824` bytes to hugetlb.1GB.limit_in_bytes. +type HugepageLimit struct { + // The value of PageSize has the format B (2MB, 1GB), + // and must match the of the corresponding control file found in `hugetlb..limit_in_bytes`. + // The values of are intended to be parsed using base 1024("1KB" = 1024, "1MB" = 1048576, etc). + PageSize string `protobuf:"bytes,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"` + // limit in bytes of hugepagesize HugeTLB usage. + Limit uint64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HugepageLimit) Reset() { *m = HugepageLimit{} } +func (*HugepageLimit) ProtoMessage() {} +func (*HugepageLimit) Descriptor() ([]byte, []int) { + return fileDescriptor_00212fb1f9d3bf1c, []int{32} +} +func (m *HugepageLimit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HugepageLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HugepageLimit.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HugepageLimit) XXX_Merge(src proto.Message) { + xxx_messageInfo_HugepageLimit.Merge(m, src) +} +func (m *HugepageLimit) XXX_Size() int { + return m.Size() +} +func (m *HugepageLimit) XXX_DiscardUnknown() { + xxx_messageInfo_HugepageLimit.DiscardUnknown(m) +} + +var xxx_messageInfo_HugepageLimit proto.InternalMessageInfo + +func (m *HugepageLimit) GetPageSize() string { + if m != nil { + return m.PageSize + } + return "" +} + +func (m *HugepageLimit) GetLimit() uint64 { + if m != nil { + return m.Limit + } + return 0 +} + // SELinuxOption are the labels to be applied to the container. type SELinuxOption struct { User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` @@ -2314,7 +2382,7 @@ type SELinuxOption struct { func (m *SELinuxOption) Reset() { *m = SELinuxOption{} } func (*SELinuxOption) ProtoMessage() {} func (*SELinuxOption) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{32} + return fileDescriptor_00212fb1f9d3bf1c, []int{33} } func (m *SELinuxOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2384,7 +2452,7 @@ type Capability struct { func (m *Capability) Reset() { *m = Capability{} } func (*Capability) ProtoMessage() {} func (*Capability) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{33} + return fileDescriptor_00212fb1f9d3bf1c, []int{34} } func (m *Capability) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2500,7 +2568,7 @@ type LinuxContainerSecurityContext struct { func (m *LinuxContainerSecurityContext) Reset() { *m = LinuxContainerSecurityContext{} } func (*LinuxContainerSecurityContext) ProtoMessage() {} func (*LinuxContainerSecurityContext) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{34} + return fileDescriptor_00212fb1f9d3bf1c, []int{35} } func (m *LinuxContainerSecurityContext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2641,7 +2709,7 @@ type LinuxContainerConfig struct { func (m *LinuxContainerConfig) Reset() { *m = LinuxContainerConfig{} } func (*LinuxContainerConfig) ProtoMessage() {} func (*LinuxContainerConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{35} + return fileDescriptor_00212fb1f9d3bf1c, []int{36} } func (m *LinuxContainerConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2699,7 +2767,7 @@ type WindowsContainerSecurityContext struct { func (m *WindowsContainerSecurityContext) Reset() { *m = WindowsContainerSecurityContext{} } func (*WindowsContainerSecurityContext) ProtoMessage() {} func (*WindowsContainerSecurityContext) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{36} + return fileDescriptor_00212fb1f9d3bf1c, []int{37} } func (m *WindowsContainerSecurityContext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2756,7 +2824,7 @@ type WindowsContainerConfig struct { func (m *WindowsContainerConfig) Reset() { *m = WindowsContainerConfig{} } func (*WindowsContainerConfig) ProtoMessage() {} func (*WindowsContainerConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{37} + return fileDescriptor_00212fb1f9d3bf1c, []int{38} } func (m *WindowsContainerConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2817,7 +2885,7 @@ type WindowsContainerResources struct { func (m *WindowsContainerResources) Reset() { *m = WindowsContainerResources{} } func (*WindowsContainerResources) ProtoMessage() {} func (*WindowsContainerResources) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{38} + return fileDescriptor_00212fb1f9d3bf1c, []int{39} } func (m *WindowsContainerResources) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2891,7 +2959,7 @@ type ContainerMetadata struct { func (m *ContainerMetadata) Reset() { *m = ContainerMetadata{} } func (*ContainerMetadata) ProtoMessage() {} func (*ContainerMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{39} + return fileDescriptor_00212fb1f9d3bf1c, []int{40} } func (m *ContainerMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2952,7 +3020,7 @@ type Device struct { func (m *Device) Reset() { *m = Device{} } func (*Device) ProtoMessage() {} func (*Device) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{40} + return fileDescriptor_00212fb1f9d3bf1c, []int{41} } func (m *Device) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3071,7 +3139,7 @@ type ContainerConfig struct { func (m *ContainerConfig) Reset() { *m = ContainerConfig{} } func (*ContainerConfig) ProtoMessage() {} func (*ContainerConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{41} + return fileDescriptor_00212fb1f9d3bf1c, []int{42} } func (m *ContainerConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3229,7 +3297,7 @@ type CreateContainerRequest struct { func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} } func (*CreateContainerRequest) ProtoMessage() {} func (*CreateContainerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{42} + return fileDescriptor_00212fb1f9d3bf1c, []int{43} } func (m *CreateContainerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3289,7 +3357,7 @@ type CreateContainerResponse struct { func (m *CreateContainerResponse) Reset() { *m = CreateContainerResponse{} } func (*CreateContainerResponse) ProtoMessage() {} func (*CreateContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{43} + return fileDescriptor_00212fb1f9d3bf1c, []int{44} } func (m *CreateContainerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3335,7 +3403,7 @@ type StartContainerRequest struct { func (m *StartContainerRequest) Reset() { *m = StartContainerRequest{} } func (*StartContainerRequest) ProtoMessage() {} func (*StartContainerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{44} + return fileDescriptor_00212fb1f9d3bf1c, []int{45} } func (m *StartContainerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3379,7 +3447,7 @@ type StartContainerResponse struct { func (m *StartContainerResponse) Reset() { *m = StartContainerResponse{} } func (*StartContainerResponse) ProtoMessage() {} func (*StartContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{45} + return fileDescriptor_00212fb1f9d3bf1c, []int{46} } func (m *StartContainerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3421,7 +3489,7 @@ type StopContainerRequest struct { func (m *StopContainerRequest) Reset() { *m = StopContainerRequest{} } func (*StopContainerRequest) ProtoMessage() {} func (*StopContainerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{46} + return fileDescriptor_00212fb1f9d3bf1c, []int{47} } func (m *StopContainerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3472,7 +3540,7 @@ type StopContainerResponse struct { func (m *StopContainerResponse) Reset() { *m = StopContainerResponse{} } func (*StopContainerResponse) ProtoMessage() {} func (*StopContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{47} + return fileDescriptor_00212fb1f9d3bf1c, []int{48} } func (m *StopContainerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3511,7 +3579,7 @@ type RemoveContainerRequest struct { func (m *RemoveContainerRequest) Reset() { *m = RemoveContainerRequest{} } func (*RemoveContainerRequest) ProtoMessage() {} func (*RemoveContainerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{48} + return fileDescriptor_00212fb1f9d3bf1c, []int{49} } func (m *RemoveContainerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3555,7 +3623,7 @@ type RemoveContainerResponse struct { func (m *RemoveContainerResponse) Reset() { *m = RemoveContainerResponse{} } func (*RemoveContainerResponse) ProtoMessage() {} func (*RemoveContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{49} + return fileDescriptor_00212fb1f9d3bf1c, []int{50} } func (m *RemoveContainerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3595,7 +3663,7 @@ type ContainerStateValue struct { func (m *ContainerStateValue) Reset() { *m = ContainerStateValue{} } func (*ContainerStateValue) ProtoMessage() {} func (*ContainerStateValue) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{50} + return fileDescriptor_00212fb1f9d3bf1c, []int{51} } func (m *ContainerStateValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3651,7 +3719,7 @@ type ContainerFilter struct { func (m *ContainerFilter) Reset() { *m = ContainerFilter{} } func (*ContainerFilter) ProtoMessage() {} func (*ContainerFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{51} + return fileDescriptor_00212fb1f9d3bf1c, []int{52} } func (m *ContainerFilter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3717,7 +3785,7 @@ type ListContainersRequest struct { func (m *ListContainersRequest) Reset() { *m = ListContainersRequest{} } func (*ListContainersRequest) ProtoMessage() {} func (*ListContainersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{52} + return fileDescriptor_00212fb1f9d3bf1c, []int{53} } func (m *ListContainersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3786,7 +3854,7 @@ type Container struct { func (m *Container) Reset() { *m = Container{} } func (*Container) ProtoMessage() {} func (*Container) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{53} + return fileDescriptor_00212fb1f9d3bf1c, []int{54} } func (m *Container) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3888,7 +3956,7 @@ type ListContainersResponse struct { func (m *ListContainersResponse) Reset() { *m = ListContainersResponse{} } func (*ListContainersResponse) ProtoMessage() {} func (*ListContainersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{54} + return fileDescriptor_00212fb1f9d3bf1c, []int{55} } func (m *ListContainersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3936,7 +4004,7 @@ type ContainerStatusRequest struct { func (m *ContainerStatusRequest) Reset() { *m = ContainerStatusRequest{} } func (*ContainerStatusRequest) ProtoMessage() {} func (*ContainerStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{55} + return fileDescriptor_00212fb1f9d3bf1c, []int{56} } func (m *ContainerStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4023,7 +4091,7 @@ type ContainerStatus struct { func (m *ContainerStatus) Reset() { *m = ContainerStatus{} } func (*ContainerStatus) ProtoMessage() {} func (*ContainerStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{56} + return fileDescriptor_00212fb1f9d3bf1c, []int{57} } func (m *ContainerStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4172,7 +4240,7 @@ type ContainerStatusResponse struct { func (m *ContainerStatusResponse) Reset() { *m = ContainerStatusResponse{} } func (*ContainerStatusResponse) ProtoMessage() {} func (*ContainerStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{57} + return fileDescriptor_00212fb1f9d3bf1c, []int{58} } func (m *ContainerStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4227,7 +4295,7 @@ type UpdateContainerResourcesRequest struct { func (m *UpdateContainerResourcesRequest) Reset() { *m = UpdateContainerResourcesRequest{} } func (*UpdateContainerResourcesRequest) ProtoMessage() {} func (*UpdateContainerResourcesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{58} + return fileDescriptor_00212fb1f9d3bf1c, []int{59} } func (m *UpdateContainerResourcesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4278,7 +4346,7 @@ type UpdateContainerResourcesResponse struct { func (m *UpdateContainerResourcesResponse) Reset() { *m = UpdateContainerResourcesResponse{} } func (*UpdateContainerResourcesResponse) ProtoMessage() {} func (*UpdateContainerResourcesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{59} + return fileDescriptor_00212fb1f9d3bf1c, []int{60} } func (m *UpdateContainerResourcesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4321,7 +4389,7 @@ type ExecSyncRequest struct { func (m *ExecSyncRequest) Reset() { *m = ExecSyncRequest{} } func (*ExecSyncRequest) ProtoMessage() {} func (*ExecSyncRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{60} + return fileDescriptor_00212fb1f9d3bf1c, []int{61} } func (m *ExecSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4385,7 +4453,7 @@ type ExecSyncResponse struct { func (m *ExecSyncResponse) Reset() { *m = ExecSyncResponse{} } func (*ExecSyncResponse) ProtoMessage() {} func (*ExecSyncResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{61} + return fileDescriptor_00212fb1f9d3bf1c, []int{62} } func (m *ExecSyncResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4461,7 +4529,7 @@ type ExecRequest struct { func (m *ExecRequest) Reset() { *m = ExecRequest{} } func (*ExecRequest) ProtoMessage() {} func (*ExecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{62} + return fileDescriptor_00212fb1f9d3bf1c, []int{63} } func (m *ExecRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4542,7 +4610,7 @@ type ExecResponse struct { func (m *ExecResponse) Reset() { *m = ExecResponse{} } func (*ExecResponse) ProtoMessage() {} func (*ExecResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{63} + return fileDescriptor_00212fb1f9d3bf1c, []int{64} } func (m *ExecResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4603,7 +4671,7 @@ type AttachRequest struct { func (m *AttachRequest) Reset() { *m = AttachRequest{} } func (*AttachRequest) ProtoMessage() {} func (*AttachRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{64} + return fileDescriptor_00212fb1f9d3bf1c, []int{65} } func (m *AttachRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4677,7 +4745,7 @@ type AttachResponse struct { func (m *AttachResponse) Reset() { *m = AttachResponse{} } func (*AttachResponse) ProtoMessage() {} func (*AttachResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{65} + return fileDescriptor_00212fb1f9d3bf1c, []int{66} } func (m *AttachResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4725,7 +4793,7 @@ type PortForwardRequest struct { func (m *PortForwardRequest) Reset() { *m = PortForwardRequest{} } func (*PortForwardRequest) ProtoMessage() {} func (*PortForwardRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{66} + return fileDescriptor_00212fb1f9d3bf1c, []int{67} } func (m *PortForwardRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4778,7 +4846,7 @@ type PortForwardResponse struct { func (m *PortForwardResponse) Reset() { *m = PortForwardResponse{} } func (*PortForwardResponse) ProtoMessage() {} func (*PortForwardResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{67} + return fileDescriptor_00212fb1f9d3bf1c, []int{68} } func (m *PortForwardResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4824,7 +4892,7 @@ type ImageFilter struct { func (m *ImageFilter) Reset() { *m = ImageFilter{} } func (*ImageFilter) ProtoMessage() {} func (*ImageFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{68} + return fileDescriptor_00212fb1f9d3bf1c, []int{69} } func (m *ImageFilter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4870,7 +4938,7 @@ type ListImagesRequest struct { func (m *ListImagesRequest) Reset() { *m = ListImagesRequest{} } func (*ListImagesRequest) ProtoMessage() {} func (*ListImagesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{69} + return fileDescriptor_00212fb1f9d3bf1c, []int{70} } func (m *ListImagesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4930,7 +4998,7 @@ type Image struct { func (m *Image) Reset() { *m = Image{} } func (*Image) ProtoMessage() {} func (*Image) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{70} + return fileDescriptor_00212fb1f9d3bf1c, []int{71} } func (m *Image) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5011,7 +5079,7 @@ type ListImagesResponse struct { func (m *ListImagesResponse) Reset() { *m = ListImagesResponse{} } func (*ListImagesResponse) ProtoMessage() {} func (*ListImagesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{71} + return fileDescriptor_00212fb1f9d3bf1c, []int{72} } func (m *ListImagesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5059,7 +5127,7 @@ type ImageStatusRequest struct { func (m *ImageStatusRequest) Reset() { *m = ImageStatusRequest{} } func (*ImageStatusRequest) ProtoMessage() {} func (*ImageStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{72} + return fileDescriptor_00212fb1f9d3bf1c, []int{73} } func (m *ImageStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5117,7 +5185,7 @@ type ImageStatusResponse struct { func (m *ImageStatusResponse) Reset() { *m = ImageStatusResponse{} } func (*ImageStatusResponse) ProtoMessage() {} func (*ImageStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{73} + return fileDescriptor_00212fb1f9d3bf1c, []int{74} } func (m *ImageStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5178,7 +5246,7 @@ type AuthConfig struct { func (m *AuthConfig) Reset() { *m = AuthConfig{} } func (*AuthConfig) ProtoMessage() {} func (*AuthConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{74} + return fileDescriptor_00212fb1f9d3bf1c, []int{75} } func (m *AuthConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5263,7 +5331,7 @@ type PullImageRequest struct { func (m *PullImageRequest) Reset() { *m = PullImageRequest{} } func (*PullImageRequest) ProtoMessage() {} func (*PullImageRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{75} + return fileDescriptor_00212fb1f9d3bf1c, []int{76} } func (m *PullImageRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5324,7 +5392,7 @@ type PullImageResponse struct { func (m *PullImageResponse) Reset() { *m = PullImageResponse{} } func (*PullImageResponse) ProtoMessage() {} func (*PullImageResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{76} + return fileDescriptor_00212fb1f9d3bf1c, []int{77} } func (m *PullImageResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5370,7 +5438,7 @@ type RemoveImageRequest struct { func (m *RemoveImageRequest) Reset() { *m = RemoveImageRequest{} } func (*RemoveImageRequest) ProtoMessage() {} func (*RemoveImageRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{77} + return fileDescriptor_00212fb1f9d3bf1c, []int{78} } func (m *RemoveImageRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5414,7 +5482,7 @@ type RemoveImageResponse struct { func (m *RemoveImageResponse) Reset() { *m = RemoveImageResponse{} } func (*RemoveImageResponse) ProtoMessage() {} func (*RemoveImageResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{78} + return fileDescriptor_00212fb1f9d3bf1c, []int{79} } func (m *RemoveImageResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5454,7 +5522,7 @@ type NetworkConfig struct { func (m *NetworkConfig) Reset() { *m = NetworkConfig{} } func (*NetworkConfig) ProtoMessage() {} func (*NetworkConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{79} + return fileDescriptor_00212fb1f9d3bf1c, []int{80} } func (m *NetworkConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5499,7 +5567,7 @@ type RuntimeConfig struct { func (m *RuntimeConfig) Reset() { *m = RuntimeConfig{} } func (*RuntimeConfig) ProtoMessage() {} func (*RuntimeConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{80} + return fileDescriptor_00212fb1f9d3bf1c, []int{81} } func (m *RuntimeConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5544,7 +5612,7 @@ type UpdateRuntimeConfigRequest struct { func (m *UpdateRuntimeConfigRequest) Reset() { *m = UpdateRuntimeConfigRequest{} } func (*UpdateRuntimeConfigRequest) ProtoMessage() {} func (*UpdateRuntimeConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{81} + return fileDescriptor_00212fb1f9d3bf1c, []int{82} } func (m *UpdateRuntimeConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5588,7 +5656,7 @@ type UpdateRuntimeConfigResponse struct { func (m *UpdateRuntimeConfigResponse) Reset() { *m = UpdateRuntimeConfigResponse{} } func (*UpdateRuntimeConfigResponse) ProtoMessage() {} func (*UpdateRuntimeConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{82} + return fileDescriptor_00212fb1f9d3bf1c, []int{83} } func (m *UpdateRuntimeConfigResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5646,7 +5714,7 @@ type RuntimeCondition struct { func (m *RuntimeCondition) Reset() { *m = RuntimeCondition{} } func (*RuntimeCondition) ProtoMessage() {} func (*RuntimeCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{83} + return fileDescriptor_00212fb1f9d3bf1c, []int{84} } func (m *RuntimeCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5714,7 +5782,7 @@ type RuntimeStatus struct { func (m *RuntimeStatus) Reset() { *m = RuntimeStatus{} } func (*RuntimeStatus) ProtoMessage() {} func (*RuntimeStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{84} + return fileDescriptor_00212fb1f9d3bf1c, []int{85} } func (m *RuntimeStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5760,7 +5828,7 @@ type StatusRequest struct { func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{85} + return fileDescriptor_00212fb1f9d3bf1c, []int{86} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5811,7 +5879,7 @@ type StatusResponse struct { func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{86} + return fileDescriptor_00212fb1f9d3bf1c, []int{87} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5862,7 +5930,7 @@ type ImageFsInfoRequest struct { func (m *ImageFsInfoRequest) Reset() { *m = ImageFsInfoRequest{} } func (*ImageFsInfoRequest) ProtoMessage() {} func (*ImageFsInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{87} + return fileDescriptor_00212fb1f9d3bf1c, []int{88} } func (m *ImageFsInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5902,7 +5970,7 @@ type UInt64Value struct { func (m *UInt64Value) Reset() { *m = UInt64Value{} } func (*UInt64Value) ProtoMessage() {} func (*UInt64Value) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{88} + return fileDescriptor_00212fb1f9d3bf1c, []int{89} } func (m *UInt64Value) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5949,7 +6017,7 @@ type FilesystemIdentifier struct { func (m *FilesystemIdentifier) Reset() { *m = FilesystemIdentifier{} } func (*FilesystemIdentifier) ProtoMessage() {} func (*FilesystemIdentifier) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{89} + return fileDescriptor_00212fb1f9d3bf1c, []int{90} } func (m *FilesystemIdentifier) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6006,7 +6074,7 @@ type FilesystemUsage struct { func (m *FilesystemUsage) Reset() { *m = FilesystemUsage{} } func (*FilesystemUsage) ProtoMessage() {} func (*FilesystemUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{90} + return fileDescriptor_00212fb1f9d3bf1c, []int{91} } func (m *FilesystemUsage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6073,7 +6141,7 @@ type ImageFsInfoResponse struct { func (m *ImageFsInfoResponse) Reset() { *m = ImageFsInfoResponse{} } func (*ImageFsInfoResponse) ProtoMessage() {} func (*ImageFsInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{91} + return fileDescriptor_00212fb1f9d3bf1c, []int{92} } func (m *ImageFsInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6119,7 +6187,7 @@ type ContainerStatsRequest struct { func (m *ContainerStatsRequest) Reset() { *m = ContainerStatsRequest{} } func (*ContainerStatsRequest) ProtoMessage() {} func (*ContainerStatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{92} + return fileDescriptor_00212fb1f9d3bf1c, []int{93} } func (m *ContainerStatsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6165,7 +6233,7 @@ type ContainerStatsResponse struct { func (m *ContainerStatsResponse) Reset() { *m = ContainerStatsResponse{} } func (*ContainerStatsResponse) ProtoMessage() {} func (*ContainerStatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{93} + return fileDescriptor_00212fb1f9d3bf1c, []int{94} } func (m *ContainerStatsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6211,7 +6279,7 @@ type ListContainerStatsRequest struct { func (m *ListContainerStatsRequest) Reset() { *m = ListContainerStatsRequest{} } func (*ListContainerStatsRequest) ProtoMessage() {} func (*ListContainerStatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{94} + return fileDescriptor_00212fb1f9d3bf1c, []int{95} } func (m *ListContainerStatsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6265,7 +6333,7 @@ type ContainerStatsFilter struct { func (m *ContainerStatsFilter) Reset() { *m = ContainerStatsFilter{} } func (*ContainerStatsFilter) ProtoMessage() {} func (*ContainerStatsFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{95} + return fileDescriptor_00212fb1f9d3bf1c, []int{96} } func (m *ContainerStatsFilter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6325,7 +6393,7 @@ type ListContainerStatsResponse struct { func (m *ListContainerStatsResponse) Reset() { *m = ListContainerStatsResponse{} } func (*ListContainerStatsResponse) ProtoMessage() {} func (*ListContainerStatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{96} + return fileDescriptor_00212fb1f9d3bf1c, []int{97} } func (m *ListContainerStatsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6381,7 +6449,7 @@ type ContainerAttributes struct { func (m *ContainerAttributes) Reset() { *m = ContainerAttributes{} } func (*ContainerAttributes) ProtoMessage() {} func (*ContainerAttributes) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{97} + return fileDescriptor_00212fb1f9d3bf1c, []int{98} } func (m *ContainerAttributes) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6455,7 +6523,7 @@ type ContainerStats struct { func (m *ContainerStats) Reset() { *m = ContainerStats{} } func (*ContainerStats) ProtoMessage() {} func (*ContainerStats) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{98} + return fileDescriptor_00212fb1f9d3bf1c, []int{99} } func (m *ContainerStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6525,7 +6593,7 @@ type CpuUsage struct { func (m *CpuUsage) Reset() { *m = CpuUsage{} } func (*CpuUsage) ProtoMessage() {} func (*CpuUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{99} + return fileDescriptor_00212fb1f9d3bf1c, []int{100} } func (m *CpuUsage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6581,7 +6649,7 @@ type MemoryUsage struct { func (m *MemoryUsage) Reset() { *m = MemoryUsage{} } func (*MemoryUsage) ProtoMessage() {} func (*MemoryUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{100} + return fileDescriptor_00212fb1f9d3bf1c, []int{101} } func (m *MemoryUsage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6634,7 +6702,7 @@ type ReopenContainerLogRequest struct { func (m *ReopenContainerLogRequest) Reset() { *m = ReopenContainerLogRequest{} } func (*ReopenContainerLogRequest) ProtoMessage() {} func (*ReopenContainerLogRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{101} + return fileDescriptor_00212fb1f9d3bf1c, []int{102} } func (m *ReopenContainerLogRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6678,7 +6746,7 @@ type ReopenContainerLogResponse struct { func (m *ReopenContainerLogResponse) Reset() { *m = ReopenContainerLogResponse{} } func (*ReopenContainerLogResponse) ProtoMessage() {} func (*ReopenContainerLogResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{102} + return fileDescriptor_00212fb1f9d3bf1c, []int{103} } func (m *ReopenContainerLogResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -6754,6 +6822,7 @@ func init() { proto.RegisterType((*ImageSpec)(nil), "runtime.v1alpha2.ImageSpec") proto.RegisterType((*KeyValue)(nil), "runtime.v1alpha2.KeyValue") proto.RegisterType((*LinuxContainerResources)(nil), "runtime.v1alpha2.LinuxContainerResources") + proto.RegisterType((*HugepageLimit)(nil), "runtime.v1alpha2.HugepageLimit") proto.RegisterType((*SELinuxOption)(nil), "runtime.v1alpha2.SELinuxOption") proto.RegisterType((*Capability)(nil), "runtime.v1alpha2.Capability") proto.RegisterType((*LinuxContainerSecurityContext)(nil), "runtime.v1alpha2.LinuxContainerSecurityContext") @@ -6843,306 +6912,309 @@ func init() { func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) } var fileDescriptor_00212fb1f9d3bf1c = []byte{ - // 4770 bytes of a gzipped FileDescriptorProto + // 4821 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0xcd, 0x6f, 0x1b, 0x49, - 0x76, 0x57, 0x93, 0xa2, 0x44, 0x3e, 0x8a, 0x14, 0x55, 0x96, 0x2d, 0x9a, 0x1e, 0x6b, 0xac, 0x9e, - 0xf1, 0xe7, 0xcc, 0xc8, 0x63, 0xcd, 0xac, 0x27, 0xb6, 0x67, 0x6d, 0xd3, 0x92, 0x6c, 0x33, 0x6b, - 0x53, 0x4c, 0x53, 0x9a, 0x8f, 0x9d, 0x01, 0x7a, 0x5b, 0xec, 0x12, 0xd5, 0x6b, 0xb2, 0xbb, 0xa7, - 0xbb, 0x69, 0x5b, 0x09, 0x10, 0x2c, 0xb0, 0xc8, 0x1e, 0x02, 0x04, 0xc8, 0x39, 0xc7, 0xcd, 0x21, - 0x87, 0xdc, 0x02, 0x04, 0x39, 0xe4, 0xb4, 0x41, 0x0e, 0x7b, 0x09, 0x90, 0xd3, 0x22, 0x41, 0x2e, - 0x99, 0x49, 0x72, 0x09, 0x90, 0x20, 0x7f, 0x40, 0x0e, 0x41, 0x7d, 0xf5, 0x77, 0xf3, 0xc3, 0xe3, - 0xdd, 0xd9, 0x9c, 0xd4, 0xf5, 0xfa, 0xbd, 0x57, 0xaf, 0x5f, 0xbd, 0x7a, 0xf5, 0xea, 0x57, 0x45, - 0x41, 0x49, 0xb3, 0x8d, 0x4d, 0xdb, 0xb1, 0x3c, 0x0b, 0xd5, 0x9c, 0x91, 0xe9, 0x19, 0x43, 0xbc, - 0xf9, 0xfc, 0x86, 0x36, 0xb0, 0x8f, 0xb5, 0xad, 0xc6, 0x7b, 0x7d, 0xc3, 0x3b, 0x1e, 0x1d, 0x6e, - 0xf6, 0xac, 0xe1, 0xf5, 0xbe, 0xd5, 0xb7, 0xae, 0x53, 0xc6, 0xc3, 0xd1, 0x11, 0x6d, 0xd1, 0x06, - 0x7d, 0x62, 0x0a, 0xe4, 0x6b, 0x50, 0xfd, 0x04, 0x3b, 0xae, 0x61, 0x99, 0x0a, 0xfe, 0x6a, 0x84, - 0x5d, 0x0f, 0xd5, 0x61, 0xf1, 0x39, 0xa3, 0xd4, 0xa5, 0x0b, 0xd2, 0x95, 0x92, 0x22, 0x9a, 0xf2, - 0x5f, 0x48, 0xb0, 0xec, 0x33, 0xbb, 0xb6, 0x65, 0xba, 0x38, 0x9b, 0x1b, 0x6d, 0xc0, 0x12, 0x37, - 0x4e, 0x35, 0xb5, 0x21, 0xae, 0xe7, 0xe8, 0xeb, 0x32, 0xa7, 0xb5, 0xb5, 0x21, 0x46, 0x97, 0x61, - 0x59, 0xb0, 0x08, 0x25, 0x79, 0xca, 0x55, 0xe5, 0x64, 0xde, 0x1b, 0xda, 0x84, 0x53, 0x82, 0x51, - 0xb3, 0x0d, 0x9f, 0x79, 0x9e, 0x32, 0xaf, 0xf0, 0x57, 0x4d, 0xdb, 0xe0, 0xfc, 0xf2, 0x17, 0x50, - 0xda, 0x69, 0x77, 0xb7, 0x2d, 0xf3, 0xc8, 0xe8, 0x13, 0x13, 0x5d, 0xec, 0x10, 0x99, 0xba, 0x74, - 0x21, 0x4f, 0x4c, 0xe4, 0x4d, 0xd4, 0x80, 0xa2, 0x8b, 0x35, 0xa7, 0x77, 0x8c, 0xdd, 0x7a, 0x8e, - 0xbe, 0xf2, 0xdb, 0x44, 0xca, 0xb2, 0x3d, 0xc3, 0x32, 0xdd, 0x7a, 0x9e, 0x49, 0xf1, 0xa6, 0xfc, - 0x73, 0x09, 0xca, 0x1d, 0xcb, 0xf1, 0x9e, 0x6a, 0xb6, 0x6d, 0x98, 0x7d, 0x74, 0x13, 0x8a, 0xd4, - 0x97, 0x3d, 0x6b, 0x40, 0x7d, 0x50, 0xdd, 0x6a, 0x6c, 0xc6, 0x87, 0x65, 0xb3, 0xc3, 0x39, 0x14, - 0x9f, 0x17, 0x5d, 0x84, 0x6a, 0xcf, 0x32, 0x3d, 0xcd, 0x30, 0xb1, 0xa3, 0xda, 0x96, 0xe3, 0x51, - 0x17, 0x15, 0x94, 0x8a, 0x4f, 0x25, 0xbd, 0xa0, 0x73, 0x50, 0x3a, 0xb6, 0x5c, 0x8f, 0x71, 0xe4, - 0x29, 0x47, 0x91, 0x10, 0xe8, 0xcb, 0x35, 0x58, 0xa4, 0x2f, 0x0d, 0x9b, 0x3b, 0x63, 0x81, 0x34, - 0x5b, 0xb6, 0xfc, 0x2b, 0x09, 0x0a, 0x4f, 0xad, 0x91, 0xe9, 0xc5, 0xba, 0xd1, 0xbc, 0x63, 0x3e, - 0x50, 0xa1, 0x6e, 0x34, 0xef, 0x38, 0xe8, 0x86, 0x70, 0xb0, 0xb1, 0x62, 0xdd, 0x90, 0x97, 0x0d, - 0x28, 0x3a, 0x58, 0xd3, 0x2d, 0x73, 0x70, 0x42, 0x4d, 0x28, 0x2a, 0x7e, 0x9b, 0x0c, 0xa2, 0x8b, - 0x07, 0x86, 0x39, 0x7a, 0xa9, 0x3a, 0x78, 0xa0, 0x1d, 0xe2, 0x01, 0x35, 0xa5, 0xa8, 0x54, 0x39, - 0x59, 0x61, 0x54, 0xb4, 0x03, 0x65, 0xdb, 0xb1, 0x6c, 0xad, 0xaf, 0x11, 0x3f, 0xd6, 0x0b, 0xd4, - 0x55, 0x72, 0xd2, 0x55, 0xd4, 0xec, 0x4e, 0xc0, 0xa9, 0x84, 0xc5, 0xe4, 0xbf, 0x92, 0x60, 0x99, - 0x04, 0x8f, 0x6b, 0x6b, 0x3d, 0xbc, 0x47, 0x87, 0x04, 0xdd, 0x82, 0x45, 0x13, 0x7b, 0x2f, 0x2c, - 0xe7, 0x19, 0x1f, 0x80, 0x37, 0x93, 0x5a, 0x7d, 0x99, 0xa7, 0x96, 0x8e, 0x15, 0xc1, 0x8f, 0x6e, - 0x40, 0xde, 0x36, 0x74, 0xfa, 0xc1, 0x53, 0x88, 0x11, 0x5e, 0x22, 0x62, 0xd8, 0x3d, 0xea, 0x87, - 0x69, 0x44, 0x0c, 0xbb, 0x27, 0xcb, 0x00, 0x2d, 0xd3, 0xbb, 0xf9, 0xe1, 0x27, 0xda, 0x60, 0x84, - 0xd1, 0x2a, 0x14, 0x9e, 0x93, 0x07, 0x6a, 0x6c, 0x5e, 0x61, 0x0d, 0xf9, 0xeb, 0x3c, 0x9c, 0x7b, - 0x42, 0xfc, 0xd5, 0xd5, 0x4c, 0xfd, 0xd0, 0x7a, 0xd9, 0xc5, 0xbd, 0x91, 0x63, 0x78, 0x27, 0xdb, - 0x96, 0xe9, 0xe1, 0x97, 0x1e, 0x6a, 0xc3, 0x8a, 0x29, 0x34, 0xab, 0x22, 0x34, 0x89, 0x86, 0xf2, - 0xd6, 0xc6, 0x18, 0x23, 0x98, 0x8b, 0x94, 0x9a, 0x19, 0x25, 0xb8, 0xe8, 0x71, 0x30, 0x6e, 0x42, - 0x5b, 0x8e, 0x6a, 0x4b, 0xf9, 0xa4, 0xee, 0x2e, 0xb5, 0x8c, 0xeb, 0x12, 0x03, 0x2b, 0x34, 0x7d, - 0x0c, 0x64, 0x56, 0xab, 0x9a, 0xab, 0x8e, 0x5c, 0xec, 0x50, 0xc7, 0x94, 0xb7, 0xde, 0x48, 0x6a, - 0x09, 0x5c, 0xa0, 0x94, 0x9c, 0x91, 0xd9, 0x74, 0x0f, 0x5c, 0xec, 0xa0, 0xbb, 0x34, 0x4f, 0x10, - 0xe9, 0xbe, 0x63, 0x8d, 0xec, 0x7a, 0x71, 0x0a, 0x71, 0xa0, 0xe2, 0x8f, 0x08, 0x3f, 0x4d, 0x22, - 0x3c, 0x16, 0x55, 0xc7, 0xb2, 0xbc, 0x23, 0x57, 0xc4, 0x9f, 0x20, 0x2b, 0x94, 0x8a, 0xae, 0xc3, - 0x29, 0x77, 0x64, 0xdb, 0x03, 0x3c, 0xc4, 0xa6, 0xa7, 0x0d, 0x58, 0x77, 0x6e, 0xbd, 0x70, 0x21, - 0x7f, 0x25, 0xaf, 0xa0, 0xf0, 0x2b, 0xaa, 0xd8, 0x45, 0xeb, 0x00, 0xb6, 0x63, 0x3c, 0x37, 0x06, - 0xb8, 0x8f, 0xf5, 0xfa, 0x02, 0x55, 0x1a, 0xa2, 0xa0, 0xf7, 0x61, 0xd5, 0xc5, 0xbd, 0x9e, 0x35, - 0xb4, 0x55, 0xdb, 0xb1, 0x8e, 0x8c, 0x01, 0x66, 0xb3, 0x67, 0x91, 0xce, 0x1e, 0xc4, 0xdf, 0x75, - 0xd8, 0x2b, 0x32, 0x8f, 0xe4, 0x9f, 0xe7, 0xe0, 0x34, 0xf5, 0x64, 0xc7, 0xd2, 0xf9, 0x30, 0xf3, - 0x24, 0xf5, 0x16, 0x54, 0x7a, 0xd4, 0x20, 0xd5, 0xd6, 0x1c, 0x6c, 0x7a, 0x7c, 0x92, 0x2e, 0x31, - 0x62, 0x87, 0xd2, 0xd0, 0x67, 0x50, 0x73, 0x79, 0x54, 0xa8, 0x3d, 0x16, 0x16, 0x7c, 0xcc, 0xde, - 0x4b, 0xba, 0x6b, 0x4c, 0x2c, 0x29, 0xcb, 0x6e, 0x22, 0xb8, 0x16, 0xdd, 0x13, 0xb7, 0xe7, 0x0d, - 0x58, 0xb6, 0x2b, 0x6f, 0x7d, 0x98, 0xa1, 0x30, 0x6e, 0xf8, 0x66, 0x97, 0x89, 0xed, 0x9a, 0x9e, - 0x73, 0xa2, 0x08, 0x25, 0x8d, 0xdb, 0xb0, 0x14, 0x7e, 0x81, 0x6a, 0x90, 0x7f, 0x86, 0x4f, 0xf8, - 0x47, 0x91, 0xc7, 0x60, 0x12, 0xb0, 0x5c, 0xc3, 0x1a, 0xb7, 0x73, 0xbf, 0x23, 0xc9, 0x0e, 0xa0, - 0xa0, 0x97, 0xa7, 0xd8, 0xd3, 0x74, 0xcd, 0xd3, 0x10, 0x82, 0x79, 0xba, 0x8c, 0x30, 0x15, 0xf4, - 0x99, 0x68, 0x1d, 0xf1, 0xc9, 0x5b, 0x52, 0xc8, 0x23, 0x7a, 0x03, 0x4a, 0x7e, 0xa0, 0xf3, 0xb5, - 0x24, 0x20, 0x90, 0x9c, 0xae, 0x79, 0x1e, 0x1e, 0xda, 0x1e, 0x0d, 0x91, 0x8a, 0x22, 0x9a, 0xf2, - 0x7f, 0xcf, 0x43, 0x2d, 0x31, 0x26, 0xf7, 0xa1, 0x38, 0xe4, 0xdd, 0xf3, 0x89, 0xf6, 0x76, 0x4a, - 0x62, 0x4f, 0x98, 0xaa, 0xf8, 0x52, 0x24, 0x6f, 0x92, 0x1c, 0x1a, 0x5a, 0xff, 0xfc, 0x36, 0x19, - 0xf1, 0x81, 0xd5, 0x57, 0x75, 0xc3, 0xc1, 0x3d, 0xcf, 0x72, 0x4e, 0xb8, 0xb9, 0x4b, 0x03, 0xab, - 0xbf, 0x23, 0x68, 0xe8, 0x36, 0x80, 0x6e, 0xba, 0x64, 0xb0, 0x8f, 0x8c, 0x3e, 0x35, 0xba, 0xbc, - 0x75, 0x2e, 0x69, 0x84, 0xbf, 0xd8, 0x29, 0x25, 0xdd, 0x74, 0xb9, 0xf9, 0x0f, 0xa0, 0x42, 0xd6, - 0x0c, 0x75, 0xc8, 0xd6, 0x29, 0x16, 0xe9, 0xe5, 0xad, 0xf3, 0x69, 0xdf, 0xe0, 0xaf, 0x66, 0xca, - 0x92, 0x1d, 0x34, 0x5c, 0xf4, 0x10, 0x16, 0x68, 0xf2, 0x76, 0xeb, 0x0b, 0x54, 0x78, 0x73, 0x9c, - 0x03, 0x78, 0x44, 0x3c, 0xa1, 0x02, 0x2c, 0x20, 0xb8, 0x34, 0x3a, 0x80, 0xb2, 0x66, 0x9a, 0x96, - 0xa7, 0xb1, 0x44, 0xb3, 0x48, 0x95, 0x7d, 0x30, 0x85, 0xb2, 0x66, 0x20, 0xc5, 0x34, 0x86, 0xf5, - 0xa0, 0xef, 0x43, 0x81, 0x66, 0x22, 0x9e, 0x34, 0x2e, 0x4f, 0x19, 0xb4, 0x0a, 0x93, 0x6a, 0xdc, - 0x82, 0x72, 0xc8, 0xd8, 0x59, 0x82, 0xb4, 0x71, 0x17, 0x6a, 0x71, 0xd3, 0x66, 0x0a, 0xf2, 0x3f, - 0x80, 0x55, 0x65, 0x64, 0x06, 0x86, 0x89, 0xea, 0xeb, 0x36, 0x2c, 0xf0, 0xc1, 0x66, 0x11, 0x27, - 0x4f, 0xf6, 0x91, 0xc2, 0x25, 0xc2, 0xe5, 0xd4, 0xb1, 0x66, 0xea, 0x03, 0xec, 0xf0, 0x7e, 0x45, - 0x39, 0xf5, 0x98, 0x51, 0xe5, 0xef, 0xc3, 0xe9, 0x58, 0xe7, 0xbc, 0x9a, 0x7b, 0x1b, 0xaa, 0xb6, - 0xa5, 0xab, 0x2e, 0x23, 0xab, 0x86, 0x2e, 0xd2, 0x90, 0xed, 0xf3, 0xb6, 0x74, 0x22, 0xde, 0xf5, - 0x2c, 0x3b, 0x69, 0xfc, 0x74, 0xe2, 0x75, 0x38, 0x13, 0x17, 0x67, 0xdd, 0xcb, 0xf7, 0x60, 0x4d, - 0xc1, 0x43, 0xeb, 0x39, 0x7e, 0x55, 0xd5, 0x0d, 0xa8, 0x27, 0x15, 0x70, 0xe5, 0x9f, 0xc3, 0x5a, - 0x40, 0xed, 0x7a, 0x9a, 0x37, 0x72, 0x67, 0x52, 0xce, 0x4b, 0xdd, 0x43, 0xcb, 0x65, 0xc3, 0x59, - 0x54, 0x44, 0x53, 0x5e, 0x83, 0x42, 0xc7, 0xd2, 0x5b, 0x1d, 0x54, 0x85, 0x9c, 0x61, 0x73, 0xe1, - 0x9c, 0x61, 0xcb, 0x46, 0xb8, 0xcf, 0x36, 0x2b, 0x39, 0x58, 0xd7, 0x71, 0x56, 0x74, 0x17, 0xaa, - 0x9a, 0xae, 0x1b, 0x24, 0x9c, 0xb4, 0x81, 0x6a, 0xd8, 0xac, 0x22, 0x2d, 0x6f, 0xad, 0xa5, 0x06, - 0x40, 0xab, 0xa3, 0x54, 0x02, 0xf6, 0x96, 0xed, 0xca, 0x8f, 0xa1, 0xe4, 0xaf, 0xf9, 0xe8, 0x4e, - 0x50, 0xbc, 0xe6, 0xa6, 0xad, 0x10, 0xfc, 0xfa, 0x76, 0x3f, 0xb1, 0x46, 0x71, 0x93, 0xef, 0x00, - 0xf8, 0xb9, 0x54, 0x94, 0x1e, 0xe7, 0xc6, 0x28, 0x56, 0x42, 0xec, 0xf2, 0x4f, 0x0b, 0xe1, 0x0c, - 0x1b, 0x72, 0x82, 0xee, 0x3b, 0x41, 0x8f, 0x64, 0xdc, 0xdc, 0x2b, 0x65, 0xdc, 0x8f, 0xa0, 0xe0, - 0x7a, 0x9a, 0x87, 0x79, 0x79, 0xb6, 0x31, 0x4e, 0x9c, 0x18, 0x81, 0x15, 0xc6, 0x8f, 0xce, 0x03, - 0xf4, 0x1c, 0xac, 0x79, 0x58, 0x57, 0x35, 0xb6, 0x3c, 0xe4, 0x95, 0x12, 0xa7, 0x34, 0x3d, 0xb4, - 0x1d, 0x94, 0x98, 0x05, 0x6a, 0xd8, 0xd5, 0x71, 0x9a, 0x23, 0x43, 0x1d, 0x14, 0x9b, 0x7e, 0xba, - 0x5a, 0x98, 0x32, 0x5d, 0x71, 0x05, 0x4c, 0x2a, 0x94, 0x8c, 0x17, 0x27, 0x27, 0x63, 0x26, 0x3a, - 0x4d, 0x32, 0x2e, 0x4e, 0x4e, 0xc6, 0x5c, 0xd9, 0xf8, 0x64, 0x9c, 0x92, 0x7e, 0x4a, 0x69, 0xe9, - 0xe7, 0xbb, 0x4c, 0xbb, 0xff, 0x2c, 0x41, 0x3d, 0x99, 0x05, 0x78, 0xf6, 0xbb, 0x0d, 0x0b, 0x2e, - 0xa5, 0x4c, 0x93, 0x7b, 0xb9, 0x2c, 0x97, 0x40, 0x8f, 0x61, 0xde, 0x30, 0x8f, 0x2c, 0x3e, 0x69, - 0x3f, 0x9c, 0x42, 0x92, 0xf7, 0xba, 0xd9, 0x32, 0x8f, 0x2c, 0xe6, 0x4d, 0xaa, 0xa1, 0xf1, 0x11, - 0x94, 0x7c, 0xd2, 0x4c, 0xdf, 0xb6, 0x07, 0xab, 0xb1, 0xd8, 0x66, 0xdb, 0x0d, 0x7f, 0x4a, 0x48, - 0xb3, 0x4d, 0x09, 0xf9, 0x27, 0xb9, 0xf0, 0x94, 0x7d, 0x68, 0x0c, 0x3c, 0xec, 0x24, 0xa6, 0xec, - 0xc7, 0x42, 0x3b, 0x9b, 0xaf, 0x97, 0x26, 0x6a, 0x67, 0x15, 0x3c, 0x9f, 0x75, 0x5f, 0x42, 0x95, - 0x06, 0xa5, 0xea, 0xe2, 0x01, 0x2d, 0x79, 0x78, 0xf9, 0xf9, 0xbd, 0x71, 0x6a, 0x98, 0x25, 0x2c, - 0xb4, 0xbb, 0x5c, 0x8e, 0x79, 0xb0, 0x32, 0x08, 0xd3, 0x1a, 0xf7, 0x01, 0x25, 0x99, 0x66, 0xf2, - 0x69, 0x97, 0xe4, 0x42, 0xb2, 0xd7, 0x4e, 0x59, 0xa7, 0x8f, 0xa8, 0x19, 0xd3, 0xc4, 0x0a, 0x33, - 0x58, 0xe1, 0x12, 0xf2, 0x7f, 0xe5, 0x01, 0x82, 0x97, 0xff, 0x8f, 0x92, 0xe0, 0x7d, 0x3f, 0x01, - 0xb1, 0x52, 0xf2, 0xca, 0x38, 0xc5, 0xa9, 0xa9, 0x67, 0x2f, 0x9a, 0x7a, 0x58, 0x51, 0xf9, 0xde, - 0x58, 0x35, 0x33, 0x27, 0x9d, 0xc5, 0xdf, 0xb6, 0xa4, 0xf3, 0x04, 0xce, 0xc4, 0x83, 0x88, 0x67, - 0x9c, 0x2d, 0x28, 0x18, 0x1e, 0x1e, 0x32, 0x60, 0x2a, 0x75, 0xd3, 0x1b, 0x12, 0x62, 0xac, 0xf2, - 0x06, 0x94, 0x5a, 0x43, 0xad, 0x8f, 0xbb, 0x36, 0xee, 0x91, 0x4e, 0x0d, 0xd2, 0xe0, 0x86, 0xb0, - 0x86, 0xbc, 0x05, 0xc5, 0x1f, 0xe0, 0x13, 0x36, 0xfb, 0xa7, 0x34, 0x54, 0xfe, 0x93, 0x1c, 0xac, - 0xd1, 0xd5, 0x67, 0x5b, 0xc0, 0x42, 0x0a, 0x76, 0xad, 0x91, 0xd3, 0xc3, 0x2e, 0x0d, 0x0b, 0x7b, - 0xa4, 0xda, 0xd8, 0x31, 0x2c, 0x9d, 0xa3, 0x16, 0xa5, 0x9e, 0x3d, 0xea, 0x50, 0x02, 0x3a, 0x07, - 0xa4, 0xa1, 0x7e, 0x35, 0xb2, 0x78, 0xc4, 0xe6, 0x95, 0x62, 0xcf, 0x1e, 0xfd, 0x1e, 0x69, 0x0b, - 0x59, 0xf7, 0x58, 0x73, 0xb0, 0x4b, 0x03, 0x92, 0xc9, 0x76, 0x29, 0x01, 0xdd, 0x80, 0xd3, 0x43, - 0x3c, 0xb4, 0x9c, 0x13, 0x75, 0x60, 0x0c, 0x0d, 0x4f, 0x35, 0x4c, 0xf5, 0xf0, 0xc4, 0xc3, 0x2e, - 0x0f, 0x3e, 0xc4, 0x5e, 0x3e, 0x21, 0xef, 0x5a, 0xe6, 0x03, 0xf2, 0x06, 0xc9, 0x50, 0xb1, 0xac, - 0xa1, 0xea, 0xf6, 0x2c, 0x07, 0xab, 0x9a, 0xfe, 0x63, 0xba, 0x20, 0xe7, 0x95, 0xb2, 0x65, 0x0d, - 0xbb, 0x84, 0xd6, 0xd4, 0x7f, 0x8c, 0xde, 0x84, 0x72, 0xcf, 0x1e, 0xb9, 0xd8, 0x53, 0xc9, 0x1f, - 0xba, 0xde, 0x96, 0x14, 0x60, 0xa4, 0x6d, 0x7b, 0xe4, 0x86, 0x18, 0x86, 0xc4, 0xff, 0x8b, 0x61, - 0x86, 0xa7, 0xc4, 0xcd, 0x1a, 0x54, 0x22, 0xa8, 0x07, 0xd9, 0x80, 0x52, 0x78, 0x83, 0x6f, 0x40, - 0xc9, 0x33, 0xa1, 0x39, 0xd6, 0x40, 0x78, 0x92, 0x3e, 0x13, 0x9a, 0x77, 0x62, 0x8b, 0xdd, 0x27, - 0x7d, 0x26, 0x2e, 0x1f, 0xe0, 0xe7, 0x1c, 0x19, 0x2b, 0x29, 0xac, 0x21, 0xeb, 0x00, 0xdb, 0x9a, - 0xad, 0x1d, 0x1a, 0x03, 0xc3, 0x3b, 0x41, 0x57, 0xa1, 0xa6, 0xe9, 0xba, 0xda, 0x13, 0x14, 0x03, - 0x0b, 0xbc, 0x72, 0x59, 0xd3, 0xf5, 0xed, 0x10, 0x19, 0xbd, 0x03, 0x2b, 0xba, 0x63, 0xd9, 0x51, - 0x5e, 0x06, 0x60, 0xd6, 0xc8, 0x8b, 0x30, 0xb3, 0xfc, 0xef, 0x05, 0x38, 0x1f, 0x1d, 0xd8, 0x38, - 0xb2, 0x74, 0x1f, 0x96, 0x62, 0xbd, 0x66, 0x20, 0x30, 0x81, 0xb5, 0x4a, 0x44, 0x22, 0x86, 0x94, - 0xe4, 0x12, 0x48, 0x49, 0x2a, 0x76, 0x95, 0x7f, 0xad, 0xd8, 0xd5, 0xfc, 0x6b, 0xc1, 0xae, 0x0a, - 0xdf, 0x0e, 0xbb, 0x5a, 0x9a, 0x11, 0xbb, 0xba, 0x44, 0xb3, 0x97, 0xe8, 0x9d, 0xc2, 0x04, 0x2c, - 0x54, 0x2b, 0x7e, 0x1f, 0xa6, 0x00, 0xca, 0x63, 0x18, 0xd7, 0xe2, 0x2c, 0x18, 0x57, 0x31, 0x13, - 0xe3, 0x22, 0x51, 0x67, 0xdb, 0x9a, 0x33, 0xb4, 0x1c, 0x01, 0x62, 0xf1, 0xaa, 0x6d, 0x59, 0xd0, - 0x39, 0x80, 0x95, 0x09, 0x77, 0x41, 0x16, 0xdc, 0x85, 0x2e, 0xc0, 0x92, 0x69, 0xa9, 0x26, 0x7e, - 0xa1, 0x92, 0x58, 0x70, 0xeb, 0x65, 0x16, 0x18, 0xa6, 0xd5, 0xc6, 0x2f, 0x3a, 0x84, 0x82, 0x36, - 0x60, 0x69, 0xa8, 0xb9, 0xcf, 0xb0, 0x4e, 0x55, 0xb9, 0xf5, 0x0a, 0x0d, 0xe2, 0x32, 0xa3, 0x11, - 0x1d, 0x2e, 0xba, 0x08, 0xfe, 0x47, 0x72, 0xa6, 0x2a, 0x65, 0xaa, 0x08, 0x2a, 0x65, 0x93, 0xff, - 0x56, 0x82, 0xd5, 0x68, 0x98, 0x73, 0x18, 0xe4, 0x11, 0x94, 0x1c, 0x91, 0xc9, 0x78, 0x68, 0x5f, - 0xcd, 0x28, 0xbc, 0x93, 0xa9, 0x4f, 0x09, 0x64, 0xd1, 0x0f, 0x33, 0xd1, 0xb7, 0xeb, 0x93, 0xf4, - 0x4d, 0xc2, 0xdf, 0x64, 0x07, 0xde, 0xfc, 0xd4, 0x30, 0x75, 0xeb, 0x85, 0x9b, 0x39, 0x4b, 0x53, - 0x62, 0x45, 0xca, 0x88, 0x95, 0x9e, 0x83, 0x75, 0x6c, 0x7a, 0x86, 0x36, 0x50, 0x5d, 0x1b, 0xf7, - 0x04, 0x0a, 0x10, 0x90, 0xc9, 0xda, 0x21, 0xff, 0x42, 0x82, 0x33, 0xf1, 0x4e, 0xb9, 0xcf, 0x5a, - 0x49, 0x9f, 0xbd, 0x93, 0xfc, 0xc6, 0xb8, 0x70, 0xaa, 0xd7, 0xbe, 0xcc, 0xf4, 0xda, 0x8d, 0xc9, - 0x1a, 0x27, 0xfa, 0xed, 0x2f, 0x25, 0x38, 0x9b, 0x69, 0x46, 0x6c, 0xed, 0x91, 0xe2, 0x6b, 0x0f, - 0x5f, 0xb7, 0x7a, 0xd6, 0xc8, 0xf4, 0x42, 0xeb, 0xd6, 0x36, 0x3d, 0x36, 0x61, 0x0b, 0x84, 0x3a, - 0xd4, 0x5e, 0x1a, 0xc3, 0xd1, 0x90, 0x2f, 0x5c, 0x44, 0xdd, 0x53, 0x46, 0x79, 0x85, 0x95, 0x4b, - 0x6e, 0xc2, 0x8a, 0x6f, 0xe5, 0x58, 0x60, 0x33, 0x04, 0x54, 0xe6, 0xa2, 0x40, 0xa5, 0x09, 0x0b, - 0x3b, 0xf8, 0xb9, 0xd1, 0xc3, 0xaf, 0xe5, 0x5c, 0xe7, 0x02, 0x94, 0x6d, 0xec, 0x0c, 0x0d, 0xd7, - 0xf5, 0x33, 0x72, 0x49, 0x09, 0x93, 0xe4, 0xff, 0x58, 0x80, 0xe5, 0x78, 0x74, 0xdc, 0x4b, 0xe0, - 0xa2, 0x6f, 0xa5, 0xac, 0x15, 0xf1, 0x0f, 0x0d, 0xd5, 0xa7, 0x37, 0x44, 0xd5, 0x92, 0xcb, 0xc2, - 0x10, 0xfc, 0x0a, 0x87, 0x97, 0x34, 0xc4, 0x23, 0x3d, 0x6b, 0x38, 0xd4, 0x4c, 0x5d, 0x1c, 0xc7, - 0xf1, 0x26, 0xf1, 0x9f, 0xe6, 0xf4, 0x89, 0xdb, 0x09, 0x99, 0x3e, 0x93, 0xc1, 0x23, 0x1b, 0x6e, - 0xc3, 0xa4, 0xf8, 0x2a, 0xcd, 0xea, 0x25, 0x05, 0x38, 0x69, 0xc7, 0x70, 0xd0, 0x26, 0xcc, 0x63, - 0xf3, 0xb9, 0x28, 0x40, 0x53, 0xce, 0xeb, 0x44, 0xfd, 0xa4, 0x50, 0x3e, 0x74, 0x1d, 0x16, 0x86, - 0x24, 0x2c, 0xc4, 0xd6, 0x7b, 0x2d, 0xe3, 0xd8, 0x4a, 0xe1, 0x6c, 0x68, 0x0b, 0x16, 0x75, 0x3a, - 0x4e, 0x62, 0x7f, 0x5d, 0x4f, 0x41, 0x6d, 0x29, 0x83, 0x22, 0x18, 0xd1, 0xae, 0x5f, 0x5e, 0x97, - 0xb2, 0xea, 0xe2, 0xd8, 0x50, 0xa4, 0xd6, 0xd8, 0xfb, 0xd1, 0x1a, 0x1b, 0xa8, 0xae, 0xad, 0xc9, - 0xba, 0xc6, 0x17, 0xda, 0x67, 0xa1, 0x38, 0xb0, 0xfa, 0x2c, 0x8c, 0xca, 0xec, 0xa4, 0x77, 0x60, - 0xf5, 0x69, 0x14, 0xad, 0x92, 0xed, 0x86, 0x6e, 0x98, 0x74, 0xf9, 0x2b, 0x2a, 0xac, 0x41, 0x26, - 0x1f, 0x7d, 0x50, 0x2d, 0xb3, 0x87, 0xeb, 0x15, 0xfa, 0xaa, 0x44, 0x29, 0x7b, 0x66, 0x8f, 0xd6, - 0xa5, 0x9e, 0x77, 0x52, 0xaf, 0x52, 0x3a, 0x79, 0x24, 0x3b, 0x49, 0x86, 0x8e, 0x2c, 0x67, 0xed, - 0x24, 0xd3, 0xf2, 0xbb, 0x00, 0x47, 0x1e, 0xc0, 0xe2, 0x0b, 0x96, 0x08, 0xea, 0x35, 0x2a, 0x7f, - 0x65, 0x72, 0x7a, 0xe1, 0x1a, 0x84, 0xe0, 0x77, 0xb9, 0x47, 0xf8, 0x7b, 0x09, 0xce, 0x6c, 0xd3, - 0x8d, 0x56, 0x28, 0x8f, 0xcd, 0x82, 0x4e, 0xde, 0xf2, 0x81, 0xe3, 0x4c, 0xc4, 0x2f, 0xfe, 0xdd, - 0x02, 0x37, 0x6e, 0x41, 0x55, 0x28, 0xe7, 0x2a, 0xf2, 0x53, 0x63, 0xcf, 0x15, 0x37, 0xdc, 0x94, - 0x3f, 0x86, 0xb5, 0xc4, 0x57, 0xf0, 0xbd, 0xce, 0x06, 0x2c, 0x05, 0xf9, 0xca, 0xff, 0x88, 0xb2, - 0x4f, 0x6b, 0xe9, 0xf2, 0x6d, 0x38, 0xdd, 0xf5, 0x34, 0xc7, 0x4b, 0xb8, 0x60, 0x0a, 0x59, 0x8a, - 0x2a, 0x47, 0x65, 0x39, 0xf0, 0xdb, 0x85, 0xd5, 0xae, 0x67, 0xd9, 0xaf, 0xa0, 0x94, 0x64, 0x1d, - 0xf2, 0xfd, 0xd6, 0x48, 0xac, 0x0f, 0xa2, 0x29, 0xaf, 0x31, 0x0c, 0x3c, 0xd9, 0xdb, 0x1d, 0x38, - 0xc3, 0x20, 0xe8, 0x57, 0xf9, 0x88, 0xb3, 0x02, 0x00, 0x4f, 0xea, 0x7d, 0x0a, 0xa7, 0x82, 0x65, - 0x31, 0x00, 0x77, 0x6e, 0x46, 0xc1, 0x9d, 0x0b, 0x63, 0x46, 0x3d, 0x82, 0xed, 0xfc, 0x79, 0x2e, - 0x94, 0xd7, 0x33, 0xa0, 0x9d, 0x3b, 0x51, 0x68, 0xe7, 0xe2, 0x24, 0xdd, 0x11, 0x64, 0x27, 0x19, - 0xb5, 0xf9, 0x94, 0xa8, 0xfd, 0x22, 0x81, 0xff, 0xcc, 0x67, 0x01, 0x68, 0x31, 0x6b, 0x7f, 0x23, - 0xf0, 0x8f, 0xc2, 0xe0, 0x1f, 0xbf, 0x6b, 0xff, 0xc4, 0xe0, 0x56, 0x0c, 0xfe, 0xd9, 0x98, 0x68, - 0xaf, 0x8f, 0xfe, 0xfc, 0xf5, 0x3c, 0x94, 0xfc, 0x77, 0x09, 0x9f, 0x27, 0xdd, 0x96, 0x4b, 0x71, - 0x5b, 0x78, 0x05, 0xce, 0x7f, 0xab, 0x15, 0x78, 0x7e, 0xea, 0x15, 0xf8, 0x1c, 0x94, 0xe8, 0x83, - 0xea, 0xe0, 0x23, 0xbe, 0xa2, 0x16, 0x29, 0x41, 0xc1, 0x47, 0x41, 0x18, 0x2e, 0xcc, 0x14, 0x86, - 0x31, 0xc0, 0x69, 0x31, 0x0e, 0x38, 0xdd, 0xf3, 0x57, 0x44, 0xb6, 0x88, 0x5e, 0x1e, 0xa3, 0x37, - 0x75, 0x2d, 0x6c, 0x47, 0xd7, 0x42, 0xb6, 0xae, 0xbe, 0x3b, 0x4e, 0xcb, 0xd8, 0x55, 0xf0, 0xbb, - 0x5c, 0x21, 0x0e, 0x18, 0x8a, 0x14, 0x8e, 0x45, 0x9e, 0x59, 0xef, 0x00, 0xf8, 0x49, 0x44, 0x40, - 0x49, 0xe7, 0xc6, 0x7c, 0xa3, 0x12, 0x62, 0x27, 0x6a, 0x23, 0x43, 0x13, 0x9c, 0x8a, 0x4d, 0x97, - 0x1f, 0x33, 0x8e, 0xc4, 0xfe, 0xb7, 0x10, 0xca, 0x2f, 0x19, 0xa7, 0x3d, 0xf7, 0x12, 0x40, 0xe7, - 0x8c, 0x51, 0x7c, 0x33, 0x8a, 0x73, 0xbe, 0x62, 0xd4, 0x25, 0x60, 0x4e, 0x5a, 0xb9, 0x68, 0x0e, - 0x7f, 0xcd, 0xd0, 0xa5, 0x12, 0xa7, 0x34, 0xe9, 0xce, 0xe0, 0xc8, 0x30, 0x0d, 0xf7, 0x98, 0xbd, - 0x5f, 0x60, 0x3b, 0x03, 0x41, 0x6a, 0xd2, 0x1b, 0x5b, 0xf8, 0xa5, 0xe1, 0xa9, 0x3d, 0x4b, 0xc7, - 0x34, 0xa6, 0x0b, 0x4a, 0x91, 0x10, 0xb6, 0x2d, 0x1d, 0x07, 0x33, 0xaf, 0xf8, 0x6a, 0x33, 0xaf, - 0x14, 0x9b, 0x79, 0x67, 0x60, 0xc1, 0xc1, 0x9a, 0x6b, 0x99, 0x7c, 0x1f, 0xce, 0x5b, 0x64, 0x68, - 0x86, 0xd8, 0x75, 0x49, 0x4f, 0xbc, 0x5c, 0xe3, 0xcd, 0x50, 0x99, 0xb9, 0x34, 0xb1, 0xcc, 0x1c, - 0x73, 0x8a, 0x14, 0x2b, 0x33, 0x2b, 0x13, 0xcb, 0xcc, 0xa9, 0x0e, 0x91, 0x82, 0x42, 0xbb, 0x3a, - 0x5d, 0xa1, 0x1d, 0xae, 0x4b, 0x97, 0x23, 0x75, 0xe9, 0x77, 0x39, 0x59, 0x7f, 0x25, 0xc1, 0x5a, - 0x62, 0x5a, 0xf1, 0xe9, 0x7a, 0x2b, 0x76, 0xcc, 0xb4, 0x31, 0xd1, 0x67, 0xfe, 0x29, 0xd3, 0xa3, - 0xc8, 0x29, 0xd3, 0x07, 0x93, 0x05, 0x5f, 0xfb, 0x21, 0xd3, 0x1f, 0x49, 0xf0, 0xe6, 0x81, 0xad, - 0xc7, 0x2a, 0x3c, 0xbe, 0xed, 0x9f, 0x3e, 0x71, 0xdc, 0x13, 0xb5, 0x7e, 0x6e, 0x56, 0x40, 0x86, - 0xc9, 0xc9, 0x32, 0x5c, 0xc8, 0x36, 0x83, 0x97, 0x4c, 0x3f, 0x82, 0xe5, 0xdd, 0x97, 0xb8, 0xd7, - 0x3d, 0x31, 0x7b, 0x33, 0x98, 0x56, 0x83, 0x7c, 0x6f, 0xa8, 0x73, 0x38, 0x95, 0x3c, 0x86, 0xab, - 0xc0, 0x7c, 0xb4, 0x0a, 0x54, 0xa1, 0x16, 0xf4, 0xc0, 0x87, 0xf7, 0x0c, 0x19, 0x5e, 0x9d, 0x30, - 0x13, 0xe5, 0x4b, 0x0a, 0x6f, 0x71, 0x3a, 0x76, 0xd8, 0xa5, 0x0c, 0x46, 0xc7, 0x8e, 0x13, 0xcd, - 0x16, 0xf9, 0x68, 0xb6, 0x90, 0xff, 0x4c, 0x82, 0x32, 0xe9, 0xe1, 0x5b, 0xd9, 0xcf, 0xb7, 0x5a, - 0xf9, 0x60, 0xab, 0xe5, 0xef, 0xd8, 0xe6, 0xc3, 0x3b, 0xb6, 0xc0, 0xf2, 0x02, 0x25, 0x27, 0x2d, - 0x5f, 0xf0, 0xe9, 0xd8, 0x71, 0xe4, 0x0b, 0xb0, 0xc4, 0x6c, 0xe3, 0x5f, 0x5e, 0x83, 0xfc, 0xc8, - 0x19, 0x88, 0x38, 0x1a, 0x39, 0x03, 0xf9, 0x8f, 0x25, 0xa8, 0x34, 0x3d, 0x4f, 0xeb, 0x1d, 0xcf, - 0xf0, 0x01, 0xbe, 0x71, 0xb9, 0xb0, 0x71, 0xc9, 0x8f, 0x08, 0xcc, 0x9d, 0xcf, 0x30, 0xb7, 0x10, - 0x31, 0x57, 0x86, 0xaa, 0xb0, 0x25, 0xd3, 0xe0, 0x36, 0xa0, 0x8e, 0xe5, 0x78, 0x0f, 0x2d, 0xe7, - 0x85, 0xe6, 0xe8, 0xb3, 0xed, 0xc0, 0x10, 0xcc, 0xf3, 0x5b, 0xbc, 0xf9, 0x2b, 0x05, 0x85, 0x3e, - 0xcb, 0x97, 0xe1, 0x54, 0x44, 0x5f, 0x66, 0xc7, 0xf7, 0xa1, 0x4c, 0xf3, 0x3e, 0x2f, 0xc5, 0x6f, - 0x84, 0xcf, 0x75, 0xa6, 0x5a, 0x25, 0xe4, 0xdf, 0x85, 0x15, 0x52, 0x1f, 0x50, 0xba, 0x3f, 0x15, - 0xbf, 0x17, 0xab, 0x53, 0xcf, 0x67, 0x28, 0x8a, 0xd5, 0xa8, 0x7f, 0x23, 0x41, 0x81, 0xd2, 0x13, - 0x6b, 0xf6, 0x39, 0x28, 0x39, 0xd8, 0xb6, 0x54, 0x4f, 0xeb, 0xfb, 0x77, 0xa6, 0x09, 0x61, 0x5f, - 0xeb, 0x53, 0x34, 0x97, 0xbe, 0xd4, 0x8d, 0x3e, 0x76, 0x3d, 0x71, 0x71, 0xba, 0x4c, 0x68, 0x3b, - 0x8c, 0x44, 0x9c, 0xe4, 0x1a, 0xbf, 0xcf, 0xea, 0xce, 0x79, 0x85, 0x3e, 0xa3, 0x4d, 0x76, 0x8d, - 0x6f, 0x1a, 0xec, 0x9d, 0x5e, 0xf2, 0x6b, 0x40, 0x31, 0x06, 0x97, 0xfb, 0x6d, 0x79, 0x17, 0x50, - 0xd8, 0x0b, 0xdc, 0xdf, 0xd7, 0x61, 0x81, 0x3a, 0x49, 0x54, 0x47, 0x6b, 0x19, 0x6e, 0x50, 0x38, - 0x9b, 0xac, 0x01, 0x62, 0x0e, 0x8e, 0x54, 0x44, 0xb3, 0x8f, 0xca, 0x98, 0x0a, 0xe9, 0xef, 0x24, - 0x38, 0x15, 0xe9, 0x83, 0xdb, 0xfa, 0x5e, 0xb4, 0x93, 0x4c, 0x53, 0x79, 0x07, 0xdb, 0x91, 0x25, - 0xe1, 0x7a, 0x96, 0x49, 0xbf, 0xa6, 0xe5, 0xe0, 0x1f, 0x24, 0x80, 0xe6, 0xc8, 0x3b, 0xe6, 0xc8, - 0x60, 0x78, 0x64, 0xa4, 0xe8, 0xc8, 0x90, 0x77, 0xb6, 0xe6, 0xba, 0x2f, 0x2c, 0x47, 0xec, 0x69, - 0xfc, 0x36, 0xc5, 0xf0, 0x46, 0xde, 0xb1, 0x38, 0x33, 0x23, 0xcf, 0xe8, 0x22, 0x54, 0xd9, 0x3d, - 0x7d, 0x55, 0xd3, 0x75, 0x07, 0xbb, 0x2e, 0x3f, 0x3c, 0xab, 0x30, 0x6a, 0x93, 0x11, 0x09, 0x9b, - 0x41, 0x51, 0x6d, 0xef, 0x44, 0xf5, 0xac, 0x67, 0xd8, 0xe4, 0x7b, 0x93, 0x8a, 0xa0, 0xee, 0x13, - 0x22, 0x3b, 0x45, 0xe8, 0x1b, 0xae, 0xe7, 0x08, 0x36, 0x71, 0xd0, 0xc2, 0xa9, 0x94, 0x8d, 0x0c, - 0x4a, 0xad, 0x33, 0x1a, 0x0c, 0x98, 0x8b, 0x5f, 0x7d, 0xd8, 0xdf, 0xe7, 0x1f, 0x94, 0xcb, 0x8a, - 0xe9, 0xc0, 0x69, 0xfc, 0x73, 0x5f, 0x23, 0x08, 0xf3, 0x3e, 0xac, 0x84, 0xbe, 0x81, 0x87, 0x55, - 0xa4, 0x88, 0x94, 0xa2, 0x45, 0xa4, 0xfc, 0x08, 0x10, 0xc3, 0x1d, 0xbe, 0xe5, 0x77, 0xcb, 0xa7, - 0xe1, 0x54, 0x44, 0x11, 0x5f, 0x89, 0xaf, 0x41, 0x85, 0x5f, 0x89, 0xe2, 0x81, 0x72, 0x16, 0x8a, - 0x24, 0xa3, 0xf6, 0x0c, 0x5d, 0x1c, 0xa8, 0x2e, 0xda, 0x96, 0xbe, 0x6d, 0xe8, 0x8e, 0xfc, 0x29, - 0x54, 0x14, 0xd6, 0x0f, 0xe7, 0x7d, 0x08, 0x55, 0x7e, 0x81, 0x4a, 0x8d, 0x5c, 0x8d, 0x4c, 0xbb, - 0x7a, 0x1f, 0xee, 0x44, 0xa9, 0x98, 0xe1, 0xa6, 0xac, 0x43, 0x83, 0x95, 0x0c, 0x11, 0xf5, 0xe2, - 0x63, 0x1f, 0x82, 0xb8, 0x31, 0x30, 0xb1, 0x97, 0xa8, 0x7c, 0xc5, 0x09, 0x37, 0xe5, 0xf3, 0x70, - 0x2e, 0xb5, 0x17, 0xee, 0x09, 0x1b, 0x6a, 0xc1, 0x0b, 0x76, 0x7f, 0xcf, 0x3f, 0x31, 0x96, 0x42, - 0x27, 0xc6, 0x67, 0xfc, 0x22, 0x31, 0x27, 0x16, 0x31, 0x5a, 0x01, 0x06, 0xe5, 0x7e, 0x3e, 0xab, - 0xdc, 0x9f, 0x8f, 0x94, 0xfb, 0x72, 0xd7, 0xf7, 0x27, 0xdf, 0x86, 0x3d, 0xa0, 0xdb, 0x45, 0xd6, - 0xb7, 0x48, 0x88, 0xf2, 0xb8, 0xaf, 0x64, 0xac, 0x4a, 0x48, 0x4a, 0xbe, 0x0a, 0x95, 0x68, 0x6a, - 0x0c, 0xe5, 0x39, 0x29, 0x91, 0xe7, 0xaa, 0xb1, 0x14, 0xf7, 0x51, 0xac, 0x02, 0xce, 0xf6, 0x71, - 0xac, 0xfe, 0xbd, 0x1b, 0x49, 0x76, 0xd7, 0x52, 0x0e, 0x7b, 0x7f, 0x4d, 0x79, 0x6e, 0x95, 0xaf, - 0x07, 0x0f, 0x5d, 0x22, 0xcf, 0x3f, 0x5a, 0x7e, 0x0b, 0xca, 0x07, 0x59, 0xbf, 0xeb, 0x98, 0x17, - 0x17, 0x2b, 0x6e, 0xc2, 0xea, 0x43, 0x63, 0x80, 0xdd, 0x13, 0xd7, 0xc3, 0xc3, 0x16, 0x4d, 0x4a, - 0x47, 0x06, 0x76, 0xd0, 0x3a, 0x00, 0xdd, 0xc2, 0xd8, 0x96, 0xe1, 0x5f, 0xf7, 0x0f, 0x51, 0xe4, - 0xff, 0x94, 0x60, 0x39, 0x10, 0x3c, 0xa0, 0x5b, 0xb7, 0x37, 0xa0, 0x44, 0xbe, 0xd7, 0xf5, 0xb4, - 0xa1, 0x2d, 0xce, 0xb3, 0x7c, 0x02, 0xba, 0x03, 0x85, 0x23, 0x57, 0x40, 0x46, 0xa9, 0x00, 0x7a, - 0x9a, 0x21, 0xca, 0xfc, 0x91, 0xdb, 0xd2, 0xd1, 0xc7, 0x00, 0x23, 0x17, 0xeb, 0xfc, 0x0c, 0x2b, - 0x9f, 0x55, 0x2d, 0x1c, 0x84, 0x0f, 0xc2, 0x89, 0x00, 0xbb, 0x93, 0x71, 0x17, 0xca, 0x86, 0x69, - 0xe9, 0x98, 0x1e, 0x4e, 0xea, 0x1c, 0x55, 0x9a, 0x20, 0x0e, 0x4c, 0xe2, 0xc0, 0xc5, 0xba, 0x8c, - 0xf9, 0x5a, 0x28, 0xfc, 0xcb, 0x03, 0xa5, 0x0d, 0x2b, 0x2c, 0x69, 0x1d, 0xf9, 0x86, 0x8b, 0x88, - 0xdd, 0x18, 0xf7, 0x75, 0xd4, 0x5b, 0x4a, 0xcd, 0xe0, 0xa5, 0x8d, 0x10, 0x95, 0x6f, 0xc3, 0xe9, - 0xc8, 0x0e, 0x69, 0x86, 0x2d, 0x8b, 0xdc, 0x89, 0x01, 0x25, 0x41, 0x38, 0x73, 0x18, 0x42, 0x44, - 0xf3, 0x24, 0x18, 0xc2, 0x65, 0x30, 0x84, 0x2b, 0x7f, 0x01, 0x67, 0x23, 0x88, 0x4e, 0xc4, 0xa2, - 0xbb, 0xb1, 0xca, 0xed, 0xd2, 0x24, 0xad, 0xb1, 0x12, 0xee, 0x7f, 0x24, 0x58, 0x4d, 0x63, 0x78, - 0x45, 0xc4, 0xf1, 0x47, 0x19, 0x17, 0xf5, 0x6e, 0x4d, 0x67, 0xd6, 0x6f, 0x04, 0xad, 0xdd, 0x87, - 0x46, 0x9a, 0x3f, 0x93, 0xa3, 0x94, 0x9f, 0x65, 0x94, 0x7e, 0x96, 0x0f, 0x21, 0xef, 0x4d, 0xcf, - 0x73, 0x8c, 0xc3, 0x11, 0x09, 0xf9, 0xd7, 0x8e, 0x66, 0xb5, 0x7c, 0x5c, 0x86, 0xb9, 0xf6, 0xc6, - 0x18, 0xf1, 0xc0, 0x8e, 0x54, 0x6c, 0xe6, 0xb3, 0x28, 0x36, 0xc3, 0x30, 0xf5, 0x9b, 0xd3, 0xe9, - 0xfb, 0xad, 0x05, 0x40, 0x7f, 0x96, 0x83, 0x6a, 0x74, 0x88, 0xd0, 0x2e, 0x80, 0xe6, 0x5b, 0xce, - 0x27, 0xca, 0xc5, 0xa9, 0x3e, 0x53, 0x09, 0x09, 0xa2, 0x77, 0x21, 0xdf, 0xb3, 0x47, 0x7c, 0xd4, - 0x52, 0x0e, 0x83, 0xb7, 0xed, 0x11, 0xcb, 0x28, 0x84, 0x8d, 0xec, 0xa9, 0xd8, 0xd9, 0x7e, 0x76, - 0x96, 0x7c, 0x4a, 0xdf, 0x33, 0x19, 0xce, 0x8c, 0x1e, 0x43, 0xf5, 0x85, 0x63, 0x78, 0xda, 0xe1, - 0x00, 0xab, 0x03, 0xed, 0x04, 0x3b, 0x3c, 0x4b, 0x4e, 0x91, 0xc8, 0x2a, 0x42, 0xf0, 0x09, 0x91, - 0x93, 0xff, 0x10, 0x8a, 0xc2, 0xa2, 0x09, 0x2b, 0xc2, 0x3e, 0xac, 0x8d, 0x08, 0x9b, 0x4a, 0xef, - 0xca, 0x99, 0x9a, 0x69, 0xa9, 0x2e, 0x26, 0xcb, 0xb8, 0xf8, 0x5d, 0xc0, 0x84, 0x14, 0xbd, 0x4a, - 0xa5, 0xb7, 0x2d, 0x07, 0xb7, 0x35, 0xd3, 0xea, 0x32, 0x51, 0xf9, 0x39, 0x94, 0x43, 0x1f, 0x38, - 0xc1, 0x84, 0x16, 0xac, 0x88, 0xa3, 0x78, 0x17, 0x7b, 0x7c, 0x79, 0x99, 0xaa, 0xf3, 0x65, 0x2e, - 0xd7, 0xc5, 0x1e, 0xbb, 0x3e, 0x71, 0x17, 0xce, 0x2a, 0xd8, 0xb2, 0xb1, 0xe9, 0x8f, 0xe7, 0x13, - 0xab, 0x3f, 0x43, 0x06, 0x7f, 0x03, 0x1a, 0x69, 0xf2, 0x2c, 0x3f, 0x5c, 0xbb, 0x04, 0x45, 0xf1, - 0x23, 0x5d, 0xb4, 0x08, 0xf9, 0xfd, 0xed, 0x4e, 0x6d, 0x8e, 0x3c, 0x1c, 0xec, 0x74, 0x6a, 0x12, - 0x2a, 0xc2, 0x7c, 0x77, 0x7b, 0xbf, 0x53, 0xcb, 0x5d, 0x1b, 0x42, 0x2d, 0xfe, 0x0b, 0x55, 0xb4, - 0x06, 0xa7, 0x3a, 0xca, 0x5e, 0xa7, 0xf9, 0xa8, 0xb9, 0xdf, 0xda, 0x6b, 0xab, 0x1d, 0xa5, 0xf5, - 0x49, 0x73, 0x7f, 0xb7, 0x36, 0x87, 0x36, 0xe0, 0x7c, 0xf8, 0xc5, 0xe3, 0xbd, 0xee, 0xbe, 0xba, - 0xbf, 0xa7, 0x6e, 0xef, 0xb5, 0xf7, 0x9b, 0xad, 0xf6, 0xae, 0x52, 0x93, 0xd0, 0x79, 0x38, 0x1b, - 0x66, 0x79, 0xd0, 0xda, 0x69, 0x29, 0xbb, 0xdb, 0xe4, 0xb9, 0xf9, 0xa4, 0x96, 0xbb, 0x76, 0x03, - 0x2a, 0x91, 0x1f, 0x94, 0x12, 0x93, 0x3a, 0x7b, 0x3b, 0xb5, 0x39, 0x54, 0x81, 0x52, 0x58, 0x4f, - 0x11, 0xe6, 0xdb, 0x7b, 0x3b, 0xbb, 0xb5, 0xdc, 0xb5, 0xdb, 0xb0, 0x1c, 0xbb, 0xdf, 0x8b, 0x56, - 0xa0, 0xd2, 0x6d, 0xb6, 0x77, 0x1e, 0xec, 0x7d, 0xa6, 0x2a, 0xbb, 0xcd, 0x9d, 0xcf, 0x6b, 0x73, - 0x68, 0x15, 0x6a, 0x82, 0xd4, 0xde, 0xdb, 0x67, 0x54, 0xe9, 0xda, 0xb3, 0xd8, 0x1c, 0xc3, 0xe8, - 0x34, 0xac, 0xf8, 0xdd, 0xa8, 0xdb, 0xca, 0x6e, 0x73, 0x7f, 0x97, 0xf4, 0x1e, 0x21, 0x2b, 0x07, - 0xed, 0x76, 0xab, 0xfd, 0xa8, 0x26, 0x11, 0xad, 0x01, 0x79, 0xf7, 0xb3, 0x16, 0x61, 0xce, 0x45, - 0x99, 0x0f, 0xda, 0x3f, 0x68, 0xef, 0x7d, 0xda, 0xae, 0xe5, 0xb7, 0x7e, 0xb1, 0x02, 0x55, 0x51, - 0xe8, 0x61, 0x87, 0xde, 0x6a, 0xe9, 0xc0, 0xa2, 0xf8, 0xd1, 0x77, 0x4a, 0x86, 0x8e, 0xfe, 0x54, - 0xbd, 0xb1, 0x31, 0x86, 0x83, 0xd7, 0xdb, 0x73, 0xe8, 0x90, 0xd6, 0xbf, 0xa1, 0xfb, 0xd6, 0x97, - 0x52, 0xab, 0xcd, 0xc4, 0x15, 0xef, 0xc6, 0xe5, 0x89, 0x7c, 0x7e, 0x1f, 0x98, 0x94, 0xb8, 0xe1, - 0x9f, 0x34, 0xa1, 0xcb, 0x69, 0xb5, 0x69, 0xca, 0x6f, 0xa6, 0x1a, 0x57, 0x26, 0x33, 0xfa, 0xdd, - 0x3c, 0x83, 0x5a, 0xfc, 0xe7, 0x4d, 0x28, 0x05, 0x3a, 0xcd, 0xf8, 0x0d, 0x55, 0xe3, 0xda, 0x34, - 0xac, 0xe1, 0xce, 0x12, 0xbf, 0xd7, 0xb9, 0x3a, 0xcd, 0xef, 0x1a, 0x32, 0x3b, 0xcb, 0xfa, 0x09, - 0x04, 0x73, 0x60, 0xf4, 0x8a, 0x34, 0x4a, 0xfd, 0x71, 0x4c, 0xca, 0x4d, 0xfc, 0x34, 0x07, 0xa6, - 0xdf, 0xb6, 0x96, 0xe7, 0xd0, 0x31, 0x2c, 0xc7, 0xae, 0x27, 0xa0, 0x14, 0xf1, 0xf4, 0x7b, 0x18, - 0x8d, 0xab, 0x53, 0x70, 0x46, 0x23, 0x22, 0x7c, 0x1d, 0x21, 0x3d, 0x22, 0x52, 0x2e, 0x3b, 0xa4, - 0x47, 0x44, 0xea, 0xcd, 0x06, 0x1a, 0xdc, 0x91, 0x6b, 0x08, 0x69, 0xc1, 0x9d, 0x76, 0xf9, 0xa1, - 0x71, 0x79, 0x22, 0x5f, 0xd8, 0x69, 0xb1, 0x4b, 0x09, 0x69, 0x4e, 0x4b, 0xbf, 0xf4, 0xd0, 0xb8, - 0x3a, 0x05, 0x67, 0x3c, 0x0a, 0x82, 0x23, 0xce, 0xac, 0x28, 0x48, 0x1c, 0xc8, 0x67, 0x45, 0x41, - 0xf2, 0xb4, 0x94, 0x47, 0x41, 0xec, 0x68, 0xf2, 0xca, 0x14, 0x47, 0x29, 0xd9, 0x51, 0x90, 0x7e, - 0xe8, 0x22, 0xcf, 0xa1, 0x9f, 0x4a, 0x50, 0xcf, 0x3a, 0xa6, 0x40, 0x29, 0xf5, 0xdd, 0x84, 0x93, - 0x95, 0xc6, 0xd6, 0x2c, 0x22, 0xbe, 0x15, 0x5f, 0x01, 0x4a, 0xae, 0x7b, 0xe8, 0x9d, 0xb4, 0x91, - 0xc9, 0x58, 0x5d, 0x1b, 0xef, 0x4e, 0xc7, 0xec, 0x77, 0xd9, 0x85, 0xa2, 0x38, 0x18, 0x41, 0x29, - 0x59, 0x3a, 0x76, 0x2c, 0xd3, 0x90, 0xc7, 0xb1, 0xf8, 0x4a, 0x1f, 0xc1, 0x3c, 0xa1, 0xa2, 0xf3, - 0xe9, 0xdc, 0x42, 0xd9, 0x7a, 0xd6, 0x6b, 0x5f, 0xd1, 0x53, 0x58, 0x60, 0x27, 0x01, 0x28, 0x05, - 0x79, 0x88, 0x9c, 0x57, 0x34, 0x2e, 0x64, 0x33, 0xf8, 0xea, 0xbe, 0x64, 0xff, 0x0f, 0x84, 0x83, - 0xfc, 0xe8, 0xed, 0xf4, 0x1f, 0x58, 0x47, 0xcf, 0x14, 0x1a, 0x17, 0x27, 0x70, 0x85, 0x27, 0x45, - 0xac, 0xea, 0xbd, 0x3c, 0x71, 0xeb, 0x92, 0x3d, 0x29, 0xd2, 0x37, 0x47, 0x2c, 0x48, 0x92, 0x9b, - 0xa7, 0xb4, 0x20, 0xc9, 0xdc, 0xb2, 0xa6, 0x05, 0x49, 0xf6, 0x7e, 0x4c, 0x9e, 0x43, 0x1e, 0x9c, - 0x4a, 0x81, 0xca, 0xd0, 0xbb, 0x59, 0x41, 0x9e, 0x86, 0xdb, 0x35, 0xde, 0x9b, 0x92, 0x3b, 0x3c, - 0xf8, 0x7c, 0xd2, 0xbf, 0x99, 0x8d, 0x1f, 0x65, 0x0e, 0x7e, 0x7c, 0x8a, 0x6f, 0xfd, 0x4b, 0x1e, - 0x96, 0x18, 0x0c, 0xca, 0x2b, 0x98, 0xcf, 0x01, 0x82, 0x13, 0x08, 0xf4, 0x56, 0xba, 0x4f, 0x22, - 0xa7, 0x34, 0x8d, 0xb7, 0xc7, 0x33, 0x85, 0x03, 0x2d, 0x84, 0xe6, 0xa7, 0x05, 0x5a, 0xf2, 0xd0, - 0x22, 0x2d, 0xd0, 0x52, 0x8e, 0x04, 0xe4, 0x39, 0xf4, 0x09, 0x94, 0x7c, 0xd8, 0x18, 0xa5, 0xc1, - 0xce, 0x31, 0x5c, 0xbc, 0xf1, 0xd6, 0x58, 0x9e, 0xb0, 0xd5, 0x21, 0x4c, 0x38, 0xcd, 0xea, 0x24, - 0xf6, 0x9c, 0x66, 0x75, 0x1a, 0xb0, 0x1c, 0xf8, 0x84, 0x21, 0x47, 0x99, 0x3e, 0x89, 0x00, 0x77, - 0x99, 0x3e, 0x89, 0xc2, 0x4f, 0xf2, 0xdc, 0x83, 0x4b, 0xbf, 0xfc, 0x7a, 0x5d, 0xfa, 0xa7, 0xaf, - 0xd7, 0xe7, 0x7e, 0xf2, 0xcd, 0xba, 0xf4, 0xcb, 0x6f, 0xd6, 0xa5, 0x7f, 0xfc, 0x66, 0x5d, 0xfa, - 0xd7, 0x6f, 0xd6, 0xa5, 0x3f, 0xfd, 0xb7, 0xf5, 0xb9, 0x1f, 0x16, 0x85, 0xf4, 0xe1, 0x02, 0xfd, - 0xaf, 0x3e, 0x1f, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xde, 0xe7, 0x02, 0x9b, 0x49, - 0x00, 0x00, + 0x76, 0x17, 0xbf, 0x24, 0xf2, 0x51, 0xa4, 0xa8, 0xb2, 0x6c, 0xd1, 0xf4, 0x58, 0xb6, 0xda, 0xe3, + 0xcf, 0x19, 0xcb, 0x63, 0xcd, 0xac, 0x27, 0xb6, 0x67, 0x6d, 0xd3, 0x92, 0x6c, 0x33, 0x6b, 0x53, + 0x4c, 0x53, 0x9a, 0x8f, 0x9d, 0x01, 0x7a, 0x5b, 0xec, 0x12, 0xd5, 0x6b, 0xb2, 0xbb, 0xa7, 0xbb, + 0x69, 0x5b, 0x1b, 0x20, 0x58, 0x60, 0x91, 0x3d, 0xe4, 0x94, 0x73, 0x8e, 0x9b, 0x43, 0x0e, 0xb9, + 0x05, 0x08, 0x72, 0xc8, 0x69, 0x83, 0x1c, 0xf6, 0x12, 0x20, 0xa7, 0x4d, 0x82, 0x5c, 0x32, 0x93, + 0xe4, 0x12, 0x20, 0x41, 0xfe, 0x80, 0x1c, 0x82, 0xfa, 0xea, 0xef, 0xe6, 0x87, 0xc7, 0xbb, 0x33, + 0x7b, 0x12, 0xeb, 0xf5, 0x7b, 0xaf, 0x5e, 0xbf, 0x7a, 0xf5, 0xea, 0xd5, 0xaf, 0xaa, 0x05, 0x25, + 0xd5, 0xd2, 0x37, 0x2c, 0xdb, 0x74, 0x4d, 0x54, 0xb3, 0x47, 0x86, 0xab, 0x0f, 0xf1, 0xc6, 0x8b, + 0x9b, 0xea, 0xc0, 0x3a, 0x52, 0x37, 0x1b, 0xd7, 0xfb, 0xba, 0x7b, 0x34, 0x3a, 0xd8, 0xe8, 0x99, + 0xc3, 0x1b, 0x7d, 0xb3, 0x6f, 0xde, 0xa0, 0x8c, 0x07, 0xa3, 0x43, 0xda, 0xa2, 0x0d, 0xfa, 0x8b, + 0x29, 0x90, 0xae, 0x41, 0xf5, 0x63, 0x6c, 0x3b, 0xba, 0x69, 0xc8, 0xf8, 0xcb, 0x11, 0x76, 0x5c, + 0x54, 0x87, 0x85, 0x17, 0x8c, 0x52, 0xcf, 0x9c, 0xcf, 0x5c, 0x29, 0xc9, 0xa2, 0x29, 0xfd, 0x45, + 0x06, 0x96, 0x3c, 0x66, 0xc7, 0x32, 0x0d, 0x07, 0xa7, 0x73, 0xa3, 0x75, 0x58, 0xe4, 0xc6, 0x29, + 0x86, 0x3a, 0xc4, 0xf5, 0x2c, 0x7d, 0x5c, 0xe6, 0xb4, 0xb6, 0x3a, 0xc4, 0xe8, 0x32, 0x2c, 0x09, + 0x16, 0xa1, 0x24, 0x47, 0xb9, 0xaa, 0x9c, 0xcc, 0x7b, 0x43, 0x1b, 0x70, 0x42, 0x30, 0xaa, 0x96, + 0xee, 0x31, 0xe7, 0x29, 0xf3, 0x32, 0x7f, 0xd4, 0xb4, 0x74, 0xce, 0x2f, 0x7d, 0x0e, 0xa5, 0xed, + 0x76, 0x77, 0xcb, 0x34, 0x0e, 0xf5, 0x3e, 0x31, 0xd1, 0xc1, 0x36, 0x91, 0xa9, 0x67, 0xce, 0xe7, + 0x88, 0x89, 0xbc, 0x89, 0x1a, 0x50, 0x74, 0xb0, 0x6a, 0xf7, 0x8e, 0xb0, 0x53, 0xcf, 0xd2, 0x47, + 0x5e, 0x9b, 0x48, 0x99, 0x96, 0xab, 0x9b, 0x86, 0x53, 0xcf, 0x31, 0x29, 0xde, 0x94, 0x7e, 0x91, + 0x81, 0x72, 0xc7, 0xb4, 0xdd, 0x67, 0xaa, 0x65, 0xe9, 0x46, 0x1f, 0xdd, 0x82, 0x22, 0xf5, 0x65, + 0xcf, 0x1c, 0x50, 0x1f, 0x54, 0x37, 0x1b, 0x1b, 0xd1, 0x61, 0xd9, 0xe8, 0x70, 0x0e, 0xd9, 0xe3, + 0x45, 0x17, 0xa1, 0xda, 0x33, 0x0d, 0x57, 0xd5, 0x0d, 0x6c, 0x2b, 0x96, 0x69, 0xbb, 0xd4, 0x45, + 0x05, 0xb9, 0xe2, 0x51, 0x49, 0x2f, 0xe8, 0x0c, 0x94, 0x8e, 0x4c, 0xc7, 0x65, 0x1c, 0x39, 0xca, + 0x51, 0x24, 0x04, 0xfa, 0x70, 0x15, 0x16, 0xe8, 0x43, 0xdd, 0xe2, 0xce, 0x98, 0x27, 0xcd, 0x96, + 0x25, 0xfd, 0x3a, 0x03, 0x85, 0x67, 0xe6, 0xc8, 0x70, 0x23, 0xdd, 0xa8, 0xee, 0x11, 0x1f, 0xa8, + 0x40, 0x37, 0xaa, 0x7b, 0xe4, 0x77, 0x43, 0x38, 0xd8, 0x58, 0xb1, 0x6e, 0xc8, 0xc3, 0x06, 0x14, + 0x6d, 0xac, 0x6a, 0xa6, 0x31, 0x38, 0xa6, 0x26, 0x14, 0x65, 0xaf, 0x4d, 0x06, 0xd1, 0xc1, 0x03, + 0xdd, 0x18, 0xbd, 0x52, 0x6c, 0x3c, 0x50, 0x0f, 0xf0, 0x80, 0x9a, 0x52, 0x94, 0xab, 0x9c, 0x2c, + 0x33, 0x2a, 0xda, 0x86, 0xb2, 0x65, 0x9b, 0x96, 0xda, 0x57, 0x89, 0x1f, 0xeb, 0x05, 0xea, 0x2a, + 0x29, 0xee, 0x2a, 0x6a, 0x76, 0xc7, 0xe7, 0x94, 0x83, 0x62, 0xd2, 0x5f, 0x65, 0x60, 0x89, 0x04, + 0x8f, 0x63, 0xa9, 0x3d, 0xbc, 0x4b, 0x87, 0x04, 0xdd, 0x86, 0x05, 0x03, 0xbb, 0x2f, 0x4d, 0xfb, + 0x39, 0x1f, 0x80, 0x73, 0x71, 0xad, 0x9e, 0xcc, 0x33, 0x53, 0xc3, 0xb2, 0xe0, 0x47, 0x37, 0x21, + 0x67, 0xe9, 0x1a, 0x7d, 0xe1, 0x29, 0xc4, 0x08, 0x2f, 0x11, 0xd1, 0xad, 0x1e, 0xf5, 0xc3, 0x34, + 0x22, 0xba, 0xd5, 0x93, 0x24, 0x80, 0x96, 0xe1, 0xde, 0xfa, 0xe0, 0x63, 0x75, 0x30, 0xc2, 0x68, + 0x05, 0x0a, 0x2f, 0xc8, 0x0f, 0x6a, 0x6c, 0x4e, 0x66, 0x0d, 0xe9, 0xab, 0x1c, 0x9c, 0x79, 0x4a, + 0xfc, 0xd5, 0x55, 0x0d, 0xed, 0xc0, 0x7c, 0xd5, 0xc5, 0xbd, 0x91, 0xad, 0xbb, 0xc7, 0x5b, 0xa6, + 0xe1, 0xe2, 0x57, 0x2e, 0x6a, 0xc3, 0xb2, 0x21, 0x34, 0x2b, 0x22, 0x34, 0x89, 0x86, 0xf2, 0xe6, + 0xfa, 0x18, 0x23, 0x98, 0x8b, 0xe4, 0x9a, 0x11, 0x26, 0x38, 0xe8, 0x89, 0x3f, 0x6e, 0x42, 0x5b, + 0x96, 0x6a, 0x4b, 0x78, 0xa5, 0xee, 0x0e, 0xb5, 0x8c, 0xeb, 0x12, 0x03, 0x2b, 0x34, 0x7d, 0x04, + 0x64, 0x56, 0x2b, 0xaa, 0xa3, 0x8c, 0x1c, 0x6c, 0x53, 0xc7, 0x94, 0x37, 0xdf, 0x8a, 0x6b, 0xf1, + 0x5d, 0x20, 0x97, 0xec, 0x91, 0xd1, 0x74, 0xf6, 0x1d, 0x6c, 0xa3, 0x7b, 0x34, 0x4f, 0x10, 0xe9, + 0xbe, 0x6d, 0x8e, 0xac, 0x7a, 0x71, 0x0a, 0x71, 0xa0, 0xe2, 0x8f, 0x09, 0x3f, 0x4d, 0x22, 0x3c, + 0x16, 0x15, 0xdb, 0x34, 0xdd, 0x43, 0x47, 0xc4, 0x9f, 0x20, 0xcb, 0x94, 0x8a, 0x6e, 0xc0, 0x09, + 0x67, 0x64, 0x59, 0x03, 0x3c, 0xc4, 0x86, 0xab, 0x0e, 0x58, 0x77, 0x4e, 0xbd, 0x70, 0x3e, 0x77, + 0x25, 0x27, 0xa3, 0xe0, 0x23, 0xaa, 0xd8, 0x41, 0x6b, 0x00, 0x96, 0xad, 0xbf, 0xd0, 0x07, 0xb8, + 0x8f, 0xb5, 0xfa, 0x3c, 0x55, 0x1a, 0xa0, 0xa0, 0xf7, 0x60, 0xc5, 0xc1, 0xbd, 0x9e, 0x39, 0xb4, + 0x14, 0xcb, 0x36, 0x0f, 0xf5, 0x01, 0x66, 0xb3, 0x67, 0x81, 0xce, 0x1e, 0xc4, 0x9f, 0x75, 0xd8, + 0x23, 0x32, 0x8f, 0xa4, 0x5f, 0x64, 0xe1, 0x24, 0xf5, 0x64, 0xc7, 0xd4, 0xf8, 0x30, 0xf3, 0x24, + 0x75, 0x01, 0x2a, 0x3d, 0x6a, 0x90, 0x62, 0xa9, 0x36, 0x36, 0x5c, 0x3e, 0x49, 0x17, 0x19, 0xb1, + 0x43, 0x69, 0xe8, 0x53, 0xa8, 0x39, 0x3c, 0x2a, 0x94, 0x1e, 0x0b, 0x0b, 0x3e, 0x66, 0xd7, 0xe3, + 0xee, 0x1a, 0x13, 0x4b, 0xf2, 0x92, 0x13, 0x0b, 0xae, 0x05, 0xe7, 0xd8, 0xe9, 0xb9, 0x03, 0x96, + 0xed, 0xca, 0x9b, 0x1f, 0xa4, 0x28, 0x8c, 0x1a, 0xbe, 0xd1, 0x65, 0x62, 0x3b, 0x86, 0x6b, 0x1f, + 0xcb, 0x42, 0x49, 0xe3, 0x0e, 0x2c, 0x06, 0x1f, 0xa0, 0x1a, 0xe4, 0x9e, 0xe3, 0x63, 0xfe, 0x52, + 0xe4, 0xa7, 0x3f, 0x09, 0x58, 0xae, 0x61, 0x8d, 0x3b, 0xd9, 0xdf, 0xcb, 0x48, 0x36, 0x20, 0xbf, + 0x97, 0x67, 0xd8, 0x55, 0x35, 0xd5, 0x55, 0x11, 0x82, 0x3c, 0x5d, 0x46, 0x98, 0x0a, 0xfa, 0x9b, + 0x68, 0x1d, 0xf1, 0xc9, 0x5b, 0x92, 0xc9, 0x4f, 0xf4, 0x16, 0x94, 0xbc, 0x40, 0xe7, 0x6b, 0x89, + 0x4f, 0x20, 0x39, 0x5d, 0x75, 0x5d, 0x3c, 0xb4, 0x5c, 0x1a, 0x22, 0x15, 0x59, 0x34, 0xa5, 0xff, + 0xc9, 0x43, 0x2d, 0x36, 0x26, 0x0f, 0xa0, 0x38, 0xe4, 0xdd, 0xf3, 0x89, 0xf6, 0x76, 0x42, 0x62, + 0x8f, 0x99, 0x2a, 0x7b, 0x52, 0x24, 0x6f, 0x92, 0x1c, 0x1a, 0x58, 0xff, 0xbc, 0x36, 0x19, 0xf1, + 0x81, 0xd9, 0x57, 0x34, 0xdd, 0xc6, 0x3d, 0xd7, 0xb4, 0x8f, 0xb9, 0xb9, 0x8b, 0x03, 0xb3, 0xbf, + 0x2d, 0x68, 0xe8, 0x0e, 0x80, 0x66, 0x38, 0x64, 0xb0, 0x0f, 0xf5, 0x3e, 0x35, 0xba, 0xbc, 0x79, + 0x26, 0x6e, 0x84, 0xb7, 0xd8, 0xc9, 0x25, 0xcd, 0x70, 0xb8, 0xf9, 0x0f, 0xa1, 0x42, 0xd6, 0x0c, + 0x65, 0xc8, 0xd6, 0x29, 0x16, 0xe9, 0xe5, 0xcd, 0xb3, 0x49, 0xef, 0xe0, 0xad, 0x66, 0xf2, 0xa2, + 0xe5, 0x37, 0x1c, 0xf4, 0x08, 0xe6, 0x69, 0xf2, 0x76, 0xea, 0xf3, 0x54, 0x78, 0x63, 0x9c, 0x03, + 0x78, 0x44, 0x3c, 0xa5, 0x02, 0x2c, 0x20, 0xb8, 0x34, 0xda, 0x87, 0xb2, 0x6a, 0x18, 0xa6, 0xab, + 0xb2, 0x44, 0xb3, 0x40, 0x95, 0xbd, 0x3f, 0x85, 0xb2, 0xa6, 0x2f, 0xc5, 0x34, 0x06, 0xf5, 0xa0, + 0xef, 0x43, 0x81, 0x66, 0x22, 0x9e, 0x34, 0x2e, 0x4f, 0x19, 0xb4, 0x32, 0x93, 0x6a, 0xdc, 0x86, + 0x72, 0xc0, 0xd8, 0x59, 0x82, 0xb4, 0x71, 0x0f, 0x6a, 0x51, 0xd3, 0x66, 0x0a, 0xf2, 0x3f, 0x84, + 0x15, 0x79, 0x64, 0xf8, 0x86, 0x89, 0xea, 0xeb, 0x0e, 0xcc, 0xf3, 0xc1, 0x66, 0x11, 0x27, 0x4d, + 0xf6, 0x91, 0xcc, 0x25, 0x82, 0xe5, 0xd4, 0x91, 0x6a, 0x68, 0x03, 0x6c, 0xf3, 0x7e, 0x45, 0x39, + 0xf5, 0x84, 0x51, 0xa5, 0xef, 0xc3, 0xc9, 0x48, 0xe7, 0xbc, 0x9a, 0x7b, 0x1b, 0xaa, 0x96, 0xa9, + 0x29, 0x0e, 0x23, 0x2b, 0xba, 0x26, 0xd2, 0x90, 0xe5, 0xf1, 0xb6, 0x34, 0x22, 0xde, 0x75, 0x4d, + 0x2b, 0x6e, 0xfc, 0x74, 0xe2, 0x75, 0x38, 0x15, 0x15, 0x67, 0xdd, 0x4b, 0xf7, 0x61, 0x55, 0xc6, + 0x43, 0xf3, 0x05, 0x7e, 0x5d, 0xd5, 0x0d, 0xa8, 0xc7, 0x15, 0x70, 0xe5, 0x9f, 0xc1, 0xaa, 0x4f, + 0xed, 0xba, 0xaa, 0x3b, 0x72, 0x66, 0x52, 0xce, 0x4b, 0xdd, 0x03, 0xd3, 0x61, 0xc3, 0x59, 0x94, + 0x45, 0x53, 0x5a, 0x85, 0x42, 0xc7, 0xd4, 0x5a, 0x1d, 0x54, 0x85, 0xac, 0x6e, 0x71, 0xe1, 0xac, + 0x6e, 0x49, 0x7a, 0xb0, 0xcf, 0x36, 0x2b, 0x39, 0x58, 0xd7, 0x51, 0x56, 0x74, 0x0f, 0xaa, 0xaa, + 0xa6, 0xe9, 0x24, 0x9c, 0xd4, 0x81, 0xa2, 0x5b, 0xac, 0x22, 0x2d, 0x6f, 0xae, 0x26, 0x06, 0x40, + 0xab, 0x23, 0x57, 0x7c, 0xf6, 0x96, 0xe5, 0x48, 0x4f, 0xa0, 0xe4, 0xad, 0xf9, 0xe8, 0xae, 0x5f, + 0xbc, 0x66, 0xa7, 0xad, 0x10, 0xbc, 0xfa, 0x76, 0x2f, 0xb6, 0x46, 0x71, 0x93, 0xef, 0x02, 0x78, + 0xb9, 0x54, 0x94, 0x1e, 0x67, 0xc6, 0x28, 0x96, 0x03, 0xec, 0xd2, 0xcf, 0x0a, 0xc1, 0x0c, 0x1b, + 0x70, 0x82, 0xe6, 0x39, 0x41, 0x0b, 0x65, 0xdc, 0xec, 0x6b, 0x65, 0xdc, 0x0f, 0xa1, 0xe0, 0xb8, + 0xaa, 0x8b, 0x79, 0x79, 0xb6, 0x3e, 0x4e, 0x9c, 0x18, 0x81, 0x65, 0xc6, 0x8f, 0xce, 0x02, 0xf4, + 0x6c, 0xac, 0xba, 0x58, 0x53, 0x54, 0xb6, 0x3c, 0xe4, 0xe4, 0x12, 0xa7, 0x34, 0x5d, 0xb4, 0xe5, + 0x97, 0x98, 0x05, 0x6a, 0xd8, 0xd5, 0x71, 0x9a, 0x43, 0x43, 0xed, 0x17, 0x9b, 0x5e, 0xba, 0x9a, + 0x9f, 0x32, 0x5d, 0x71, 0x05, 0x4c, 0x2a, 0x90, 0x8c, 0x17, 0x26, 0x27, 0x63, 0x26, 0x3a, 0x4d, + 0x32, 0x2e, 0x4e, 0x4e, 0xc6, 0x5c, 0xd9, 0xf8, 0x64, 0x9c, 0x90, 0x7e, 0x4a, 0x49, 0xe9, 0xe7, + 0xdb, 0x4c, 0xbb, 0xff, 0x92, 0x81, 0x7a, 0x3c, 0x0b, 0xf0, 0xec, 0x77, 0x07, 0xe6, 0x1d, 0x4a, + 0x99, 0x26, 0xf7, 0x72, 0x59, 0x2e, 0x81, 0x9e, 0x40, 0x5e, 0x37, 0x0e, 0x4d, 0x3e, 0x69, 0x3f, + 0x98, 0x42, 0x92, 0xf7, 0xba, 0xd1, 0x32, 0x0e, 0x4d, 0xe6, 0x4d, 0xaa, 0xa1, 0xf1, 0x21, 0x94, + 0x3c, 0xd2, 0x4c, 0xef, 0xb6, 0x0b, 0x2b, 0x91, 0xd8, 0x66, 0xdb, 0x0d, 0x6f, 0x4a, 0x64, 0x66, + 0x9b, 0x12, 0xd2, 0x4f, 0xb3, 0xc1, 0x29, 0xfb, 0x48, 0x1f, 0xb8, 0xd8, 0x8e, 0x4d, 0xd9, 0x8f, + 0x84, 0x76, 0x36, 0x5f, 0x2f, 0x4d, 0xd4, 0xce, 0x2a, 0x78, 0x3e, 0xeb, 0xbe, 0x80, 0x2a, 0x0d, + 0x4a, 0xc5, 0xc1, 0x03, 0x5a, 0xf2, 0xf0, 0xf2, 0xf3, 0x7b, 0xe3, 0xd4, 0x30, 0x4b, 0x58, 0x68, + 0x77, 0xb9, 0x1c, 0xf3, 0x60, 0x65, 0x10, 0xa4, 0x35, 0x1e, 0x00, 0x8a, 0x33, 0xcd, 0xe4, 0xd3, + 0x2e, 0xc9, 0x85, 0x64, 0xaf, 0x9d, 0xb0, 0x4e, 0x1f, 0x52, 0x33, 0xa6, 0x89, 0x15, 0x66, 0xb0, + 0xcc, 0x25, 0xa4, 0xff, 0xce, 0x01, 0xf8, 0x0f, 0x7f, 0x87, 0x92, 0xe0, 0x03, 0x2f, 0x01, 0xb1, + 0x52, 0xf2, 0xca, 0x38, 0xc5, 0x89, 0xa9, 0x67, 0x37, 0x9c, 0x7a, 0x58, 0x51, 0x79, 0x7d, 0xac, + 0x9a, 0x99, 0x93, 0xce, 0xc2, 0x77, 0x2d, 0xe9, 0x3c, 0x85, 0x53, 0xd1, 0x20, 0xe2, 0x19, 0x67, + 0x13, 0x0a, 0xba, 0x8b, 0x87, 0x0c, 0x98, 0x4a, 0xdc, 0xf4, 0x06, 0x84, 0x18, 0xab, 0xb4, 0x0e, + 0xa5, 0xd6, 0x50, 0xed, 0xe3, 0xae, 0x85, 0x7b, 0xa4, 0x53, 0x9d, 0x34, 0xb8, 0x21, 0xac, 0x21, + 0x6d, 0x42, 0xf1, 0x07, 0xf8, 0x98, 0xcd, 0xfe, 0x29, 0x0d, 0x95, 0xfe, 0x29, 0x0b, 0xab, 0x74, + 0xf5, 0xd9, 0x12, 0xb0, 0x90, 0x8c, 0x1d, 0x73, 0x64, 0xf7, 0xb0, 0x43, 0xc3, 0xc2, 0x1a, 0x29, + 0x16, 0xb6, 0x75, 0x53, 0xe3, 0xa8, 0x45, 0xa9, 0x67, 0x8d, 0x3a, 0x94, 0x80, 0xce, 0x00, 0x69, + 0x28, 0x5f, 0x8e, 0x4c, 0x1e, 0xb1, 0x39, 0xb9, 0xd8, 0xb3, 0x46, 0x7f, 0x40, 0xda, 0x42, 0xd6, + 0x39, 0x52, 0x6d, 0xec, 0xd0, 0x80, 0x64, 0xb2, 0x5d, 0x4a, 0x40, 0x37, 0xe1, 0xe4, 0x10, 0x0f, + 0x4d, 0xfb, 0x58, 0x19, 0xe8, 0x43, 0xdd, 0x55, 0x74, 0x43, 0x39, 0x38, 0x76, 0xb1, 0xc3, 0x83, + 0x0f, 0xb1, 0x87, 0x4f, 0xc9, 0xb3, 0x96, 0xf1, 0x90, 0x3c, 0x41, 0x12, 0x54, 0x4c, 0x73, 0xa8, + 0x38, 0x3d, 0xd3, 0xc6, 0x8a, 0xaa, 0xfd, 0x98, 0x2e, 0xc8, 0x39, 0xb9, 0x6c, 0x9a, 0xc3, 0x2e, + 0xa1, 0x35, 0xb5, 0x1f, 0xa3, 0x73, 0x50, 0xee, 0x59, 0x23, 0x07, 0xbb, 0x0a, 0xf9, 0x43, 0xd7, + 0xdb, 0x92, 0x0c, 0x8c, 0xb4, 0x65, 0x8d, 0x9c, 0x00, 0xc3, 0x90, 0xf8, 0x7f, 0x21, 0xc8, 0xf0, + 0x0c, 0x0f, 0x29, 0x3c, 0x72, 0x34, 0xea, 0x63, 0x4b, 0xed, 0x63, 0x66, 0x9a, 0x58, 0x28, 0x13, + 0xe0, 0x91, 0x27, 0x9c, 0x91, 0x9a, 0x29, 0x57, 0x8f, 0x82, 0x4d, 0x47, 0x7a, 0x08, 0x95, 0x10, + 0x03, 0xf1, 0x17, 0x55, 0xeb, 0xe8, 0x3f, 0x11, 0x03, 0x57, 0x24, 0x84, 0xae, 0xfe, 0x13, 0x0a, + 0x0e, 0xd1, 0xee, 0xa8, 0x23, 0xf3, 0x32, 0x6b, 0x48, 0x2a, 0x54, 0x42, 0x18, 0x0c, 0xd9, 0x0e, + 0x53, 0xb0, 0x85, 0x6f, 0x87, 0xc9, 0x6f, 0x42, 0xb3, 0xcd, 0x81, 0x18, 0x57, 0xfa, 0x9b, 0xd0, + 0xdc, 0x63, 0x4b, 0xec, 0x85, 0xe9, 0x6f, 0xda, 0x05, 0x7e, 0xc1, 0x71, 0xba, 0x92, 0xcc, 0x1a, + 0x92, 0x06, 0xb0, 0xa5, 0x5a, 0xea, 0x81, 0x3e, 0xd0, 0xdd, 0x63, 0x74, 0x15, 0x6a, 0xaa, 0xa6, + 0x29, 0x3d, 0x41, 0xd1, 0xb1, 0x40, 0x4f, 0x97, 0x54, 0x4d, 0xdb, 0x0a, 0x90, 0xd1, 0x3b, 0xb0, + 0xac, 0xd9, 0xa6, 0x15, 0xe6, 0x65, 0x70, 0x6a, 0x8d, 0x3c, 0x08, 0x32, 0x4b, 0xff, 0x51, 0x80, + 0xb3, 0xe1, 0x30, 0x8b, 0xe2, 0x5c, 0x0f, 0x60, 0x31, 0xd2, 0x6b, 0x0a, 0x1e, 0xe4, 0x5b, 0x2b, + 0x87, 0x24, 0x22, 0xb8, 0x4d, 0x36, 0x86, 0xdb, 0x24, 0x22, 0x69, 0xb9, 0x37, 0x8a, 0xa4, 0xe5, + 0xdf, 0x08, 0x92, 0x56, 0xf8, 0x66, 0x48, 0xda, 0xe2, 0x8c, 0x48, 0xda, 0x25, 0x9a, 0x4b, 0x45, + 0xef, 0x14, 0xb4, 0x60, 0x13, 0xa7, 0xe2, 0xf5, 0x61, 0x08, 0xd8, 0x3e, 0x82, 0xb8, 0x2d, 0xcc, + 0x82, 0xb8, 0x15, 0x53, 0x11, 0x37, 0x12, 0x75, 0x96, 0xa5, 0xda, 0x43, 0xd3, 0x16, 0x90, 0x1a, + 0xaf, 0x21, 0x97, 0x04, 0x9d, 0xc3, 0x69, 0xa9, 0xe0, 0x1b, 0xa4, 0x81, 0x6f, 0xe8, 0x3c, 0x2c, + 0x1a, 0xa6, 0x62, 0xe0, 0x97, 0x0a, 0x89, 0x05, 0xa7, 0x5e, 0x66, 0x81, 0x61, 0x98, 0x6d, 0xfc, + 0xb2, 0x43, 0x28, 0x68, 0x1d, 0x16, 0x87, 0xaa, 0xf3, 0x1c, 0x6b, 0x54, 0x95, 0x53, 0xaf, 0xd0, + 0x20, 0x2e, 0x33, 0x1a, 0xd1, 0xe1, 0xa0, 0x8b, 0xe0, 0xbd, 0x24, 0x67, 0xaa, 0x52, 0xa6, 0x8a, + 0xa0, 0x52, 0x36, 0xe9, 0x6f, 0x33, 0xb0, 0x12, 0x0e, 0x73, 0x0e, 0xca, 0x3c, 0x86, 0x92, 0x2d, + 0xf2, 0x2a, 0x0f, 0xed, 0xab, 0x29, 0xdb, 0x80, 0x78, 0x22, 0x96, 0x7d, 0x59, 0xf4, 0xc3, 0x54, + 0x2c, 0xf0, 0xc6, 0x24, 0x7d, 0x93, 0xd0, 0x40, 0xc9, 0x86, 0x73, 0x9f, 0xe8, 0x86, 0x66, 0xbe, + 0x74, 0x52, 0x67, 0x69, 0x42, 0xac, 0x64, 0x52, 0x62, 0xa5, 0x67, 0x63, 0x0d, 0x1b, 0xae, 0xae, + 0x0e, 0x14, 0xc7, 0xc2, 0x3d, 0x81, 0x49, 0xf8, 0x64, 0xb2, 0x92, 0x49, 0xbf, 0xcc, 0xc0, 0xa9, + 0x68, 0xa7, 0xdc, 0x67, 0xad, 0xb8, 0xcf, 0xde, 0x89, 0xbf, 0x63, 0x54, 0x38, 0xd1, 0x6b, 0x5f, + 0xa4, 0x7a, 0xed, 0xe6, 0x64, 0x8d, 0x13, 0xfd, 0xf6, 0x97, 0x19, 0x38, 0x9d, 0x6a, 0x46, 0x64, + 0x25, 0xcc, 0x44, 0x57, 0x42, 0xbe, 0x8a, 0xf6, 0xcc, 0x91, 0xe1, 0x06, 0x56, 0xd1, 0x2d, 0x7a, + 0x88, 0xc3, 0x96, 0x2b, 0x65, 0xa8, 0xbe, 0xd2, 0x87, 0xa3, 0x21, 0x5f, 0x46, 0x89, 0xba, 0x67, + 0x8c, 0xf2, 0x1a, 0xeb, 0xa8, 0xd4, 0x84, 0x65, 0xcf, 0xca, 0xb1, 0x30, 0x6b, 0x00, 0x36, 0xcd, + 0x86, 0x61, 0x53, 0x03, 0xe6, 0xb7, 0xf1, 0x0b, 0xbd, 0x87, 0xdf, 0xc8, 0x29, 0xd3, 0x79, 0x28, + 0x5b, 0xd8, 0x1e, 0xea, 0x8e, 0xe3, 0x65, 0xe4, 0x92, 0x1c, 0x24, 0x49, 0xff, 0x39, 0x0f, 0x4b, + 0xd1, 0xe8, 0xb8, 0x1f, 0x43, 0x69, 0x2f, 0x24, 0xac, 0x15, 0xd1, 0x17, 0x0d, 0x54, 0xcb, 0x37, + 0x45, 0x0d, 0x95, 0x4d, 0x43, 0x34, 0xbc, 0x7a, 0x8b, 0x17, 0x58, 0xc4, 0x23, 0x3d, 0x73, 0x38, + 0x54, 0x0d, 0x4d, 0x1c, 0x0e, 0xf2, 0x26, 0xf1, 0x9f, 0x6a, 0xf7, 0x89, 0xdb, 0x09, 0x99, 0xfe, + 0x26, 0x83, 0x47, 0xb6, 0xff, 0xba, 0x41, 0xd1, 0x5e, 0x9a, 0xd5, 0x4b, 0x32, 0x70, 0xd2, 0xb6, + 0x6e, 0xa3, 0x0d, 0xc8, 0x63, 0xe3, 0x85, 0x28, 0x87, 0x13, 0x4e, 0x0f, 0x45, 0x35, 0x27, 0x53, + 0x3e, 0x74, 0x03, 0xe6, 0x87, 0x24, 0x2c, 0x04, 0x10, 0xb0, 0x9a, 0x72, 0x88, 0x26, 0x73, 0x36, + 0xb4, 0x09, 0x0b, 0x1a, 0x1d, 0x27, 0x51, 0xc4, 0xd4, 0x13, 0x30, 0x64, 0xca, 0x20, 0x0b, 0x46, + 0xb4, 0xe3, 0x15, 0xfb, 0xa5, 0xb4, 0x2a, 0x3d, 0x32, 0x14, 0x89, 0x15, 0xff, 0x5e, 0xb8, 0xe2, + 0x07, 0xaa, 0x6b, 0x73, 0xb2, 0xae, 0xf1, 0x65, 0xff, 0x69, 0x28, 0x0e, 0xcc, 0x3e, 0x0b, 0xa3, + 0x32, 0x3b, 0x77, 0x1e, 0x98, 0x7d, 0x1a, 0x45, 0x2b, 0x64, 0xf3, 0xa3, 0xe9, 0x06, 0x5d, 0xfe, + 0x8a, 0x32, 0x6b, 0x90, 0xc9, 0x47, 0x7f, 0x28, 0xa6, 0xd1, 0xc3, 0xf5, 0x0a, 0x7d, 0x54, 0xa2, + 0x94, 0x5d, 0xa3, 0x47, 0xab, 0x64, 0xd7, 0x3d, 0xae, 0x57, 0x29, 0x9d, 0xfc, 0x24, 0xfb, 0x5a, + 0x86, 0xd5, 0x2c, 0xa5, 0xed, 0x6b, 0x93, 0xf2, 0xbb, 0x80, 0x6a, 0x1e, 0xc2, 0xc2, 0x4b, 0x96, + 0x08, 0xea, 0x35, 0x2a, 0x7f, 0x65, 0x72, 0x7a, 0xe1, 0x1a, 0x84, 0xe0, 0xb7, 0xb9, 0x63, 0xf9, + 0xfb, 0x0c, 0x9c, 0xda, 0xa2, 0xdb, 0xbe, 0x40, 0x1e, 0x9b, 0x05, 0x2b, 0xbd, 0xed, 0xc1, 0xd8, + 0xa9, 0xf8, 0x63, 0xf4, 0xbd, 0x05, 0x8a, 0xdd, 0x82, 0xaa, 0x50, 0xce, 0x55, 0xe4, 0xa6, 0x46, + 0xc2, 0x2b, 0x4e, 0xb0, 0x29, 0x7d, 0x04, 0xab, 0xb1, 0xb7, 0xe0, 0x3b, 0xaf, 0x75, 0x58, 0xf4, + 0xf3, 0x95, 0xf7, 0x12, 0x65, 0x8f, 0xd6, 0xd2, 0xa4, 0x3b, 0x70, 0xb2, 0xeb, 0xaa, 0xb6, 0x1b, + 0x73, 0xc1, 0x14, 0xb2, 0x14, 0xe3, 0x0e, 0xcb, 0x72, 0x18, 0xba, 0x0b, 0x2b, 0x5d, 0xd7, 0xb4, + 0x5e, 0x43, 0x29, 0xc9, 0x3a, 0xe4, 0xfd, 0xcd, 0x91, 0x58, 0x1f, 0x44, 0x53, 0x5a, 0x65, 0x88, + 0x7c, 0xbc, 0xb7, 0xbb, 0x70, 0x8a, 0x01, 0xe2, 0xaf, 0xf3, 0x12, 0xa7, 0x05, 0x1c, 0x1f, 0xd7, + 0xfb, 0x0c, 0x4e, 0xf8, 0xcb, 0xa2, 0x0f, 0x35, 0xdd, 0x0a, 0x43, 0x4d, 0xe7, 0xc7, 0x8c, 0x7a, + 0x08, 0x69, 0xfa, 0xf3, 0x6c, 0x20, 0xaf, 0xa7, 0x00, 0x4d, 0x77, 0xc3, 0x40, 0xd3, 0xc5, 0x49, + 0xba, 0x43, 0x38, 0x53, 0x3c, 0x6a, 0x73, 0x09, 0x51, 0xfb, 0x79, 0x0c, 0x8d, 0xca, 0xa7, 0xc1, + 0x79, 0x11, 0x6b, 0x7f, 0x2b, 0x60, 0x94, 0xcc, 0xc0, 0x28, 0xaf, 0x6b, 0xef, 0xfc, 0xe2, 0x76, + 0x04, 0x8c, 0x5a, 0x9f, 0x68, 0xaf, 0x87, 0x45, 0xfd, 0x75, 0x1e, 0x4a, 0xde, 0xb3, 0x98, 0xcf, + 0xe3, 0x6e, 0xcb, 0x26, 0xb8, 0x2d, 0xb8, 0x02, 0xe7, 0xbe, 0xd1, 0x0a, 0x9c, 0x9f, 0x7a, 0x05, + 0x3e, 0x03, 0x25, 0xfa, 0x43, 0xb1, 0xf1, 0x21, 0x5f, 0x51, 0x8b, 0x94, 0x20, 0xe3, 0x43, 0x3f, + 0x0c, 0xe7, 0x67, 0x0a, 0xc3, 0x08, 0xfc, 0xb5, 0x10, 0x85, 0xbf, 0xee, 0x7b, 0x2b, 0x22, 0x5b, + 0x44, 0x2f, 0x8f, 0xd1, 0x9b, 0xb8, 0x16, 0xb6, 0xc3, 0x6b, 0x21, 0x5b, 0x57, 0xdf, 0x1d, 0xa7, + 0x65, 0xec, 0x2a, 0xf8, 0x6d, 0xae, 0x10, 0xfb, 0x0c, 0xd3, 0x0a, 0xc6, 0x22, 0xcf, 0xac, 0x77, + 0x01, 0xbc, 0x24, 0x22, 0x80, 0xad, 0x33, 0x63, 0xde, 0x51, 0x0e, 0xb0, 0x13, 0xb5, 0xa1, 0xa1, + 0xf1, 0xcf, 0xe8, 0xa6, 0xcb, 0x8f, 0x29, 0x07, 0x74, 0xff, 0x57, 0x08, 0xe4, 0x97, 0x94, 0xb3, + 0xa7, 0xfb, 0x31, 0xd8, 0x75, 0xc6, 0x28, 0xbe, 0x15, 0x46, 0x5d, 0x5f, 0x33, 0xea, 0x62, 0xa0, + 0x2b, 0xad, 0x5c, 0x54, 0x9b, 0x3f, 0x66, 0x58, 0x57, 0x89, 0x53, 0x9a, 0x74, 0x67, 0x70, 0xa8, + 0x1b, 0xba, 0x73, 0xc4, 0x9e, 0xcf, 0xb3, 0x9d, 0x81, 0x20, 0x35, 0x29, 0xda, 0x84, 0x5f, 0xe9, + 0xae, 0xd2, 0x33, 0x35, 0x4c, 0x63, 0xba, 0x20, 0x17, 0x09, 0x61, 0xcb, 0xd4, 0xb0, 0x3f, 0xf3, + 0x8a, 0xaf, 0x37, 0xf3, 0x4a, 0x91, 0x99, 0x77, 0x0a, 0xe6, 0x6d, 0xac, 0x3a, 0xa6, 0xc1, 0xf7, + 0xe1, 0xbc, 0x45, 0x86, 0x66, 0x88, 0x1d, 0x87, 0xf4, 0xc4, 0xcb, 0x35, 0xde, 0x0c, 0x94, 0x99, + 0x8b, 0x13, 0xcb, 0xcc, 0x31, 0x67, 0x5a, 0x91, 0x32, 0xb3, 0x32, 0xb1, 0xcc, 0x9c, 0xea, 0x48, + 0xcb, 0x2f, 0xb4, 0xab, 0xd3, 0x15, 0xda, 0xc1, 0xba, 0x74, 0x29, 0x54, 0x97, 0x7e, 0x9b, 0x93, + 0xf5, 0xd7, 0x19, 0x58, 0x8d, 0x4d, 0x2b, 0x3e, 0x5d, 0x6f, 0x47, 0x0e, 0xbd, 0xd6, 0x27, 0xfa, + 0xcc, 0x3b, 0xf3, 0x7a, 0x1c, 0x3a, 0xf3, 0x7a, 0x7f, 0xb2, 0xe0, 0x1b, 0x3f, 0xf2, 0xfa, 0xe3, + 0x0c, 0x9c, 0xdb, 0xb7, 0xb4, 0x48, 0x85, 0xc7, 0xb7, 0xfd, 0xd3, 0x27, 0x8e, 0xfb, 0xa2, 0xd6, + 0xcf, 0xce, 0x0a, 0xc8, 0x30, 0x39, 0x49, 0x82, 0xf3, 0xe9, 0x66, 0xf0, 0x92, 0xe9, 0x47, 0xb0, + 0xb4, 0xf3, 0x0a, 0xf7, 0xba, 0xc7, 0x46, 0x6f, 0x06, 0xd3, 0x6a, 0x90, 0xeb, 0x0d, 0x35, 0x0e, + 0xa7, 0x92, 0x9f, 0xc1, 0x2a, 0x30, 0x17, 0xae, 0x02, 0x15, 0xa8, 0xf9, 0x3d, 0xf0, 0xe1, 0x3d, + 0x45, 0x86, 0x57, 0x23, 0xcc, 0x44, 0xf9, 0xa2, 0xcc, 0x5b, 0x9c, 0x8e, 0x6d, 0x76, 0x45, 0x84, + 0xd1, 0xb1, 0x6d, 0x87, 0xb3, 0x45, 0x2e, 0x9c, 0x2d, 0xa4, 0x3f, 0xcb, 0x40, 0x99, 0xf4, 0xf0, + 0x8d, 0xec, 0xe7, 0x5b, 0xad, 0x9c, 0xbf, 0xd5, 0xf2, 0x76, 0x6c, 0xf9, 0xe0, 0x8e, 0xcd, 0xb7, + 0xbc, 0x40, 0xc9, 0x71, 0xcb, 0xe7, 0x3d, 0x3a, 0xb6, 0x6d, 0xe9, 0x3c, 0x2c, 0x32, 0xdb, 0xf8, + 0x9b, 0xd7, 0x20, 0x37, 0xb2, 0x07, 0x22, 0x8e, 0x46, 0xf6, 0x40, 0xfa, 0x93, 0x0c, 0x54, 0x9a, + 0xae, 0xab, 0xf6, 0x8e, 0x66, 0x78, 0x01, 0xcf, 0xb8, 0x6c, 0xd0, 0xb8, 0xf8, 0x4b, 0xf8, 0xe6, + 0xe6, 0x53, 0xcc, 0x2d, 0x84, 0xcc, 0x95, 0xa0, 0x2a, 0x6c, 0x49, 0x35, 0xb8, 0x0d, 0xa8, 0x63, + 0xda, 0xee, 0x23, 0xd3, 0x7e, 0xa9, 0xda, 0xda, 0x6c, 0x3b, 0x30, 0x04, 0x79, 0x7e, 0xa7, 0x38, + 0x77, 0xa5, 0x20, 0xd3, 0xdf, 0xd2, 0x65, 0x38, 0x11, 0xd2, 0x97, 0xda, 0xf1, 0x03, 0x28, 0xd3, + 0xbc, 0xcf, 0x4b, 0xf1, 0x9b, 0xc1, 0x53, 0xa6, 0xa9, 0x56, 0x09, 0xe9, 0xf7, 0x61, 0x99, 0xd4, + 0x07, 0x94, 0xee, 0x4d, 0xc5, 0xef, 0x45, 0xea, 0xd4, 0xb3, 0x29, 0x8a, 0x22, 0x35, 0xea, 0xdf, + 0x64, 0xa0, 0x40, 0xe9, 0xb1, 0x35, 0xfb, 0x0c, 0x94, 0x6c, 0x6c, 0x99, 0x8a, 0xab, 0xf6, 0xbd, + 0x1b, 0xdc, 0x84, 0xb0, 0xa7, 0xf6, 0x29, 0x9a, 0x4b, 0x1f, 0x6a, 0x7a, 0x1f, 0x3b, 0xae, 0xb8, + 0xc6, 0x5d, 0x26, 0xb4, 0x6d, 0x46, 0x22, 0x4e, 0xa2, 0x87, 0x30, 0x79, 0x7a, 0xd6, 0x42, 0x7f, + 0xa3, 0x0d, 0x76, 0xa9, 0x70, 0x1a, 0xec, 0x9d, 0x5e, 0x39, 0x6c, 0x40, 0x31, 0x02, 0x97, 0x7b, + 0x6d, 0x69, 0x07, 0x50, 0xd0, 0x0b, 0xdc, 0xdf, 0x37, 0x60, 0x9e, 0x3a, 0x49, 0x54, 0x47, 0xab, + 0x29, 0x6e, 0x90, 0x39, 0x9b, 0xa4, 0x02, 0x62, 0x0e, 0x0e, 0x55, 0x44, 0xb3, 0x8f, 0xca, 0x98, + 0x0a, 0xe9, 0xef, 0x32, 0x70, 0x22, 0xd4, 0x07, 0xb7, 0xf5, 0x7a, 0xb8, 0x93, 0x54, 0x53, 0x79, + 0x07, 0x5b, 0xa1, 0x25, 0xe1, 0x46, 0x9a, 0x49, 0xbf, 0xa1, 0xe5, 0xe0, 0x1f, 0x32, 0x00, 0xcd, + 0x91, 0x7b, 0xc4, 0x91, 0xc1, 0xe0, 0xc8, 0x64, 0xc2, 0x23, 0x43, 0x9e, 0x59, 0xaa, 0xe3, 0xbc, + 0x34, 0x6d, 0xb1, 0xa7, 0xf1, 0xda, 0x14, 0xc3, 0x1b, 0xb9, 0x47, 0xe2, 0xcc, 0x8c, 0xfc, 0x46, + 0x17, 0xa1, 0xca, 0xbe, 0x1a, 0x50, 0x54, 0x4d, 0xb3, 0xb1, 0xe3, 0xf0, 0xc3, 0xb3, 0x0a, 0xa3, + 0x36, 0x19, 0x91, 0xb0, 0xe9, 0x14, 0xd5, 0x76, 0x8f, 0x15, 0xd7, 0x7c, 0x8e, 0x0d, 0xbe, 0x37, + 0xa9, 0x08, 0xea, 0x1e, 0x21, 0xb2, 0x53, 0x84, 0xbe, 0xee, 0xb8, 0xb6, 0x60, 0x13, 0x07, 0x2d, + 0x9c, 0x4a, 0xd9, 0xc8, 0xa0, 0xd4, 0x3a, 0xa3, 0xc1, 0x80, 0xb9, 0xf8, 0xf5, 0x87, 0xfd, 0x3d, + 0xfe, 0x42, 0xd9, 0xb4, 0x98, 0xf6, 0x9d, 0xc6, 0x5f, 0xf7, 0x0d, 0x82, 0x30, 0xef, 0xc1, 0x72, + 0xe0, 0x1d, 0x78, 0x58, 0x85, 0x8a, 0xc8, 0x4c, 0xb8, 0x88, 0x94, 0x1e, 0x03, 0x62, 0xb8, 0xc3, + 0x37, 0x7c, 0x6f, 0xe9, 0x24, 0x9c, 0x08, 0x29, 0xe2, 0x2b, 0xf1, 0x35, 0xa8, 0xf0, 0x0b, 0x5a, + 0x3c, 0x50, 0x4e, 0x43, 0x91, 0x64, 0xd4, 0x9e, 0xae, 0x89, 0x03, 0xd5, 0x05, 0xcb, 0xd4, 0xb6, + 0x74, 0xcd, 0x96, 0x3e, 0x81, 0x8a, 0xcc, 0xfa, 0xe1, 0xbc, 0x8f, 0xa0, 0xca, 0xaf, 0x73, 0x29, + 0xa1, 0x8b, 0x9a, 0x49, 0x1f, 0x02, 0x04, 0x3b, 0x91, 0x2b, 0x46, 0xb0, 0x29, 0x69, 0xd0, 0x60, + 0x25, 0x43, 0x48, 0xbd, 0x78, 0xd9, 0x47, 0x20, 0xee, 0x2f, 0x4c, 0xec, 0x25, 0x2c, 0x5f, 0xb1, + 0x83, 0x4d, 0xe9, 0x2c, 0x9c, 0x49, 0xec, 0x85, 0x7b, 0xc2, 0x82, 0x9a, 0xff, 0x80, 0xdd, 0x26, + 0xf4, 0x4e, 0x8c, 0x33, 0x81, 0x13, 0xe3, 0x53, 0x5e, 0x91, 0x98, 0x15, 0x8b, 0x18, 0xad, 0x00, + 0xfd, 0x72, 0x3f, 0x97, 0x56, 0xee, 0xe7, 0x43, 0xe5, 0xbe, 0xd4, 0xf5, 0xfc, 0xc9, 0xb7, 0x61, + 0x0f, 0xe9, 0x76, 0x91, 0xf5, 0x2d, 0x12, 0xa2, 0x34, 0xee, 0x2d, 0x19, 0xab, 0x1c, 0x90, 0x92, + 0xae, 0x42, 0x25, 0x9c, 0x1a, 0x03, 0x79, 0x2e, 0x13, 0xcb, 0x73, 0xd5, 0x48, 0x8a, 0xfb, 0x30, + 0x52, 0x01, 0xa7, 0xfb, 0x38, 0x52, 0xff, 0xde, 0x0b, 0x25, 0xbb, 0x6b, 0x09, 0x87, 0xbd, 0xbf, + 0xa1, 0x3c, 0xb7, 0xc2, 0xd7, 0x83, 0x47, 0x0e, 0x91, 0xe7, 0x2f, 0x2d, 0x5d, 0x80, 0xf2, 0x7e, + 0xda, 0x57, 0x26, 0x79, 0x71, 0xcd, 0xe3, 0x16, 0xac, 0x3c, 0xd2, 0x07, 0xd8, 0x39, 0x76, 0x5c, + 0x3c, 0x6c, 0xd1, 0xa4, 0x74, 0xa8, 0x63, 0x1b, 0xad, 0x01, 0xd0, 0x2d, 0x8c, 0x65, 0xea, 0xde, + 0xc7, 0x07, 0x01, 0x8a, 0xf4, 0x5f, 0x19, 0x58, 0xf2, 0x05, 0xf7, 0xe9, 0xd6, 0xed, 0x2d, 0x28, + 0x91, 0xf7, 0x75, 0x5c, 0x75, 0x68, 0x89, 0xf3, 0x2c, 0x8f, 0x80, 0xee, 0x42, 0xe1, 0xd0, 0x11, + 0x90, 0x51, 0x22, 0x80, 0x9e, 0x64, 0x88, 0x9c, 0x3f, 0x74, 0x5a, 0x1a, 0xfa, 0x08, 0x60, 0xe4, + 0x60, 0x8d, 0x9f, 0x61, 0xe5, 0xd2, 0xaa, 0x85, 0xfd, 0xe0, 0x41, 0x38, 0x11, 0x60, 0x37, 0x44, + 0xee, 0x41, 0x59, 0x37, 0x4c, 0x0d, 0xd3, 0xc3, 0x49, 0x8d, 0xa3, 0x4a, 0x13, 0xc4, 0x81, 0x49, + 0xec, 0x3b, 0x58, 0x93, 0x30, 0x5f, 0x0b, 0x85, 0x7f, 0x79, 0xa0, 0xb4, 0x61, 0x99, 0x25, 0xad, + 0x43, 0xcf, 0x70, 0x11, 0xb1, 0xeb, 0xe3, 0xde, 0x8e, 0x7a, 0x4b, 0xae, 0xe9, 0xbc, 0xb4, 0x11, + 0xa2, 0xd2, 0x1d, 0x38, 0x19, 0xda, 0x21, 0xcd, 0xb0, 0x65, 0x91, 0x3a, 0x11, 0xa0, 0xc4, 0x0f, + 0x67, 0x0e, 0x43, 0x88, 0x68, 0x9e, 0x04, 0x43, 0x38, 0x0c, 0x86, 0x70, 0xa4, 0xcf, 0xe1, 0x74, + 0x08, 0xd1, 0x09, 0x59, 0x74, 0x2f, 0x52, 0xb9, 0x5d, 0x9a, 0xa4, 0x35, 0x52, 0xc2, 0xfd, 0x6f, + 0x06, 0x56, 0x92, 0x18, 0x5e, 0x13, 0x71, 0xfc, 0x51, 0xca, 0xb5, 0xc1, 0xdb, 0xd3, 0x99, 0xf5, + 0x5b, 0x41, 0x6b, 0xf7, 0xa0, 0x91, 0xe4, 0xcf, 0xf8, 0x28, 0xe5, 0x66, 0x19, 0xa5, 0x9f, 0xe7, + 0x02, 0xc8, 0x7b, 0xd3, 0x75, 0x6d, 0xfd, 0x60, 0x44, 0x42, 0xfe, 0x8d, 0xa3, 0x59, 0x2d, 0x0f, + 0x97, 0x61, 0xae, 0xbd, 0x39, 0x46, 0xdc, 0xb7, 0x23, 0x11, 0x9b, 0xf9, 0x34, 0x8c, 0xcd, 0x30, + 0x4c, 0xfd, 0xd6, 0x74, 0xfa, 0xbe, 0xb3, 0x00, 0xe8, 0xcf, 0xb3, 0x50, 0x0d, 0x0f, 0x11, 0xda, + 0x01, 0x50, 0x3d, 0xcb, 0xf9, 0x44, 0xb9, 0x38, 0xd5, 0x6b, 0xca, 0x01, 0x41, 0xf4, 0x2e, 0xe4, + 0x7a, 0xd6, 0x88, 0x8f, 0x5a, 0xc2, 0x61, 0xf0, 0x96, 0x35, 0x62, 0x19, 0x85, 0xb0, 0x91, 0x3d, + 0x15, 0x3b, 0xdb, 0x4f, 0xcf, 0x92, 0xcf, 0xe8, 0x73, 0x26, 0xc3, 0x99, 0xd1, 0x13, 0xa8, 0xbe, + 0xb4, 0x75, 0x57, 0x3d, 0x18, 0x60, 0x65, 0xa0, 0x1e, 0x63, 0x9b, 0x67, 0xc9, 0x29, 0x12, 0x59, + 0x45, 0x08, 0x3e, 0x25, 0x72, 0xd2, 0x1f, 0x41, 0x51, 0x58, 0x34, 0x61, 0x45, 0xd8, 0x83, 0xd5, + 0x11, 0x61, 0x53, 0xe8, 0xcd, 0x3d, 0x43, 0x35, 0x4c, 0xc5, 0xc1, 0x64, 0x19, 0x17, 0x5f, 0x29, + 0x4c, 0x48, 0xd1, 0x2b, 0x54, 0x7a, 0xcb, 0xb4, 0x71, 0x5b, 0x35, 0xcc, 0x2e, 0x13, 0x95, 0x5e, + 0x40, 0x39, 0xf0, 0x82, 0x13, 0x4c, 0x68, 0xc1, 0xb2, 0x38, 0x8a, 0x77, 0xb0, 0xcb, 0x97, 0x97, + 0xa9, 0x3a, 0x5f, 0xe2, 0x72, 0x5d, 0xec, 0xb2, 0xeb, 0x13, 0xf7, 0xe0, 0xb4, 0x8c, 0x4d, 0x0b, + 0x1b, 0xde, 0x78, 0x3e, 0x35, 0xfb, 0x33, 0x64, 0xf0, 0xb7, 0xa0, 0x91, 0x24, 0xcf, 0xf2, 0xc3, + 0xb5, 0x4b, 0x50, 0x14, 0x9f, 0x0c, 0xa3, 0x05, 0xc8, 0xed, 0x6d, 0x75, 0x6a, 0x73, 0xe4, 0xc7, + 0xfe, 0x76, 0xa7, 0x96, 0x41, 0x45, 0xc8, 0x77, 0xb7, 0xf6, 0x3a, 0xb5, 0xec, 0xb5, 0x21, 0xd4, + 0xa2, 0xdf, 0xcb, 0xa2, 0x55, 0x38, 0xd1, 0x91, 0x77, 0x3b, 0xcd, 0xc7, 0xcd, 0xbd, 0xd6, 0x6e, + 0x5b, 0xe9, 0xc8, 0xad, 0x8f, 0x9b, 0x7b, 0x3b, 0xb5, 0x39, 0xb4, 0x0e, 0x67, 0x83, 0x0f, 0x9e, + 0xec, 0x76, 0xf7, 0x94, 0xbd, 0x5d, 0x65, 0x6b, 0xb7, 0xbd, 0xd7, 0x6c, 0xb5, 0x77, 0xe4, 0x5a, + 0x06, 0x9d, 0x85, 0xd3, 0x41, 0x96, 0x87, 0xad, 0xed, 0x96, 0xbc, 0xb3, 0x45, 0x7e, 0x37, 0x9f, + 0xd6, 0xb2, 0xd7, 0x6e, 0x42, 0x25, 0xf4, 0x79, 0x2b, 0x31, 0xa9, 0xb3, 0xbb, 0x5d, 0x9b, 0x43, + 0x15, 0x28, 0x05, 0xf5, 0x14, 0x21, 0xdf, 0xde, 0xdd, 0xde, 0xa9, 0x65, 0xaf, 0xdd, 0x81, 0xa5, + 0xc8, 0x6d, 0x63, 0xb4, 0x0c, 0x95, 0x6e, 0xb3, 0xbd, 0xfd, 0x70, 0xf7, 0x53, 0x45, 0xde, 0x69, + 0x6e, 0x7f, 0x56, 0x9b, 0x43, 0x2b, 0x50, 0x13, 0xa4, 0xf6, 0xee, 0x1e, 0xa3, 0x66, 0xae, 0x3d, + 0x8f, 0xcc, 0x31, 0x8c, 0x4e, 0xc2, 0xb2, 0xd7, 0x8d, 0xb2, 0x25, 0xef, 0x34, 0xf7, 0x76, 0x48, + 0xef, 0x21, 0xb2, 0xbc, 0xdf, 0x6e, 0xb7, 0xda, 0x8f, 0x6b, 0x19, 0xa2, 0xd5, 0x27, 0xef, 0x7c, + 0xda, 0x22, 0xcc, 0xd9, 0x30, 0xf3, 0x7e, 0xfb, 0x07, 0xed, 0xdd, 0x4f, 0xda, 0xb5, 0xdc, 0xe6, + 0x2f, 0x97, 0xa1, 0x2a, 0x0a, 0x3d, 0x6c, 0xd3, 0x5b, 0x2d, 0x1d, 0x58, 0x10, 0x9f, 0xa0, 0x27, + 0x64, 0xe8, 0xf0, 0x87, 0xf3, 0x8d, 0xf5, 0x31, 0x1c, 0xbc, 0xde, 0x9e, 0x43, 0x07, 0xb4, 0xfe, + 0x0d, 0xdc, 0xfe, 0xbe, 0x94, 0x58, 0x6d, 0xc6, 0x2e, 0x9c, 0x37, 0x2e, 0x4f, 0xe4, 0xf3, 0xfa, + 0xc0, 0xa4, 0xc4, 0x0d, 0x7e, 0x60, 0x85, 0x2e, 0x27, 0xd5, 0xa6, 0x09, 0x5f, 0x70, 0x35, 0xae, + 0x4c, 0x66, 0xf4, 0xba, 0x79, 0x0e, 0xb5, 0xe8, 0xc7, 0x56, 0x28, 0x01, 0x3a, 0x4d, 0xf9, 0xa2, + 0xab, 0x71, 0x6d, 0x1a, 0xd6, 0x60, 0x67, 0xb1, 0xaf, 0x87, 0xae, 0x4e, 0xf3, 0x95, 0x45, 0x6a, + 0x67, 0x69, 0x1f, 0x64, 0x30, 0x07, 0x86, 0x2f, 0x6c, 0xa3, 0xc4, 0x4f, 0x75, 0x12, 0xbe, 0x0b, + 0x48, 0x72, 0x60, 0xf2, 0xdd, 0x6f, 0x69, 0x0e, 0x1d, 0xc1, 0x52, 0xe4, 0x7a, 0x02, 0x4a, 0x10, + 0x4f, 0xbe, 0x87, 0xd1, 0xb8, 0x3a, 0x05, 0x67, 0x38, 0x22, 0x82, 0xd7, 0x11, 0x92, 0x23, 0x22, + 0xe1, 0xb2, 0x43, 0x72, 0x44, 0x24, 0xde, 0x6c, 0xa0, 0xc1, 0x1d, 0xba, 0x86, 0x90, 0x14, 0xdc, + 0x49, 0x97, 0x1f, 0x1a, 0x97, 0x27, 0xf2, 0x05, 0x9d, 0x16, 0xb9, 0x94, 0x90, 0xe4, 0xb4, 0xe4, + 0x4b, 0x0f, 0x8d, 0xab, 0x53, 0x70, 0x46, 0xa3, 0xc0, 0x3f, 0xe2, 0x4c, 0x8b, 0x82, 0xd8, 0x81, + 0x7c, 0x5a, 0x14, 0xc4, 0x4f, 0x4b, 0x79, 0x14, 0x44, 0x8e, 0x26, 0xaf, 0x4c, 0x71, 0x94, 0x92, + 0x1e, 0x05, 0xc9, 0x87, 0x2e, 0xd2, 0x1c, 0xfa, 0x59, 0x06, 0xea, 0x69, 0xc7, 0x14, 0x28, 0xa1, + 0xbe, 0x9b, 0x70, 0xb2, 0xd2, 0xd8, 0x9c, 0x45, 0xc4, 0xb3, 0xe2, 0x4b, 0x40, 0xf1, 0x75, 0x0f, + 0xbd, 0x93, 0x34, 0x32, 0x29, 0xab, 0x6b, 0xe3, 0xdd, 0xe9, 0x98, 0xbd, 0x2e, 0xbb, 0x50, 0x14, + 0x07, 0x23, 0x28, 0x21, 0x4b, 0x47, 0x8e, 0x65, 0x1a, 0xd2, 0x38, 0x16, 0x4f, 0xe9, 0x63, 0xc8, + 0x13, 0x2a, 0x3a, 0x9b, 0xcc, 0x2d, 0x94, 0xad, 0xa5, 0x3d, 0xf6, 0x14, 0x3d, 0x83, 0x79, 0x76, + 0x12, 0x80, 0x12, 0x90, 0x87, 0xd0, 0x79, 0x45, 0xe3, 0x7c, 0x3a, 0x83, 0xa7, 0xee, 0x0b, 0xf6, + 0xdf, 0x49, 0x38, 0xc8, 0x8f, 0xde, 0x4e, 0xfe, 0xdc, 0x3b, 0x7c, 0xa6, 0xd0, 0xb8, 0x38, 0x81, + 0x2b, 0x38, 0x29, 0x22, 0x55, 0xef, 0xe5, 0x89, 0x5b, 0x97, 0xf4, 0x49, 0x91, 0xbc, 0x39, 0x62, + 0x41, 0x12, 0xdf, 0x3c, 0x25, 0x05, 0x49, 0xea, 0x96, 0x35, 0x29, 0x48, 0xd2, 0xf7, 0x63, 0xd2, + 0x1c, 0x72, 0xe1, 0x44, 0x02, 0x54, 0x86, 0xde, 0x4d, 0x0b, 0xf2, 0x24, 0xdc, 0xae, 0x71, 0x7d, + 0x4a, 0xee, 0xe0, 0xe0, 0xf3, 0x49, 0x7f, 0x2e, 0x1d, 0x3f, 0x4a, 0x1d, 0xfc, 0xe8, 0x14, 0xdf, + 0xfc, 0xd7, 0x1c, 0x2c, 0x32, 0x18, 0x94, 0x57, 0x30, 0x9f, 0x01, 0xf8, 0x27, 0x10, 0xe8, 0x42, + 0xb2, 0x4f, 0x42, 0xa7, 0x34, 0x8d, 0xb7, 0xc7, 0x33, 0x05, 0x03, 0x2d, 0x80, 0xe6, 0x27, 0x05, + 0x5a, 0xfc, 0xd0, 0x22, 0x29, 0xd0, 0x12, 0x8e, 0x04, 0xa4, 0x39, 0xf4, 0x31, 0x94, 0x3c, 0xd8, + 0x18, 0x25, 0xc1, 0xce, 0x11, 0x5c, 0xbc, 0x71, 0x61, 0x2c, 0x4f, 0xd0, 0xea, 0x00, 0x26, 0x9c, + 0x64, 0x75, 0x1c, 0x7b, 0x4e, 0xb2, 0x3a, 0x09, 0x58, 0xf6, 0x7d, 0xc2, 0x90, 0xa3, 0x54, 0x9f, + 0x84, 0x80, 0xbb, 0x54, 0x9f, 0x84, 0xe1, 0x27, 0x69, 0xee, 0xe1, 0xa5, 0x5f, 0x7d, 0xb5, 0x96, + 0xf9, 0xe7, 0xaf, 0xd6, 0xe6, 0x7e, 0xfa, 0xf5, 0x5a, 0xe6, 0x57, 0x5f, 0xaf, 0x65, 0xfe, 0xf1, + 0xeb, 0xb5, 0xcc, 0xbf, 0x7d, 0xbd, 0x96, 0xf9, 0xd3, 0x7f, 0x5f, 0x9b, 0xfb, 0x61, 0x51, 0x48, + 0x1f, 0xcc, 0xd3, 0xff, 0x31, 0xf4, 0xfe, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe8, 0xc0, 0x76, + 0xe9, 0x29, 0x4a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -9847,6 +9919,20 @@ func (m *LinuxContainerResources) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.HugepageLimits) > 0 { + for iNdEx := len(m.HugepageLimits) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.HugepageLimits[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + } + } if len(m.CpusetMems) > 0 { i -= len(m.CpusetMems) copy(dAtA[i:], m.CpusetMems) @@ -9889,6 +9975,41 @@ func (m *LinuxContainerResources) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *HugepageLimit) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *HugepageLimit) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *HugepageLimit) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Limit != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.Limit)) + i-- + dAtA[i] = 0x10 + } + if len(m.PageSize) > 0 { + i -= len(m.PageSize) + copy(dAtA[i:], m.PageSize) + i = encodeVarintApi(dAtA, i, uint64(len(m.PageSize))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *SELinuxOption) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -13977,6 +14098,28 @@ func (m *LinuxContainerResources) Size() (n int) { if l > 0 { n += 1 + l + sovApi(uint64(l)) } + if len(m.HugepageLimits) > 0 { + for _, e := range m.HugepageLimits { + l = e.Size() + n += 1 + l + sovApi(uint64(l)) + } + } + return n +} + +func (m *HugepageLimit) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PageSize) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + if m.Limit != 0 { + n += 1 + sovApi(uint64(m.Limit)) + } return n } @@ -15873,6 +16016,11 @@ func (this *LinuxContainerResources) String() string { if this == nil { return "nil" } + repeatedStringForHugepageLimits := "[]*HugepageLimit{" + for _, f := range this.HugepageLimits { + repeatedStringForHugepageLimits += strings.Replace(f.String(), "HugepageLimit", "HugepageLimit", 1) + "," + } + repeatedStringForHugepageLimits += "}" s := strings.Join([]string{`&LinuxContainerResources{`, `CpuPeriod:` + fmt.Sprintf("%v", this.CpuPeriod) + `,`, `CpuQuota:` + fmt.Sprintf("%v", this.CpuQuota) + `,`, @@ -15881,6 +16029,18 @@ func (this *LinuxContainerResources) String() string { `OomScoreAdj:` + fmt.Sprintf("%v", this.OomScoreAdj) + `,`, `CpusetCpus:` + fmt.Sprintf("%v", this.CpusetCpus) + `,`, `CpusetMems:` + fmt.Sprintf("%v", this.CpusetMems) + `,`, + `HugepageLimits:` + repeatedStringForHugepageLimits + `,`, + `}`, + }, "") + return s +} +func (this *HugepageLimit) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&HugepageLimit{`, + `PageSize:` + fmt.Sprintf("%v", this.PageSize) + `,`, + `Limit:` + fmt.Sprintf("%v", this.Limit) + `,`, `}`, }, "") return s @@ -22109,6 +22269,144 @@ func (m *LinuxContainerResources) Unmarshal(dAtA []byte) error { } m.CpusetMems = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HugepageLimits", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HugepageLimits = append(m.HugepageLimits, &HugepageLimit{}) + if err := m.HugepageLimits[len(m.HugepageLimits)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *HugepageLimit) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: HugepageLimit: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: HugepageLimit: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PageSize", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PageSize = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Limit", wireType) + } + m.Limit = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Limit |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipApi(dAtA[iNdEx:]) diff --git a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto index 0290d0f24..ce5a63d56 100644 --- a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto +++ b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto @@ -543,6 +543,19 @@ message LinuxContainerResources { string cpuset_cpus = 6; // CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified). string cpuset_mems = 7; + // List of HugepageLimits to limit the HugeTLB usage of container per page size. Default: nil (not specified). + repeated HugepageLimit hugepage_limits = 8; +} + +// HugepageLimit corresponds to the file`hugetlb..limit_in_byte` in container level cgroup. +// For example, `PageSize=1GB`, `Limit=1073741824` means setting `1073741824` bytes to hugetlb.1GB.limit_in_bytes. +message HugepageLimit { + // The value of PageSize has the format B (2MB, 1GB), + // and must match the of the corresponding control file found in `hugetlb..limit_in_bytes`. + // The values of are intended to be parsed using base 1024("1KB" = 1024, "1MB" = 1048576, etc). + string page_size = 1; + // limit in bytes of hugepagesize HugeTLB usage. + uint64 limit = 2; } // SELinuxOption are the labels to be applied to the container. diff --git a/vendor/k8s.io/kubernetes/go.mod b/vendor/k8s.io/kubernetes/go.mod index 7d515c2ff..58af3cbd8 100644 --- a/vendor/k8s.io/kubernetes/go.mod +++ b/vendor/k8s.io/kubernetes/go.mod @@ -4,7 +4,7 @@ module k8s.io/kubernetes -go 1.12 +go 1.13 require ( bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 @@ -14,7 +14,7 @@ require ( github.com/Azure/go-autorest/autorest/to v0.2.0 github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534 github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab - github.com/Microsoft/go-winio v0.4.11 + github.com/Microsoft/go-winio v0.4.14 github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d github.com/PuerkitoBio/purell v1.1.1 github.com/Rican7/retry v0.1.0 // indirect @@ -185,7 +185,7 @@ replace ( github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534 github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd - github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.11 + github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.14 github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 github.com/OpenPeeDeeP/depguard => github.com/OpenPeeDeeP/depguard v1.0.1 diff --git a/vendor/k8s.io/kubernetes/pkg/apis/core/resource.go b/vendor/k8s.io/kubernetes/pkg/apis/core/resource.go index fe199d3fa..d5006e5c8 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/core/resource.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/core/resource.go @@ -40,6 +40,14 @@ func (rl *ResourceList) Memory() *resource.Quantity { return &resource.Quantity{Format: resource.BinarySI} } +// Storage returns the Storage limit if specified. +func (rl *ResourceList) Storage() *resource.Quantity { + if val, ok := (*rl)[ResourceStorage]; ok { + return &val + } + return &resource.Quantity{Format: resource.BinarySI} +} + // Pods returns the list of pods func (rl *ResourceList) Pods() *resource.Quantity { if val, ok := (*rl)[ResourcePods]; ok {