From c9a008dff3904be728250ed0caadaec7227da024 Mon Sep 17 00:00:00 2001 From: deads2k Date: Fri, 27 Jan 2017 15:42:17 -0500 Subject: [PATCH] move util/intstr to apimachinery --- cmd/kubeadm/app/master/BUILD | 4 +- cmd/kubeadm/app/master/addons.go | 2 +- cmd/kubeadm/app/master/manifests.go | 2 +- cmd/kubeadm/app/master/manifests_test.go | 2 +- .../go2idl/go-to-protobuf/protobuf/cmd.go | 2 +- .../apis/federation/v1beta1/generated.pb.go | 103 +- .../apis/federation/v1beta1/generated.proto | 3 +- federation/pkg/kubefed/init/BUILD | 4 +- federation/pkg/kubefed/init/init.go | 2 +- federation/pkg/kubefed/init/init_test.go | 2 +- hack/.linted_packages | 1 + pkg/api/BUILD | 2 +- pkg/api/conversion.go | 2 +- pkg/api/testing/BUILD | 2 +- pkg/api/testing/fuzzer.go | 2 +- pkg/api/types.go | 2 +- pkg/api/v1/BUILD | 4 +- pkg/api/v1/defaults.go | 2 +- pkg/api/v1/defaults_test.go | 2 +- pkg/api/v1/generated.pb.go | 1303 ++++++++--------- pkg/api/v1/generated.proto | 8 +- pkg/api/v1/pod/BUILD | 4 +- pkg/api/v1/pod/util.go | 2 +- pkg/api/v1/pod/util_test.go | 2 +- pkg/api/v1/types.generated.go | 2 +- pkg/api/v1/types.go | 2 +- pkg/api/validation/BUILD | 4 +- pkg/api/validation/validation.go | 2 +- pkg/api/validation/validation_test.go | 2 +- pkg/apis/apps/v1beta1/BUILD | 2 +- pkg/apis/apps/v1beta1/generated.pb.go | 83 +- pkg/apis/apps/v1beta1/generated.proto | 3 +- pkg/apis/apps/v1beta1/types.generated.go | 6 +- .../authentication/v1beta1/generated.pb.go | 85 +- .../authentication/v1beta1/generated.proto | 3 +- .../authorization/v1beta1/generated.pb.go | 113 +- .../authorization/v1beta1/generated.proto | 3 +- pkg/apis/autoscaling/v1/generated.pb.go | 109 +- pkg/apis/autoscaling/v1/generated.proto | 3 +- pkg/apis/batch/v1/BUILD | 2 +- pkg/apis/batch/v1/generated.pb.go | 111 +- pkg/apis/batch/v1/generated.proto | 3 +- pkg/apis/batch/v1/types.generated.go | 6 +- pkg/apis/batch/v2alpha1/BUILD | 2 +- pkg/apis/batch/v2alpha1/generated.pb.go | 147 +- pkg/apis/batch/v2alpha1/generated.proto | 3 +- pkg/apis/batch/v2alpha1/types.generated.go | 6 +- pkg/apis/certificates/v1beta1/generated.pb.go | 93 +- pkg/apis/certificates/v1beta1/generated.proto | 3 +- pkg/apis/extensions/BUILD | 2 +- pkg/apis/extensions/types.go | 2 +- pkg/apis/extensions/v1beta1/BUILD | 4 +- pkg/apis/extensions/v1beta1/conversion.go | 2 +- pkg/apis/extensions/v1beta1/defaults.go | 2 +- pkg/apis/extensions/v1beta1/defaults_test.go | 2 +- pkg/apis/extensions/v1beta1/generated.pb.go | 466 +++--- pkg/apis/extensions/v1beta1/generated.proto | 10 +- .../extensions/v1beta1/types.generated.go | 6 +- pkg/apis/extensions/v1beta1/types.go | 2 +- .../v1beta1/zz_generated.conversion.go | 10 +- .../v1beta1/zz_generated.deepcopy.go | 2 +- pkg/apis/extensions/validation/BUILD | 4 +- pkg/apis/extensions/validation/validation.go | 2 +- .../extensions/validation/validation_test.go | 2 +- pkg/apis/extensions/zz_generated.deepcopy.go | 2 +- pkg/apis/imagepolicy/v1alpha1/generated.pb.go | 77 +- pkg/apis/imagepolicy/v1alpha1/generated.proto | 3 +- pkg/apis/policy/BUILD | 2 +- pkg/apis/policy/types.go | 2 +- pkg/apis/policy/v1alpha1/BUILD | 2 +- pkg/apis/policy/v1alpha1/types.go | 2 +- pkg/apis/policy/v1beta1/BUILD | 2 +- pkg/apis/policy/v1beta1/generated.pb.go | 101 +- pkg/apis/policy/v1beta1/generated.proto | 5 +- pkg/apis/policy/v1beta1/types.generated.go | 2 +- pkg/apis/policy/v1beta1/types.go | 2 +- pkg/apis/policy/validation/BUILD | 2 +- pkg/apis/policy/validation/validation_test.go | 2 +- pkg/apis/rbac/v1alpha1/generated.pb.go | 107 +- pkg/apis/rbac/v1alpha1/generated.proto | 3 +- pkg/apis/rbac/v1beta1/generated.pb.go | 107 +- pkg/apis/rbac/v1beta1/generated.proto | 3 +- pkg/apis/storage/v1beta1/generated.pb.go | 63 +- pkg/apis/storage/v1beta1/generated.proto | 3 +- pkg/controller/deployment/BUILD | 2 +- .../deployment/deployment_controller_test.go | 2 +- pkg/controller/deployment/rolling_test.go | 2 +- pkg/controller/deployment/sync_test.go | 2 +- pkg/controller/deployment/util/BUILD | 4 +- .../deployment/util/deployment_util.go | 2 +- .../deployment/util/deployment_util_test.go | 2 +- pkg/controller/disruption/BUILD | 4 +- pkg/controller/disruption/disruption.go | 2 +- pkg/controller/disruption/disruption_test.go | 2 +- pkg/controller/endpoint/BUILD | 2 +- .../endpoint/endpoints_controller_test.go | 2 +- pkg/controller/resourcequota/BUILD | 2 +- .../replenishment_controller_test.go | 2 +- pkg/generated/bindata.go | 48 +- pkg/generated/openapi/BUILD | 2 +- pkg/generated/openapi/zz_generated.openapi.go | 2 +- pkg/kubectl/BUILD | 4 +- pkg/kubectl/cmd/BUILD | 4 +- pkg/kubectl/cmd/expose_test.go | 2 +- pkg/kubectl/cmd/rollingupdate.go | 2 +- pkg/kubectl/cmd/run_test.go | 2 +- pkg/kubectl/describe.go | 2 +- pkg/kubectl/describe_test.go | 2 +- pkg/kubectl/pdb.go | 2 +- pkg/kubectl/resource_printer_test.go | 2 +- pkg/kubectl/rolling_updater.go | 2 +- pkg/kubectl/rolling_updater_test.go | 2 +- pkg/kubectl/service.go | 2 +- pkg/kubectl/service_basic.go | 2 +- pkg/kubectl/service_basic_test.go | 2 +- pkg/kubectl/service_test.go | 2 +- pkg/kubelet/dockertools/BUILD | 2 +- .../dockertools/docker_manager_test.go | 2 +- pkg/kubelet/dockertools/labels_test.go | 2 +- pkg/kubelet/kuberuntime/BUILD | 2 +- pkg/kubelet/kuberuntime/labels_test.go | 2 +- pkg/kubelet/lifecycle/BUILD | 4 +- pkg/kubelet/lifecycle/handlers.go | 2 +- pkg/kubelet/lifecycle/handlers_test.go | 2 +- pkg/kubelet/prober/BUILD | 4 +- pkg/kubelet/prober/prober.go | 2 +- pkg/kubelet/prober/prober_test.go | 2 +- pkg/master/BUILD | 4 +- pkg/master/controller.go | 2 +- pkg/master/controller_test.go | 2 +- pkg/master/import_known_versions_test.go | 2 +- pkg/proxy/iptables/BUILD | 2 +- pkg/proxy/iptables/proxier_test.go | 2 +- pkg/registry/core/service/BUILD | 2 +- pkg/registry/core/service/rest_test.go | 2 +- pkg/registry/core/service/storage/BUILD | 2 +- .../core/service/storage/storage_test.go | 2 +- pkg/registry/core/service/strategy_test.go | 2 +- .../extensions/deployment/storage/BUILD | 2 +- .../deployment/storage/storage_test.go | 2 +- pkg/registry/extensions/ingress/BUILD | 2 +- pkg/registry/extensions/ingress/storage/BUILD | 2 +- .../ingress/storage/storage_test.go | 2 +- .../extensions/ingress/strategy_test.go | 2 +- .../extensions/networkpolicy/storage/BUILD | 2 +- .../networkpolicy/storage/storage_test.go | 2 +- pkg/registry/policy/poddisruptionbudget/BUILD | 2 +- .../policy/poddisruptionbudget/storage/BUILD | 2 +- .../storage/storage_test.go | 2 +- .../poddisruptionbudget/strategy_test.go | 2 +- pkg/util/intstr/BUILD | 21 +- pkg/util/intstr/doc.go | 21 + .../pkg/api/resource/generated.pb.go | 34 +- .../pkg/api/resource/generated.proto | 2 +- .../pkg/apis/meta/v1/generated.pb.go | 264 ++-- .../pkg/apis/meta/v1/generated.proto | 3 +- .../apimachinery/pkg/runtime/generated.pb.go | 51 +- .../apimachinery/pkg/runtime/generated.proto | 3 +- .../pkg/runtime/schema/generated.pb.go | 29 +- .../pkg/runtime/schema/generated.proto | 3 +- .../pkg}/util/intstr/generated.pb.go | 43 +- .../pkg}/util/intstr/generated.proto | 2 +- .../apimachinery/pkg}/util/intstr/intstr.go | 0 .../pkg}/util/intstr/intstr_test.go | 0 .../pkg/api/resource/generated.pb.go | 33 +- .../pkg/api/resource/generated.proto | 2 +- test/e2e/BUILD | 2 +- test/e2e/autoscaling_utils.go | 2 +- test/e2e/common/BUILD | 2 +- test/e2e/common/container_probe.go | 2 +- test/e2e/common/pods.go | 2 +- test/e2e/deployment.go | 2 +- test/e2e/dns_configmap.go | 2 +- test/e2e/empty_dir_wrapper.go | 2 +- test/e2e/framework/BUILD | 2 +- test/e2e/framework/framework.go | 2 +- test/e2e/framework/networking_utils.go | 2 +- test/e2e/framework/service_util.go | 2 +- test/e2e/generated_clientset.go | 2 +- test/e2e/load.go | 2 +- test/e2e/namespace.go | 2 +- test/e2e/proxy.go | 2 +- test/e2e/resize_nodes.go | 2 +- test/e2e/resource_quota.go | 2 +- test/e2e/service.go | 2 +- test/e2e/statefulset.go | 2 +- test/e2e/ubernetes_lite.go | 2 +- test/e2e_federation/BUILD | 2 +- test/e2e_federation/federated-ingress.go | 2 +- test/e2e_federation/federation-util.go | 2 +- test/e2e_node/BUILD | 2 +- test/e2e_node/lifecycle_hook_test.go | 2 +- test/integration/evictions/evictions_test.go | 2 +- test/soak/cauldron/BUILD | 2 +- test/soak/cauldron/cauldron.go | 2 +- test/soak/serve_hostnames/BUILD | 2 +- test/soak/serve_hostnames/serve_hostnames.go | 2 +- vendor/BUILD | 24 + 198 files changed, 2049 insertions(+), 2012 deletions(-) create mode 100644 pkg/util/intstr/doc.go rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/intstr/generated.pb.go (79%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/intstr/generated.proto (96%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/intstr/intstr.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/intstr/intstr_test.go (100%) diff --git a/cmd/kubeadm/app/master/BUILD b/cmd/kubeadm/app/master/BUILD index 491a639dec1c9..4dc4cacb3154d 100644 --- a/cmd/kubeadm/app/master/BUILD +++ b/cmd/kubeadm/app/master/BUILD @@ -31,11 +31,11 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/blang/semver", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/tools/clientcmd", @@ -57,7 +57,7 @@ go_test( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/util/intstr:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/cmd/kubeadm/app/master/addons.go b/cmd/kubeadm/app/master/addons.go index d2cf62917acb9..ab9b03dfd2093 100644 --- a/cmd/kubeadm/app/master/addons.go +++ b/cmd/kubeadm/app/master/addons.go @@ -24,13 +24,13 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/pkg/util/intstr" ) const KubeDNS = "kube-dns" diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index 420abc5fa69de..075ff1fec3011 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -26,12 +26,12 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/images" api "k8s.io/kubernetes/pkg/api/v1" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/intstr" "github.com/blang/semver" ) diff --git a/cmd/kubeadm/app/master/manifests_test.go b/cmd/kubeadm/app/master/manifests_test.go index b20d70b9a1bdc..81cd42a1634fc 100644 --- a/cmd/kubeadm/app/master/manifests_test.go +++ b/cmd/kubeadm/app/master/manifests_test.go @@ -22,10 +22,10 @@ import ( "os" "testing" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" api "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestWriteStaticPodManifests(t *testing.T) { diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index fe3341fe670bb..980431c546d5d 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -62,7 +62,7 @@ func New() *Generator { VendorOutputBase: filepath.Join(sourceTree, "k8s.io", "kubernetes", "vendor"), ProtoImport: []string{defaultProtoImport}, Packages: strings.Join([]string{ - `+k8s.io/kubernetes/pkg/util/intstr`, + `+k8s.io/apimachinery/pkg/util/intstr`, `+k8s.io/apimachinery/pkg/api/resource`, `+k8s.io/apimachinery/pkg/runtime/schema`, `+k8s.io/apimachinery/pkg/runtime`, diff --git a/federation/apis/federation/v1beta1/generated.pb.go b/federation/apis/federation/v1beta1/generated.pb.go index 8a4618f43b031..3ffc786338b9d 100644 --- a/federation/apis/federation/v1beta1/generated.pb.go +++ b/federation/apis/federation/v1beta1/generated.pb.go @@ -1487,56 +1487,55 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 804 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xf3, 0x44, - 0x14, 0x8d, 0xf3, 0xdb, 0x4c, 0x09, 0x54, 0x23, 0x90, 0x42, 0x16, 0x4e, 0x15, 0x21, 0xd4, 0x22, - 0xb0, 0x49, 0x84, 0x50, 0x25, 0x04, 0x52, 0x9d, 0x0a, 0xa9, 0x52, 0xab, 0xa2, 0x69, 0xc5, 0xa2, - 0x42, 0x02, 0xc7, 0xb9, 0x71, 0x4d, 0xe2, 0x1f, 0xcd, 0x8c, 0x23, 0xa5, 0x2b, 0x1e, 0x80, 0x05, - 0x0f, 0xc1, 0x1b, 0xb0, 0x66, 0xdf, 0x1d, 0x5d, 0xb0, 0xe8, 0x2a, 0xa2, 0xe1, 0x2d, 0xba, 0xfa, - 0x34, 0xe3, 0x89, 0x13, 0x37, 0x49, 0xbf, 0x7e, 0xed, 0xce, 0xf7, 0xf8, 0xde, 0x73, 0xce, 0xdc, - 0x3b, 0x77, 0xd0, 0xd1, 0xf0, 0x80, 0x19, 0x5e, 0x68, 0x0e, 0xe3, 0x1e, 0xd0, 0x00, 0x38, 0x30, - 0x73, 0x00, 0x7d, 0xa0, 0x36, 0xf7, 0xc2, 0xc0, 0xb4, 0x23, 0x2f, 0x13, 0x8f, 0xdb, 0x3d, 0xe0, - 0x76, 0xdb, 0x74, 0x21, 0x10, 0x10, 0xf4, 0x8d, 0x88, 0x86, 0x3c, 0xc4, 0x5f, 0x25, 0x2c, 0xc6, - 0x82, 0xc5, 0x58, 0x54, 0x19, 0x82, 0x65, 0x39, 0x56, 0x2c, 0x8d, 0x2f, 0x5c, 0x8f, 0x5f, 0xc5, - 0x3d, 0xc3, 0x09, 0x7d, 0xd3, 0x0d, 0xdd, 0xd0, 0x94, 0x64, 0xbd, 0x78, 0x20, 0x23, 0x19, 0xc8, - 0xaf, 0x44, 0xa4, 0xa1, 0x44, 0x84, 0x29, 0xdf, 0x76, 0xae, 0xbc, 0x00, 0xe8, 0xc4, 0x8c, 0x86, - 0xae, 0x00, 0x4c, 0x0a, 0x2c, 0x8c, 0xa9, 0x03, 0x8f, 0xad, 0x3d, 0x59, 0xc5, 0x4c, 0x1f, 0xb8, - 0x6d, 0x8e, 0x57, 0x0e, 0xd4, 0x30, 0x37, 0x55, 0xd1, 0x38, 0xe0, 0x9e, 0xbf, 0x2a, 0xf3, 0xf5, - 0xdb, 0x0a, 0x98, 0x73, 0x05, 0xbe, 0xbd, 0x52, 0xf7, 0xf9, 0x6a, 0xff, 0xe7, 0x47, 0x5a, 0x63, - 0xab, 0xbd, 0x3e, 0x3b, 0xe6, 0xde, 0xc8, 0xf4, 0x02, 0xce, 0x38, 0x7d, 0x5c, 0xd2, 0xfa, 0x3b, - 0x8f, 0x2a, 0xdd, 0x51, 0xcc, 0x38, 0x50, 0xfc, 0x0b, 0xda, 0x12, 0x07, 0xee, 0xdb, 0xdc, 0xae, - 0x6b, 0xbb, 0xda, 0xde, 0x76, 0xe7, 0x4b, 0x43, 0x4d, 0x6e, 0xd9, 0xb7, 0x11, 0x0d, 0xdd, 0x64, - 0x68, 0x22, 0xdb, 0x18, 0xb7, 0x8d, 0xb3, 0xde, 0xaf, 0xe0, 0xf0, 0x53, 0xe0, 0xb6, 0x85, 0x6f, - 0xa6, 0xcd, 0xdc, 0x6c, 0xda, 0x44, 0x0b, 0x8c, 0xa4, 0xac, 0xd8, 0x41, 0x45, 0x16, 0x81, 0x53, - 0xcf, 0x4b, 0xf6, 0x43, 0xe3, 0x25, 0xf7, 0xc2, 0x50, 0x76, 0xcf, 0x23, 0x70, 0xac, 0xf7, 0x94, - 0x5c, 0x51, 0x44, 0x44, 0x92, 0xe3, 0x21, 0x2a, 0x33, 0x6e, 0xf3, 0x98, 0xd5, 0x0b, 0x52, 0xa6, - 0xfb, 0x3a, 0x19, 0x49, 0x65, 0xbd, 0xaf, 0x84, 0xca, 0x49, 0x4c, 0x94, 0x44, 0xeb, 0xae, 0x80, - 0x76, 0x54, 0x66, 0x37, 0x0c, 0xfa, 0x9e, 0xa0, 0xc0, 0x07, 0xa8, 0xc8, 0x27, 0x11, 0xc8, 0x26, - 0x56, 0xad, 0x4f, 0xe6, 0x1e, 0x2f, 0x26, 0x11, 0x3c, 0x4c, 0x9b, 0x1f, 0x3e, 0xce, 0x17, 0x38, - 0x91, 0x15, 0xf8, 0xc7, 0xd4, 0x7b, 0x5e, 0xd6, 0x7e, 0x97, 0x95, 0x7d, 0x98, 0x36, 0x9f, 0xbc, - 0x11, 0x46, 0xca, 0x99, 0xb5, 0x89, 0x5d, 0x54, 0x1b, 0xd9, 0x8c, 0xff, 0x40, 0xc3, 0x1e, 0x5c, - 0x78, 0x3e, 0xa8, 0xd6, 0x7c, 0xf6, 0xbc, 0xf9, 0x8a, 0x0a, 0xeb, 0x23, 0x65, 0xa5, 0x76, 0xb2, - 0x4c, 0x44, 0xb2, 0xbc, 0x78, 0x8c, 0xb0, 0x00, 0x2e, 0xa8, 0x1d, 0xb0, 0xe4, 0x70, 0x42, 0xad, - 0xf8, 0xce, 0x6a, 0x0d, 0xa5, 0x86, 0x4f, 0x56, 0xd8, 0xc8, 0x1a, 0x05, 0xfc, 0x29, 0x2a, 0x53, - 0xb0, 0x59, 0x18, 0xd4, 0x4b, 0xb2, 0x71, 0xe9, 0xbc, 0x88, 0x44, 0x89, 0xfa, 0x8b, 0xf7, 0x51, - 0xc5, 0x07, 0xc6, 0x6c, 0x17, 0xea, 0x65, 0x99, 0xf8, 0x81, 0x4a, 0xac, 0x9c, 0x26, 0x30, 0x99, - 0xff, 0x6f, 0xfd, 0xa3, 0xa1, 0x6d, 0x35, 0xaa, 0x13, 0x8f, 0x71, 0xfc, 0xd3, 0xca, 0x7a, 0x18, - 0xcf, 0x3b, 0x90, 0xa8, 0x96, 0xcb, 0xb1, 0xa3, 0xb4, 0xb6, 0xe6, 0xc8, 0xd2, 0x6a, 0xf4, 0x50, - 0xc9, 0xe3, 0xe0, 0x8b, 0xc1, 0x17, 0xf6, 0xb6, 0x3b, 0xdf, 0xbe, 0xea, 0xd2, 0x5a, 0x35, 0xa5, - 0x54, 0x3a, 0x16, 0x9c, 0x24, 0xa1, 0x6e, 0xfd, 0x99, 0x4f, 0x4f, 0x24, 0xf6, 0x05, 0xff, 0xa5, - 0xa1, 0x06, 0x03, 0x3a, 0x06, 0x7a, 0xd8, 0xef, 0x53, 0x60, 0xcc, 0x9a, 0x74, 0x47, 0x1e, 0x04, - 0xbc, 0x7b, 0x7c, 0x44, 0x58, 0x5d, 0x93, 0x4e, 0xce, 0x5e, 0xe6, 0xe4, 0x7c, 0x13, 0xaf, 0xd5, - 0x52, 0xde, 0x1a, 0x1b, 0x53, 0x18, 0x79, 0xc2, 0x16, 0xfe, 0x19, 0x55, 0x19, 0x38, 0x14, 0x38, - 0x81, 0x81, 0x7a, 0x49, 0x3a, 0x6b, 0x3c, 0xaa, 0x31, 0xc8, 0x01, 0x84, 0x8e, 0x3d, 0x4a, 0x1e, - 0x24, 0x02, 0x03, 0xa0, 0x10, 0x38, 0x60, 0xd5, 0x66, 0xd3, 0x66, 0xf5, 0x7c, 0x4e, 0x44, 0x16, - 0x9c, 0xad, 0x7f, 0x35, 0x54, 0xcb, 0x6c, 0x3f, 0xbe, 0x46, 0xc8, 0x99, 0x6f, 0xd6, 0xbc, 0x2f, - 0xdf, 0xbf, 0x6a, 0x42, 0xe9, 0xa2, 0x2e, 0x5e, 0xcc, 0x14, 0x62, 0x64, 0x49, 0x0d, 0x37, 0x51, - 0xe9, 0x3a, 0x0c, 0x80, 0xd5, 0x4b, 0xbb, 0x85, 0xbd, 0xaa, 0x55, 0x15, 0x53, 0xbd, 0x14, 0x00, - 0x49, 0xf0, 0xe4, 0xea, 0xbb, 0x5e, 0x18, 0xa8, 0x1b, 0xbd, 0x74, 0xf5, 0x05, 0x4a, 0xd4, 0xdf, - 0xd6, 0xef, 0x1a, 0xfa, 0x78, 0x63, 0xcb, 0x71, 0x07, 0x21, 0x27, 0x8d, 0xd4, 0xcb, 0xb5, 0xb0, - 0x96, 0xfe, 0x21, 0x4b, 0x59, 0xf8, 0x1b, 0x54, 0xcb, 0xcc, 0x49, 0x3d, 0x5a, 0xe9, 0x4b, 0x91, - 0x51, 0x23, 0xd9, 0x5c, 0x6b, 0xff, 0xe6, 0x5e, 0xcf, 0xdd, 0xde, 0xeb, 0xb9, 0xbb, 0x7b, 0x3d, - 0xf7, 0xdb, 0x4c, 0xd7, 0x6e, 0x66, 0xba, 0x76, 0x3b, 0xd3, 0xb5, 0xff, 0x66, 0xba, 0xf6, 0xc7, - 0xff, 0x7a, 0xee, 0xb2, 0xa2, 0x7a, 0xf6, 0x26, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x90, 0x9b, 0x38, - 0x86, 0x08, 0x00, 0x00, + // 792 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0x8d, 0xf3, 0xdb, 0x4c, 0xbf, 0x7c, 0x54, 0x23, 0x90, 0x42, 0x16, 0x4e, 0x15, 0x21, 0xd4, + 0x22, 0xb0, 0x69, 0x40, 0xa8, 0x12, 0x02, 0xa9, 0x4e, 0x85, 0x54, 0xa9, 0x55, 0xd1, 0xb4, 0x62, + 0x51, 0x21, 0x81, 0xe3, 0xdc, 0xb8, 0x26, 0xf1, 0x8f, 0x3c, 0x93, 0x48, 0xe9, 0x8a, 0x07, 0x60, + 0xc1, 0x43, 0xf0, 0x06, 0xac, 0xd9, 0x77, 0x47, 0x17, 0x2c, 0xba, 0x8a, 0x68, 0x78, 0x8b, 0xae, + 0xd0, 0x8c, 0x27, 0x4e, 0x4c, 0x9a, 0x52, 0xda, 0x9d, 0xef, 0xf5, 0xbd, 0xe7, 0x9c, 0xb9, 0x67, + 0xee, 0xa0, 0xcd, 0xce, 0x3a, 0xd5, 0x1c, 0x5f, 0xef, 0xf4, 0x9a, 0x10, 0x7a, 0xc0, 0x80, 0xea, + 0x6d, 0x68, 0x41, 0x68, 0x32, 0xc7, 0xf7, 0x74, 0x33, 0x70, 0x12, 0x71, 0x7f, 0xad, 0x09, 0xcc, + 0x5c, 0xd3, 0x6d, 0xf0, 0x78, 0x0a, 0x5a, 0x5a, 0x10, 0xfa, 0xcc, 0xc7, 0x4f, 0x23, 0x14, 0x6d, + 0x82, 0xa2, 0x4d, 0xba, 0x34, 0x8e, 0x32, 0x1d, 0x4b, 0x94, 0xca, 0x23, 0xdb, 0x61, 0x87, 0xbd, + 0xa6, 0x66, 0xf9, 0xae, 0x6e, 0xfb, 0xb6, 0xaf, 0x0b, 0xb0, 0x66, 0xaf, 0x2d, 0x22, 0x11, 0x88, + 0xaf, 0x88, 0xa4, 0x22, 0x49, 0xb8, 0x28, 0xd7, 0xb4, 0x0e, 0x1d, 0x0f, 0xc2, 0x81, 0x1e, 0x74, + 0xec, 0x48, 0xa5, 0x0b, 0xcc, 0xd4, 0xfb, 0x33, 0xd2, 0x2a, 0xfa, 0xbc, 0xae, 0xb0, 0xe7, 0x31, + 0xc7, 0x85, 0x99, 0x86, 0x67, 0x7f, 0x6b, 0xa0, 0xd6, 0x21, 0xb8, 0xe6, 0x4c, 0xdf, 0x93, 0x79, + 0x7d, 0x3d, 0xe6, 0x74, 0x75, 0xc7, 0x63, 0x94, 0x85, 0x33, 0x4d, 0x0f, 0x67, 0xc7, 0x2f, 0x4f, + 0x74, 0xc1, 0x59, 0x6a, 0xdf, 0xd2, 0xa8, 0xd0, 0xe8, 0xf6, 0x28, 0x83, 0x10, 0xbf, 0x47, 0x0b, + 0xfc, 0xc8, 0x2d, 0x93, 0x99, 0x65, 0x65, 0x59, 0x59, 0x59, 0xac, 0x3f, 0xd6, 0xa4, 0x0b, 0xd3, + 0x0a, 0xb4, 0xa0, 0x63, 0x47, 0x06, 0xf0, 0x6a, 0xad, 0xbf, 0xa6, 0xed, 0x36, 0x3f, 0x80, 0xc5, + 0x76, 0x80, 0x99, 0x06, 0x3e, 0x1e, 0x56, 0x53, 0xa3, 0x61, 0x15, 0x4d, 0x72, 0x24, 0x46, 0xc5, + 0x16, 0xca, 0xd2, 0x00, 0xac, 0x72, 0x5a, 0xa0, 0x6f, 0x68, 0xd7, 0xf1, 0x58, 0x93, 0x72, 0xf7, + 0x02, 0xb0, 0x8c, 0xff, 0x24, 0x5d, 0x96, 0x47, 0x44, 0x80, 0xe3, 0x0e, 0xca, 0x53, 0x66, 0xb2, + 0x1e, 0x2d, 0x67, 0x04, 0x4d, 0xe3, 0x66, 0x34, 0x02, 0xca, 0xf8, 0x5f, 0x12, 0xe5, 0xa3, 0x98, + 0x48, 0x8a, 0xda, 0x69, 0x06, 0x2d, 0xc9, 0xca, 0x86, 0xef, 0xb5, 0x1c, 0x0e, 0x81, 0xd7, 0x51, + 0x96, 0x0d, 0x02, 0x10, 0x43, 0x2c, 0x1a, 0xf7, 0xc6, 0x1a, 0xf7, 0x07, 0x01, 0x9c, 0x0f, 0xab, + 0xb7, 0xff, 0xac, 0xe7, 0x79, 0x22, 0x3a, 0xf0, 0x9b, 0x58, 0x7b, 0x5a, 0xf4, 0xbe, 0x4c, 0xd2, + 0x9e, 0x0f, 0xab, 0x97, 0xda, 0xab, 0xc5, 0x98, 0x49, 0x99, 0xd8, 0x46, 0xa5, 0xae, 0x49, 0xd9, + 0xeb, 0xd0, 0x6f, 0xc2, 0xbe, 0xe3, 0x82, 0x1c, 0xcd, 0x83, 0xab, 0xf9, 0xcb, 0x3b, 0x8c, 0x3b, + 0x52, 0x4a, 0x69, 0x7b, 0x1a, 0x88, 0x24, 0x71, 0x71, 0x1f, 0x61, 0x9e, 0xd8, 0x0f, 0x4d, 0x8f, + 0x46, 0x87, 0xe3, 0x6c, 0xd9, 0x7f, 0x66, 0xab, 0x48, 0x36, 0xbc, 0x3d, 0x83, 0x46, 0x2e, 0x60, + 0xc0, 0xf7, 0x51, 0x3e, 0x04, 0x93, 0xfa, 0x5e, 0x39, 0x27, 0x06, 0x17, 0xfb, 0x45, 0x44, 0x96, + 0xc8, 0xbf, 0x78, 0x15, 0x15, 0x5c, 0xa0, 0xd4, 0xb4, 0xa1, 0x9c, 0x17, 0x85, 0xb7, 0x64, 0x61, + 0x61, 0x27, 0x4a, 0x93, 0xf1, 0xff, 0xda, 0x77, 0x05, 0x2d, 0x4a, 0xab, 0xb6, 0x1d, 0xca, 0xf0, + 0xdb, 0x99, 0xf5, 0xd0, 0xae, 0x76, 0x20, 0xde, 0x2d, 0x96, 0x63, 0x49, 0x72, 0x2d, 0x8c, 0x33, + 0x53, 0xab, 0xd1, 0x44, 0x39, 0x87, 0x81, 0xcb, 0x8d, 0xcf, 0xac, 0x2c, 0xd6, 0x5f, 0xdc, 0xe8, + 0xd2, 0x1a, 0x25, 0xc9, 0x94, 0xdb, 0xe2, 0x98, 0x24, 0x82, 0xae, 0x7d, 0x49, 0xc7, 0x27, 0xe2, + 0xfb, 0x82, 0xbf, 0x2a, 0xa8, 0x42, 0x21, 0xec, 0x43, 0xb8, 0xd1, 0x6a, 0x85, 0x40, 0xa9, 0x31, + 0x68, 0x74, 0x1d, 0xf0, 0x58, 0x63, 0x6b, 0x93, 0xd0, 0xb2, 0x22, 0x94, 0xec, 0x5e, 0x4f, 0xc9, + 0xde, 0x3c, 0x5c, 0xa3, 0x26, 0xb5, 0x55, 0xe6, 0x96, 0x50, 0x72, 0x89, 0x2c, 0xfc, 0x0e, 0x15, + 0x29, 0x58, 0x21, 0x30, 0x02, 0x6d, 0xf9, 0x92, 0xd4, 0x2f, 0xd0, 0x28, 0x6d, 0x10, 0x06, 0xf8, + 0x96, 0xd9, 0x8d, 0x1e, 0x24, 0x02, 0x6d, 0x08, 0xc1, 0xb3, 0xc0, 0x28, 0x8d, 0x86, 0xd5, 0xe2, + 0xde, 0x18, 0x88, 0x4c, 0x30, 0x6b, 0x3f, 0x14, 0x54, 0x4a, 0x6c, 0x3f, 0x3e, 0x42, 0xc8, 0x1a, + 0x6f, 0xd6, 0x78, 0x2e, 0xaf, 0x6e, 0xe4, 0x50, 0xbc, 0xa8, 0x93, 0x17, 0x33, 0x4e, 0x51, 0x32, + 0xc5, 0x86, 0xab, 0x28, 0x77, 0xe4, 0x7b, 0x40, 0xcb, 0xb9, 0xe5, 0xcc, 0x4a, 0xd1, 0x28, 0x72, + 0x57, 0x0f, 0x78, 0x82, 0x44, 0xf9, 0xe8, 0xea, 0xdb, 0x8e, 0xef, 0xc9, 0x1b, 0x3d, 0x75, 0xf5, + 0x79, 0x96, 0xc8, 0xbf, 0xb5, 0x4f, 0x0a, 0xba, 0x3b, 0x77, 0xe4, 0xb8, 0x8e, 0x90, 0x15, 0x47, + 0xf2, 0xe5, 0x9a, 0x48, 0x8b, 0xff, 0x90, 0xa9, 0x2a, 0xfc, 0x1c, 0x95, 0x12, 0x3e, 0xc9, 0x47, + 0x2b, 0x7e, 0x29, 0x12, 0x6c, 0x24, 0x59, 0x6b, 0xac, 0x1e, 0x9f, 0xa9, 0xa9, 0x93, 0x33, 0x35, + 0x75, 0x7a, 0xa6, 0xa6, 0x3e, 0x8e, 0x54, 0xe5, 0x78, 0xa4, 0x2a, 0x27, 0x23, 0x55, 0xf9, 0x39, + 0x52, 0x95, 0xcf, 0xbf, 0xd4, 0xd4, 0x41, 0x41, 0xce, 0xec, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x7b, 0x28, 0x43, 0x0e, 0x52, 0x08, 0x00, 0x00, } diff --git a/federation/apis/federation/v1beta1/generated.proto b/federation/apis/federation/v1beta1/generated.proto index a95484b4b8605..065f37788c668 100644 --- a/federation/apis/federation/v1beta1/generated.proto +++ b/federation/apis/federation/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.federation.apis.federation.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/federation/pkg/kubefed/init/BUILD b/federation/pkg/kubefed/init/BUILD index d1f80a36fdfdb..fca75fd686108 100644 --- a/federation/pkg/kubefed/init/BUILD +++ b/federation/pkg/kubefed/init/BUILD @@ -20,11 +20,11 @@ go_library( "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/spf13/cobra", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", @@ -47,12 +47,12 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/client-go/dynamic", "//vendor:k8s.io/client-go/rest/fake", "//vendor:k8s.io/client-go/tools/clientcmd", diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index 017640d935254..349145487a693 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -38,6 +38,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" @@ -50,7 +51,6 @@ import ( client "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/version" "github.com/spf13/cobra" diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 025b8573b3b84..34851891f943d 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/dynamic" "k8s.io/client-go/rest/fake" "k8s.io/client-go/tools/clientcmd" @@ -46,7 +47,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/intstr" ) const ( diff --git a/hack/.linted_packages b/hack/.linted_packages index 99d154ddffb89..71e1c2c6ea330 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -221,6 +221,7 @@ pkg/util/goroutinemap pkg/util/hash pkg/util/i18n pkg/util/interrupt +pkg/util/intstr pkg/util/io pkg/util/json pkg/util/limitwriter diff --git a/pkg/api/BUILD b/pkg/api/BUILD index 0ac7562ebaf38..d334e8db34009 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -26,7 +26,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", "//vendor:k8s.io/apimachinery/pkg/api/meta", @@ -42,6 +41,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/selection", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", ], ) diff --git a/pkg/api/conversion.go b/pkg/api/conversion.go index 06b465d0b1767..d5486a2e583b4 100644 --- a/pkg/api/conversion.go +++ b/pkg/api/conversion.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" utillabels "k8s.io/kubernetes/pkg/util/labels" ) diff --git a/pkg/api/testing/BUILD b/pkg/api/testing/BUILD index c95b951f248a7..da3405309b5bb 100644 --- a/pkg/api/testing/BUILD +++ b/pkg/api/testing/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/google/gofuzz", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/api/testing", @@ -35,6 +34,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 7fe170cfd1e67..16ba740d0479a 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -30,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/util/intstr" ) // overrideGenericFuncs override some generic fuzzer funcs from k8s.io/apiserver in order to have more realistic diff --git a/pkg/api/types.go b/pkg/api/types.go index dcf1a403cef5d..2e0ac77077744 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" ) // Common string formats diff --git a/pkg/api/v1/BUILD b/pkg/api/v1/BUILD index 771d1357bfde0..29061a45b8170 100644 --- a/pkg/api/v1/BUILD +++ b/pkg/api/v1/BUILD @@ -33,7 +33,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/parsers:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", @@ -47,6 +46,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/selection", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", @@ -66,12 +66,12 @@ go_test( "//pkg/api/testing/compat:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/api/v1/defaults.go b/pkg/api/v1/defaults.go index cb14c5e418078..6d620bfbf1ee1 100644 --- a/pkg/api/v1/defaults.go +++ b/pkg/api/v1/defaults.go @@ -18,8 +18,8 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/parsers" ) diff --git a/pkg/api/v1/defaults_test.go b/pkg/api/v1/defaults_test.go index 8612f4bf43ebf..4deeb377c0f43 100644 --- a/pkg/api/v1/defaults_test.go +++ b/pkg/api/v1/defaults_test.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { diff --git a/pkg/api/v1/generated.pb.go b/pkg/api/v1/generated.pb.go index 2a3c53bcee6a1..1e4c0ba665569 100644 --- a/pkg/api/v1/generated.pb.go +++ b/pkg/api/v1/generated.pb.go @@ -11878,7 +11878,7 @@ func (this *HTTPGetAction) String() string { } s := strings.Join([]string{`&HTTPGetAction{`, `Path:` + fmt.Sprintf("%v", this.Path) + `,`, - `Port:` + strings.Replace(strings.Replace(this.Port.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `Port:` + strings.Replace(strings.Replace(this.Port.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, `Host:` + fmt.Sprintf("%v", this.Host) + `,`, `Scheme:` + fmt.Sprintf("%v", this.Scheme) + `,`, `HTTPHeaders:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.HTTPHeaders), "HTTPHeader", "HTTPHeader", 1), `&`, ``, 1) + `,`, @@ -13323,7 +13323,7 @@ func (this *ServicePort) String() string { `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Protocol:` + fmt.Sprintf("%v", this.Protocol) + `,`, `Port:` + fmt.Sprintf("%v", this.Port) + `,`, - `TargetPort:` + strings.Replace(strings.Replace(this.TargetPort.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `TargetPort:` + strings.Replace(strings.Replace(this.TargetPort.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, `NodePort:` + fmt.Sprintf("%v", this.NodePort) + `,`, `}`, }, "") @@ -13394,7 +13394,7 @@ func (this *TCPSocketAction) String() string { return "nil" } s := strings.Join([]string{`&TCPSocketAction{`, - `Port:` + strings.Replace(strings.Replace(this.Port.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `Port:` + strings.Replace(strings.Replace(this.Port.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -40241,654 +40241,653 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 10369 bytes of a gzipped FileDescriptorProto + // 10365 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x6c, 0x24, 0xc7, - 0x95, 0x98, 0x7b, 0x86, 0x5f, 0xf3, 0xf8, 0xb9, 0xb5, 0xbb, 0x12, 0xc5, 0x93, 0x96, 0xab, 0x96, - 0x25, 0xaf, 0xa4, 0x15, 0xe9, 0x5d, 0x49, 0xd6, 0xda, 0x72, 0x64, 0x93, 0x1c, 0x72, 0x97, 0xde, - 0xe5, 0xee, 0xa8, 0x86, 0xbb, 0x2b, 0xdb, 0x8a, 0xa5, 0xe6, 0x74, 0x91, 0x6c, 0x6d, 0x4f, 0xf7, - 0xa8, 0xbb, 0x87, 0xbb, 0xb4, 0x63, 0xe0, 0xce, 0x67, 0xf8, 0x12, 0xc4, 0x49, 0x1c, 0x1c, 0x0c, - 0x04, 0xf9, 0xc0, 0x5d, 0x02, 0x24, 0x70, 0x72, 0x08, 0x12, 0xc7, 0x38, 0xdb, 0x87, 0x73, 0x12, - 0xe4, 0x72, 0x76, 0x7c, 0x41, 0x72, 0x30, 0x70, 0x48, 0xee, 0x92, 0x4b, 0x78, 0x67, 0x3a, 0xb9, - 0x9f, 0xf9, 0x91, 0xfb, 0xc7, 0x04, 0x49, 0x50, 0x9f, 0x5d, 0xd5, 0x33, 0xc3, 0xee, 0xa1, 0x96, - 0xb4, 0x7c, 0xc8, 0xbf, 0x99, 0xf7, 0x5e, 0xbd, 0xfa, 0xe8, 0xaa, 0x57, 0xef, 0xbd, 0x7a, 0xf5, - 0x0a, 0x2e, 0xde, 0xbb, 0x12, 0xcf, 0x79, 0xe1, 0xfc, 0xbd, 0xf6, 0x06, 0x89, 0x02, 0x92, 0x90, - 0x78, 0xbe, 0x75, 0x6f, 0x6b, 0xde, 0x69, 0x79, 0xf3, 0x3b, 0x97, 0xe6, 0xb7, 0x48, 0x40, 0x22, - 0x27, 0x21, 0xee, 0x5c, 0x2b, 0x0a, 0x93, 0x10, 0x3d, 0xce, 0xa9, 0xe7, 0x52, 0xea, 0xb9, 0xd6, - 0xbd, 0xad, 0x39, 0xa7, 0xe5, 0xcd, 0xed, 0x5c, 0x9a, 0x79, 0x61, 0xcb, 0x4b, 0xb6, 0xdb, 0x1b, - 0x73, 0x8d, 0xb0, 0x39, 0xbf, 0x15, 0x6e, 0x85, 0xf3, 0xac, 0xd0, 0x46, 0x7b, 0x93, 0xfd, 0x63, - 0x7f, 0xd8, 0x2f, 0xce, 0x6c, 0xe6, 0x25, 0x51, 0xb5, 0xd3, 0xf2, 0x9a, 0x4e, 0x63, 0xdb, 0x0b, - 0x48, 0xb4, 0xab, 0x2a, 0x8f, 0x48, 0x1c, 0xb6, 0xa3, 0x06, 0xc9, 0x36, 0xe1, 0xd0, 0x52, 0xf1, - 0x7c, 0x93, 0x24, 0x4e, 0x97, 0x86, 0xcf, 0xcc, 0xf7, 0x2a, 0x15, 0xb5, 0x83, 0xc4, 0x6b, 0x76, - 0x56, 0xf3, 0x91, 0xbc, 0x02, 0x71, 0x63, 0x9b, 0x34, 0x9d, 0x8e, 0x72, 0x97, 0xba, 0x8f, 0x67, - 0x3b, 0xf1, 0xfc, 0x79, 0x2f, 0x48, 0xe2, 0x24, 0xca, 0x16, 0xb1, 0x7f, 0xdf, 0x82, 0xf3, 0x0b, - 0x77, 0xeb, 0xcb, 0xbe, 0x13, 0x27, 0x5e, 0x63, 0xd1, 0x0f, 0x1b, 0xf7, 0xea, 0x49, 0x18, 0x91, - 0x3b, 0xa1, 0xdf, 0x6e, 0x92, 0x3a, 0x1b, 0x06, 0x74, 0x11, 0x46, 0x76, 0xd8, 0xff, 0xd5, 0xea, - 0xb4, 0x75, 0xde, 0xba, 0x50, 0x59, 0x9c, 0xfa, 0xe1, 0xde, 0xec, 0x07, 0xf6, 0xf7, 0x66, 0x47, - 0xee, 0x08, 0x38, 0x56, 0x14, 0xe8, 0x19, 0x18, 0xda, 0x8c, 0xd7, 0x77, 0x5b, 0x64, 0xba, 0xc4, - 0x68, 0x27, 0x04, 0xed, 0xd0, 0x4a, 0x9d, 0x42, 0xb1, 0xc0, 0xa2, 0x79, 0xa8, 0xb4, 0x9c, 0x28, - 0xf1, 0x12, 0x2f, 0x0c, 0xa6, 0xcb, 0xe7, 0xad, 0x0b, 0x83, 0x8b, 0xa7, 0x04, 0x69, 0xa5, 0x26, - 0x11, 0x38, 0xa5, 0xa1, 0xcd, 0x88, 0x88, 0xe3, 0xde, 0x0a, 0xfc, 0xdd, 0xe9, 0x81, 0xf3, 0xd6, - 0x85, 0x91, 0xb4, 0x19, 0x58, 0xc0, 0xb1, 0xa2, 0xb0, 0xbf, 0x5b, 0x82, 0x91, 0x85, 0xcd, 0x4d, - 0x2f, 0xf0, 0x92, 0x5d, 0xf4, 0x36, 0x8c, 0x05, 0xa1, 0x4b, 0xe4, 0x7f, 0xd6, 0x8b, 0xd1, 0xcb, - 0xcf, 0xcd, 0x1d, 0x36, 0xa5, 0xe6, 0x6e, 0x6a, 0x25, 0x16, 0xa7, 0xf6, 0xf7, 0x66, 0xc7, 0x74, - 0x08, 0x36, 0x38, 0xa2, 0x37, 0x61, 0xb4, 0x15, 0xba, 0xaa, 0x82, 0x12, 0xab, 0xe0, 0xd9, 0xc3, - 0x2b, 0xa8, 0xa5, 0x05, 0x16, 0x27, 0xf7, 0xf7, 0x66, 0x47, 0x35, 0x00, 0xd6, 0xd9, 0x21, 0x1f, - 0x26, 0xe9, 0xdf, 0x20, 0xf1, 0x54, 0x0d, 0x65, 0x56, 0xc3, 0x0b, 0xf9, 0x35, 0x68, 0x85, 0x16, - 0x4f, 0xef, 0xef, 0xcd, 0x4e, 0x66, 0x80, 0x38, 0xcb, 0xda, 0xfe, 0x3c, 0x4c, 0x2c, 0x24, 0x89, - 0xd3, 0xd8, 0x26, 0x2e, 0xff, 0xbe, 0xe8, 0x25, 0x18, 0x08, 0x9c, 0x26, 0x11, 0x5f, 0xff, 0xbc, - 0x18, 0xf6, 0x81, 0x9b, 0x4e, 0x93, 0x1c, 0xec, 0xcd, 0x4e, 0xdd, 0x0e, 0xbc, 0x77, 0xdb, 0x62, - 0xce, 0x50, 0x18, 0x66, 0xd4, 0xe8, 0x32, 0x80, 0x4b, 0x76, 0xbc, 0x06, 0xa9, 0x39, 0xc9, 0xb6, - 0x98, 0x0d, 0x48, 0x94, 0x85, 0xaa, 0xc2, 0x60, 0x8d, 0xca, 0xfe, 0x92, 0x05, 0x95, 0x85, 0x9d, - 0xd0, 0x73, 0x6b, 0xa1, 0x1b, 0xa3, 0x36, 0x4c, 0xb6, 0x22, 0xb2, 0x49, 0x22, 0x05, 0x9a, 0xb6, - 0xce, 0x97, 0x2f, 0x8c, 0x5e, 0xbe, 0x9c, 0xd3, 0x6f, 0xb3, 0xd0, 0x72, 0x90, 0x44, 0xbb, 0x8b, - 0x8f, 0x8a, 0xaa, 0x27, 0x33, 0x58, 0x9c, 0xad, 0xc3, 0xfe, 0xeb, 0x25, 0x38, 0xbb, 0xf0, 0xf9, - 0x76, 0x44, 0xaa, 0x5e, 0x7c, 0x2f, 0xbb, 0x14, 0x5c, 0x2f, 0xbe, 0x77, 0x33, 0x1d, 0x0c, 0x35, - 0x07, 0xab, 0x02, 0x8e, 0x15, 0x05, 0x7a, 0x01, 0x86, 0xe9, 0xef, 0xdb, 0x78, 0x55, 0xf4, 0xfe, - 0xb4, 0x20, 0x1e, 0xad, 0x3a, 0x89, 0x53, 0xe5, 0x28, 0x2c, 0x69, 0xd0, 0x1a, 0x8c, 0x36, 0xd8, - 0x7a, 0xdf, 0x5a, 0x0b, 0x5d, 0xc2, 0xbe, 0x70, 0x65, 0xf1, 0x79, 0x4a, 0xbe, 0x94, 0x82, 0x0f, - 0xf6, 0x66, 0xa7, 0x79, 0xdb, 0x04, 0x0b, 0x0d, 0x87, 0xf5, 0xf2, 0xc8, 0x56, 0x0b, 0x71, 0x80, - 0x71, 0x82, 0x2e, 0x8b, 0xf0, 0x82, 0xb6, 0xa6, 0x06, 0xd9, 0x9a, 0x1a, 0xeb, 0xb1, 0x9e, 0xfe, - 0x91, 0x25, 0xc6, 0x64, 0xc5, 0xf3, 0x4d, 0xf1, 0x70, 0x19, 0x20, 0x26, 0x8d, 0x88, 0x24, 0xda, - 0xa8, 0xa8, 0xcf, 0x5c, 0x57, 0x18, 0xac, 0x51, 0xd1, 0xc5, 0x1f, 0x6f, 0x3b, 0x11, 0x9b, 0x2d, - 0x62, 0x6c, 0xd4, 0xe2, 0xaf, 0x4b, 0x04, 0x4e, 0x69, 0x8c, 0xc5, 0x5f, 0xce, 0x5d, 0xfc, 0xbf, - 0x65, 0xc1, 0xf0, 0xa2, 0x17, 0xb8, 0x5e, 0xb0, 0x85, 0xde, 0x86, 0x11, 0x2a, 0x99, 0x5d, 0x27, - 0x71, 0xc4, 0xba, 0xff, 0xb0, 0x9c, 0x3c, 0xba, 0x80, 0x95, 0xd3, 0x27, 0x9e, 0xa3, 0xd4, 0x74, - 0x12, 0xdd, 0xda, 0x78, 0x87, 0x34, 0x92, 0x35, 0x92, 0x38, 0x69, 0x77, 0x52, 0x18, 0x56, 0x5c, - 0xd1, 0x6d, 0x18, 0x4a, 0x9c, 0x68, 0x8b, 0x24, 0x62, 0xd9, 0xe7, 0x2c, 0x4a, 0xce, 0x03, 0xd3, - 0x29, 0x47, 0x82, 0x06, 0x49, 0x05, 0xe4, 0x3a, 0x63, 0x82, 0x05, 0x33, 0xbb, 0x01, 0x63, 0x4b, - 0x4e, 0xcb, 0xd9, 0xf0, 0x7c, 0x2f, 0xf1, 0x48, 0x8c, 0x3e, 0x04, 0x65, 0xc7, 0x75, 0xd9, 0x02, - 0xa8, 0x2c, 0x9e, 0xdd, 0xdf, 0x9b, 0x2d, 0x2f, 0xb8, 0xee, 0xc1, 0xde, 0x2c, 0x28, 0xaa, 0x5d, - 0x4c, 0x29, 0xd0, 0x73, 0x30, 0xe0, 0x46, 0x61, 0x6b, 0xba, 0xc4, 0x28, 0x1f, 0xa1, 0x2b, 0xb5, - 0x1a, 0x85, 0xad, 0x0c, 0x29, 0xa3, 0xb1, 0xbf, 0x5f, 0x02, 0xb4, 0x44, 0x5a, 0xdb, 0x2b, 0x75, - 0xe3, 0x9b, 0x5e, 0x80, 0x91, 0x66, 0x18, 0x78, 0x49, 0x18, 0xc5, 0xa2, 0x42, 0x36, 0x2f, 0xd6, - 0x04, 0x0c, 0x2b, 0x2c, 0x3a, 0x0f, 0x03, 0xad, 0x74, 0x79, 0x8f, 0x49, 0xd1, 0xc0, 0x16, 0x36, - 0xc3, 0x50, 0x8a, 0x76, 0x4c, 0x22, 0x31, 0x9f, 0x15, 0xc5, 0xed, 0x98, 0x44, 0x98, 0x61, 0xd2, - 0x19, 0x44, 0xe7, 0x96, 0x98, 0xad, 0x99, 0x19, 0x44, 0x31, 0x58, 0xa3, 0x42, 0x6f, 0x41, 0x85, - 0xff, 0xc3, 0x64, 0x93, 0x4d, 0xdd, 0x5c, 0xa1, 0x70, 0x23, 0x6c, 0x38, 0x7e, 0x76, 0xf0, 0xc7, - 0xd9, 0x8c, 0x93, 0x8c, 0x70, 0xca, 0xd3, 0x98, 0x71, 0x43, 0xb9, 0x33, 0xee, 0x6f, 0x58, 0x80, - 0x96, 0xbc, 0xc0, 0x25, 0xd1, 0x09, 0x6c, 0x9d, 0xfd, 0x2d, 0x86, 0x3f, 0xa4, 0x4d, 0x0b, 0x9b, - 0xad, 0x30, 0x20, 0x41, 0xb2, 0x14, 0x06, 0x2e, 0xdf, 0x4e, 0x3f, 0x06, 0x03, 0x09, 0xad, 0x8a, - 0x37, 0xeb, 0x19, 0xf9, 0x59, 0x68, 0x05, 0x07, 0x7b, 0xb3, 0x8f, 0x74, 0x96, 0x60, 0x4d, 0x60, - 0x65, 0xd0, 0x47, 0x61, 0x28, 0x4e, 0x9c, 0xa4, 0x1d, 0x8b, 0x86, 0x3e, 0x29, 0x1b, 0x5a, 0x67, - 0xd0, 0x83, 0xbd, 0xd9, 0x49, 0x55, 0x8c, 0x83, 0xb0, 0x28, 0x80, 0x9e, 0x85, 0xe1, 0x26, 0x89, - 0x63, 0x67, 0x4b, 0x0a, 0xb8, 0x49, 0x51, 0x76, 0x78, 0x8d, 0x83, 0xb1, 0xc4, 0xa3, 0xa7, 0x60, - 0x90, 0x44, 0x51, 0x18, 0x89, 0x19, 0x31, 0x2e, 0x08, 0x07, 0x97, 0x29, 0x10, 0x73, 0x9c, 0xfd, - 0x9f, 0x2c, 0x98, 0x54, 0x6d, 0xe5, 0x75, 0x9d, 0xc0, 0x92, 0x77, 0x01, 0x1a, 0xb2, 0x83, 0x31, - 0x5b, 0x68, 0x5a, 0x1d, 0xdd, 0xa7, 0x5f, 0xe7, 0x80, 0xa6, 0x75, 0x28, 0x50, 0x8c, 0x35, 0xbe, - 0xf6, 0xbf, 0xb1, 0xe0, 0x74, 0xa6, 0x6f, 0x37, 0xbc, 0x38, 0x41, 0x6f, 0x76, 0xf4, 0x6f, 0xae, - 0x58, 0xff, 0x68, 0x69, 0xd6, 0x3b, 0x35, 0x5f, 0x24, 0x44, 0xeb, 0x1b, 0x86, 0x41, 0x2f, 0x21, - 0x4d, 0xd9, 0xad, 0x17, 0x0a, 0x76, 0x8b, 0xb7, 0x2f, 0xfd, 0x4a, 0xab, 0x94, 0x07, 0xe6, 0xac, - 0xec, 0xff, 0x65, 0x41, 0x65, 0x29, 0x0c, 0x36, 0xbd, 0xad, 0x35, 0xa7, 0x75, 0x02, 0xdf, 0xa7, - 0x0e, 0x03, 0x8c, 0x3b, 0xef, 0xc2, 0xa5, 0xbc, 0x2e, 0x88, 0x86, 0xcd, 0xd1, 0x3d, 0x95, 0x2b, - 0x0b, 0x4a, 0x4c, 0x51, 0x10, 0x66, 0xcc, 0x66, 0x5e, 0x81, 0x8a, 0x22, 0x40, 0x53, 0x50, 0xbe, - 0x47, 0xb8, 0x26, 0x59, 0xc1, 0xf4, 0x27, 0x3a, 0x03, 0x83, 0x3b, 0x8e, 0xdf, 0x16, 0x8b, 0x17, - 0xf3, 0x3f, 0x1f, 0x2b, 0x5d, 0xb1, 0xec, 0xef, 0xb3, 0x15, 0x28, 0x2a, 0x59, 0x0e, 0x76, 0x84, - 0x70, 0xf8, 0xb2, 0x05, 0x67, 0xfc, 0x2e, 0x42, 0x49, 0x8c, 0xc9, 0x51, 0xc4, 0xd9, 0xe3, 0xa2, - 0xd9, 0x67, 0xba, 0x61, 0x71, 0xd7, 0xda, 0xa8, 0xac, 0x0f, 0x5b, 0x74, 0xc2, 0x39, 0x3e, 0x6b, - 0xba, 0xd0, 0x01, 0x6e, 0x09, 0x18, 0x56, 0x58, 0xfb, 0x4f, 0x2c, 0x38, 0xa3, 0xfa, 0x71, 0x9d, - 0xec, 0xd6, 0x89, 0x4f, 0x1a, 0x49, 0x18, 0xbd, 0x5f, 0x7a, 0xf2, 0x04, 0xff, 0x26, 0x5c, 0x26, - 0x8d, 0x0a, 0x06, 0xe5, 0xeb, 0x64, 0x97, 0x7f, 0x20, 0xbd, 0xa3, 0xe5, 0x43, 0x3b, 0xfa, 0x9b, - 0x16, 0x8c, 0xab, 0x8e, 0x9e, 0xc0, 0x92, 0xbb, 0x61, 0x2e, 0xb9, 0x0f, 0x15, 0x9c, 0xaf, 0x3d, - 0x16, 0xdb, 0xef, 0x94, 0xe0, 0xac, 0xa2, 0x31, 0xb6, 0xa3, 0xf7, 0xc9, 0x77, 0xea, 0xaf, 0xbb, - 0xd7, 0xc9, 0xee, 0x7a, 0x48, 0xf5, 0x89, 0xee, 0xdd, 0x45, 0x97, 0x60, 0xd4, 0x25, 0x9b, 0x4e, - 0xdb, 0x4f, 0x94, 0xda, 0x3c, 0xc8, 0xed, 0xa9, 0x6a, 0x0a, 0xc6, 0x3a, 0x8d, 0x31, 0x13, 0x06, - 0x0e, 0x9d, 0x09, 0xbf, 0x32, 0xca, 0x04, 0x57, 0xe2, 0xd0, 0xcf, 0x4b, 0x55, 0x19, 0xcd, 0x0e, - 0x1a, 0xd3, 0xed, 0x20, 0x61, 0xf3, 0x3c, 0x05, 0x83, 0x5e, 0x93, 0x6e, 0x6e, 0x25, 0x73, 0xcf, - 0x5a, 0xa5, 0x40, 0xcc, 0x71, 0xe8, 0x69, 0x18, 0x6e, 0x84, 0xcd, 0xa6, 0x13, 0xb8, 0xd3, 0x65, - 0xa6, 0x5c, 0x8d, 0xd2, 0xfd, 0x6f, 0x89, 0x83, 0xb0, 0xc4, 0xa1, 0xc7, 0x61, 0xc0, 0x89, 0xb6, - 0xe2, 0xe9, 0x01, 0x46, 0x33, 0x42, 0x6b, 0x5a, 0x88, 0xb6, 0x62, 0xcc, 0xa0, 0x54, 0x69, 0xba, - 0x1f, 0x46, 0xf7, 0xbc, 0x60, 0xab, 0xea, 0x45, 0x4c, 0x03, 0xd2, 0x94, 0xa6, 0xbb, 0x0a, 0x83, - 0x35, 0x2a, 0x54, 0x83, 0xc1, 0x56, 0x18, 0x25, 0xf1, 0xf4, 0x10, 0x1b, 0xf8, 0xe7, 0x73, 0xe7, - 0x19, 0xef, 0x77, 0x2d, 0x8c, 0x92, 0xb4, 0x2b, 0xf4, 0x5f, 0x8c, 0x39, 0x23, 0xb4, 0x04, 0x65, - 0x12, 0xec, 0x4c, 0x0f, 0x33, 0x7e, 0x1f, 0x3c, 0x9c, 0xdf, 0x72, 0xb0, 0x73, 0xc7, 0x89, 0xd2, - 0x85, 0xb9, 0x1c, 0xec, 0x60, 0x5a, 0x1a, 0x35, 0xa0, 0x22, 0x7d, 0x2e, 0xf1, 0xf4, 0x48, 0x91, - 0xa9, 0x88, 0x05, 0x39, 0x26, 0xef, 0xb6, 0xbd, 0x88, 0x34, 0x49, 0x90, 0xc4, 0xa9, 0x05, 0x21, - 0xb1, 0x31, 0x4e, 0xf9, 0xa2, 0x06, 0x8c, 0x71, 0x45, 0x6b, 0x2d, 0x6c, 0x07, 0x49, 0x3c, 0x5d, - 0x61, 0x4d, 0xce, 0x31, 0xd1, 0xef, 0xa4, 0x25, 0x16, 0xcf, 0x08, 0xf6, 0x63, 0x1a, 0x30, 0xc6, - 0x06, 0x53, 0xf4, 0x26, 0x8c, 0xfb, 0xde, 0x0e, 0x09, 0x48, 0x1c, 0xd7, 0xa2, 0x70, 0x83, 0x4c, - 0x03, 0xeb, 0xcd, 0x53, 0x79, 0xe6, 0x6a, 0xb8, 0x41, 0x16, 0x4f, 0xed, 0xef, 0xcd, 0x8e, 0xdf, - 0xd0, 0x4b, 0x63, 0x93, 0x19, 0x7a, 0x0b, 0x26, 0xa8, 0x56, 0xe7, 0xa5, 0xec, 0x47, 0x8b, 0xb3, - 0x47, 0xfb, 0x7b, 0xb3, 0x13, 0xd8, 0x28, 0x8e, 0x33, 0xec, 0xd0, 0x3a, 0x54, 0x7c, 0x6f, 0x93, - 0x34, 0x76, 0x1b, 0x3e, 0x99, 0x1e, 0x63, 0xbc, 0x73, 0x16, 0xe7, 0x0d, 0x49, 0xce, 0x35, 0x69, - 0xf5, 0x17, 0xa7, 0x8c, 0xd0, 0x1d, 0x78, 0x24, 0x21, 0x51, 0xd3, 0x0b, 0x1c, 0xba, 0xa8, 0x84, - 0x9a, 0xc7, 0x7c, 0x02, 0xe3, 0x6c, 0xd6, 0x9e, 0x13, 0x03, 0xfb, 0xc8, 0x7a, 0x57, 0x2a, 0xdc, - 0xa3, 0x34, 0xba, 0x05, 0x93, 0x6c, 0x3d, 0xd5, 0xda, 0xbe, 0x5f, 0x0b, 0x7d, 0xaf, 0xb1, 0x3b, - 0x3d, 0xc1, 0x18, 0x3e, 0x2d, 0x2d, 0xfd, 0x55, 0x13, 0x4d, 0x2d, 0xa0, 0xf4, 0x1f, 0xce, 0x96, - 0x46, 0x3e, 0x4c, 0xc6, 0xa4, 0xd1, 0x8e, 0xbc, 0x64, 0x97, 0xce, 0x7d, 0xf2, 0x20, 0x99, 0x9e, - 0x2c, 0x62, 0xd1, 0xd5, 0xcd, 0x42, 0xdc, 0xcd, 0x92, 0x01, 0xe2, 0x2c, 0x6b, 0x2a, 0x2a, 0xe2, - 0xc4, 0xf5, 0x82, 0xe9, 0x29, 0x26, 0x81, 0xd4, 0xfa, 0xaa, 0x53, 0x20, 0xe6, 0x38, 0x66, 0x28, - 0xd3, 0x1f, 0xb7, 0xa8, 0x94, 0x3e, 0xc5, 0x08, 0x53, 0x43, 0x59, 0x22, 0x70, 0x4a, 0x43, 0xf7, - 0xc0, 0x24, 0xd9, 0x9d, 0x46, 0x8c, 0x54, 0x2d, 0xb5, 0xf5, 0xf5, 0x4f, 0x63, 0x0a, 0x47, 0x77, - 0x60, 0x98, 0x04, 0x3b, 0x2b, 0x51, 0xd8, 0x9c, 0x3e, 0x5d, 0x44, 0x06, 0x2c, 0x73, 0x62, 0xbe, - 0x7f, 0xa4, 0xba, 0xba, 0x00, 0x63, 0xc9, 0x0c, 0x3d, 0x80, 0xe9, 0x2e, 0x5f, 0x89, 0x7f, 0x94, - 0x33, 0xec, 0xa3, 0x7c, 0x5c, 0x94, 0x9d, 0x5e, 0xef, 0x41, 0x77, 0x70, 0x08, 0x0e, 0xf7, 0xe4, - 0x6e, 0x6f, 0xc0, 0x84, 0x12, 0x54, 0xec, 0x7b, 0xa3, 0x59, 0x18, 0xa4, 0xb2, 0x58, 0x5a, 0xae, - 0x15, 0x3a, 0xa8, 0x54, 0x44, 0xc7, 0x98, 0xc3, 0xd9, 0xa0, 0x7a, 0x9f, 0x27, 0x8b, 0xbb, 0x09, - 0xe1, 0x16, 0x4c, 0x59, 0x1b, 0x54, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0x7f, 0xb8, 0x3e, 0x90, 0x4a, - 0xc3, 0x02, 0x3b, 0xc1, 0x45, 0x18, 0xd9, 0x0e, 0xe3, 0x84, 0x52, 0xb3, 0x3a, 0x06, 0x53, 0x0d, - 0xe0, 0x9a, 0x80, 0x63, 0x45, 0x81, 0x5e, 0x85, 0xf1, 0x86, 0x5e, 0x81, 0xd8, 0xc6, 0xce, 0x8a, - 0x22, 0x66, 0xed, 0xd8, 0xa4, 0x45, 0x57, 0x60, 0x84, 0xb9, 0x73, 0x1b, 0xa1, 0x2f, 0x6c, 0x25, - 0xb9, 0x2b, 0x8f, 0xd4, 0x04, 0xfc, 0x40, 0xfb, 0x8d, 0x15, 0x35, 0xb5, 0x38, 0x69, 0x13, 0x56, - 0x6b, 0x62, 0x03, 0x51, 0x16, 0xe7, 0x35, 0x06, 0xc5, 0x02, 0x6b, 0xff, 0xd3, 0x92, 0x36, 0xca, - 0x54, 0xd3, 0x27, 0xe8, 0x33, 0x30, 0x7c, 0xdf, 0xf1, 0x12, 0x2f, 0xd8, 0x12, 0xda, 0xc3, 0x8b, - 0x05, 0x77, 0x13, 0x56, 0xfc, 0x2e, 0x2f, 0xca, 0x77, 0x3e, 0xf1, 0x07, 0x4b, 0x86, 0x94, 0x77, - 0xd4, 0x0e, 0x02, 0xca, 0xbb, 0xd4, 0x3f, 0x6f, 0xcc, 0x8b, 0x72, 0xde, 0xe2, 0x0f, 0x96, 0x0c, - 0xd1, 0x26, 0x80, 0x9c, 0x4b, 0xc4, 0x15, 0x6e, 0xd4, 0x8f, 0xf4, 0xc3, 0x7e, 0x5d, 0x95, 0x5e, - 0x9c, 0xa0, 0x7b, 0x6d, 0xfa, 0x1f, 0x6b, 0x9c, 0xed, 0x84, 0x29, 0x61, 0x9d, 0xcd, 0x42, 0x9f, - 0xa5, 0x4b, 0xda, 0x89, 0x12, 0xe2, 0x2e, 0x24, 0x59, 0x4f, 0xf4, 0xe1, 0xba, 0xe4, 0xba, 0xd7, - 0x24, 0xfa, 0xf2, 0x17, 0x4c, 0x70, 0xca, 0xcf, 0xfe, 0x4e, 0x19, 0xa6, 0x7b, 0x35, 0x97, 0x4e, - 0x49, 0xf2, 0xc0, 0x4b, 0x96, 0xa8, 0x9a, 0x64, 0x99, 0x53, 0x72, 0x59, 0xc0, 0xb1, 0xa2, 0xa0, - 0x73, 0x23, 0xf6, 0xb6, 0xa4, 0x55, 0x30, 0x98, 0xce, 0x8d, 0x3a, 0x83, 0x62, 0x81, 0xa5, 0x74, - 0x11, 0x71, 0x62, 0xe1, 0xc5, 0xd7, 0xe6, 0x10, 0x66, 0x50, 0x2c, 0xb0, 0xba, 0xe5, 0x3f, 0x90, - 0x63, 0xf9, 0x1b, 0x43, 0x34, 0xf8, 0x70, 0x87, 0x08, 0x7d, 0x0e, 0x60, 0xd3, 0x0b, 0xbc, 0x78, - 0x9b, 0x71, 0x1f, 0xea, 0x9b, 0xbb, 0x52, 0xb2, 0x56, 0x14, 0x17, 0xac, 0x71, 0x44, 0x2f, 0xc3, - 0xa8, 0x5a, 0x9e, 0xab, 0xd5, 0xe9, 0x61, 0xd3, 0xf3, 0x9b, 0xca, 0xaa, 0x2a, 0xd6, 0xe9, 0xec, - 0x77, 0xb2, 0xf3, 0x45, 0xac, 0x0a, 0x6d, 0x7c, 0xad, 0xa2, 0xe3, 0x5b, 0x3a, 0x7c, 0x7c, 0xed, - 0xff, 0x58, 0x86, 0x49, 0xa3, 0xb2, 0x76, 0x5c, 0x40, 0xa2, 0xbd, 0x4e, 0x37, 0x2c, 0x27, 0x21, - 0x62, 0x4d, 0x5e, 0xec, 0x67, 0xd1, 0xe8, 0xdb, 0x1b, 0x5d, 0x0b, 0x9c, 0x13, 0xda, 0x86, 0x8a, - 0xef, 0xc4, 0xcc, 0x77, 0x40, 0xc4, 0x5a, 0xec, 0x8f, 0x6d, 0x6a, 0x7e, 0x38, 0x71, 0xa2, 0xed, - 0x1e, 0xbc, 0x96, 0x94, 0x39, 0xdd, 0x6d, 0xa9, 0xb2, 0x23, 0x8f, 0x8e, 0x54, 0x73, 0xa8, 0x46, - 0xb4, 0x8b, 0x39, 0x0e, 0x5d, 0x81, 0xb1, 0x88, 0xb0, 0x99, 0xb2, 0x44, 0xf5, 0x39, 0x36, 0xf5, - 0x06, 0x53, 0xc5, 0x0f, 0x6b, 0x38, 0x6c, 0x50, 0xa6, 0x7a, 0xff, 0xd0, 0x21, 0x7a, 0xff, 0xb3, - 0x30, 0xcc, 0x7e, 0xa8, 0x59, 0xa1, 0xbe, 0xd0, 0x2a, 0x07, 0x63, 0x89, 0xcf, 0x4e, 0xa2, 0x91, - 0x82, 0x93, 0xe8, 0x39, 0x98, 0xa8, 0x3a, 0xa4, 0x19, 0x06, 0xcb, 0x81, 0xdb, 0x0a, 0xbd, 0x20, - 0x41, 0xd3, 0x30, 0xc0, 0xf6, 0x13, 0xbe, 0xde, 0x07, 0x28, 0x07, 0x3c, 0x40, 0x75, 0x77, 0xfb, - 0xff, 0x5a, 0x30, 0x5e, 0x25, 0x3e, 0x49, 0x08, 0xb7, 0x7b, 0x62, 0xb4, 0x02, 0x68, 0x2b, 0x72, - 0x1a, 0xa4, 0x46, 0x22, 0x2f, 0x74, 0xeb, 0xa4, 0x11, 0x06, 0xec, 0xc4, 0x85, 0x6e, 0x90, 0x8f, - 0xec, 0xef, 0xcd, 0xa2, 0xab, 0x1d, 0x58, 0xdc, 0xa5, 0x04, 0x72, 0x61, 0xbc, 0x15, 0x11, 0xc3, - 0x41, 0x66, 0xe5, 0xab, 0x1a, 0x35, 0xbd, 0x08, 0xd7, 0x86, 0x0d, 0x10, 0x36, 0x99, 0xa2, 0x4f, - 0xc2, 0x54, 0x18, 0xb5, 0xb6, 0x9d, 0xa0, 0x4a, 0x5a, 0x24, 0x70, 0xa9, 0x09, 0x20, 0xcc, 0xfa, - 0x33, 0xfb, 0x7b, 0xb3, 0x53, 0xb7, 0x32, 0x38, 0xdc, 0x41, 0x6d, 0xff, 0x5a, 0x09, 0xce, 0x56, - 0xc3, 0xfb, 0xc1, 0x7d, 0x27, 0x72, 0x17, 0x6a, 0xab, 0x5c, 0xaf, 0x67, 0xde, 0x65, 0xe9, 0xd5, - 0xb6, 0x7a, 0x7a, 0xb5, 0x3f, 0x0b, 0x23, 0x9b, 0x1e, 0xf1, 0x5d, 0x4c, 0x36, 0x45, 0xf7, 0x2e, - 0x15, 0x71, 0xfb, 0xaf, 0xd0, 0x32, 0xd2, 0x6f, 0xc2, 0xad, 0xce, 0x15, 0xc1, 0x06, 0x2b, 0x86, - 0xa8, 0x0d, 0x53, 0xd2, 0x70, 0x91, 0x58, 0xb1, 0x3a, 0x5e, 0x2c, 0x66, 0x17, 0x99, 0xd5, 0xb0, - 0xf1, 0xc0, 0x19, 0x86, 0xb8, 0xa3, 0x0a, 0x6a, 0x70, 0x36, 0xe9, 0xde, 0x30, 0xc0, 0xe6, 0x0a, - 0x33, 0x38, 0x99, 0xed, 0xcc, 0xa0, 0xf6, 0x3f, 0xb0, 0xe0, 0xd1, 0x8e, 0xd1, 0x12, 0x8e, 0x85, - 0x37, 0xa4, 0x45, 0xcf, 0x8f, 0xe7, 0x72, 0x5a, 0xd9, 0x75, 0xcc, 0x8b, 0x59, 0xf7, 0xa5, 0x7c, - 0xeb, 0xde, 0xbe, 0x05, 0x67, 0x96, 0x9b, 0xad, 0x64, 0xb7, 0xea, 0x99, 0xce, 0xf8, 0x57, 0x60, - 0xa8, 0x49, 0x5c, 0xaf, 0xdd, 0x14, 0x9f, 0x75, 0x56, 0x0a, 0xd2, 0x35, 0x06, 0x3d, 0xd8, 0x9b, - 0x1d, 0xaf, 0x27, 0x61, 0xe4, 0x6c, 0x11, 0x0e, 0xc0, 0x82, 0xdc, 0xfe, 0xb1, 0x05, 0x93, 0x72, - 0x41, 0x2d, 0xb8, 0x6e, 0x44, 0xe2, 0x18, 0xcd, 0x40, 0xc9, 0x6b, 0x09, 0x46, 0x20, 0x18, 0x95, - 0x56, 0x6b, 0xb8, 0xe4, 0xb5, 0xd0, 0x67, 0xa0, 0xc2, 0xcf, 0x70, 0xd2, 0xc9, 0xd1, 0xe7, 0x99, - 0x10, 0x33, 0xa6, 0xd6, 0x25, 0x0f, 0x9c, 0xb2, 0x93, 0x6a, 0x25, 0x13, 0xd5, 0x65, 0xf3, 0x44, - 0xe1, 0x9a, 0x80, 0x63, 0x45, 0x81, 0x2e, 0xc0, 0x48, 0x10, 0xba, 0xfc, 0x98, 0x8d, 0x6f, 0xba, - 0x6c, 0xca, 0xdd, 0x14, 0x30, 0xac, 0xb0, 0xf6, 0x57, 0x2d, 0x18, 0x93, 0x7d, 0x2c, 0xa8, 0xe1, - 0xd2, 0x45, 0x92, 0x6a, 0xb7, 0xe9, 0x22, 0xa1, 0x1a, 0x2a, 0xc3, 0x18, 0x8a, 0x69, 0xb9, 0x1f, - 0xc5, 0xd4, 0xfe, 0x8d, 0x12, 0x4c, 0xc8, 0xe6, 0xd4, 0xdb, 0x1b, 0x31, 0xa1, 0xfb, 0x76, 0xc5, - 0xe1, 0x83, 0x4f, 0xe4, 0x3c, 0x7b, 0x21, 0xcf, 0x78, 0x31, 0xbe, 0x59, 0xaa, 0x17, 0x2c, 0x48, - 0x3e, 0x38, 0x65, 0x89, 0x76, 0xe0, 0x54, 0x10, 0x26, 0x6c, 0x3f, 0x50, 0xf8, 0x62, 0x3e, 0xf0, - 0x6c, 0x3d, 0x8f, 0x89, 0x7a, 0x4e, 0xdd, 0xcc, 0xf2, 0xc3, 0x9d, 0x55, 0xa0, 0x5b, 0xd2, 0x29, - 0x53, 0x66, 0x75, 0x3d, 0x57, 0xac, 0xae, 0xde, 0x3e, 0x19, 0xfb, 0x07, 0x16, 0x54, 0x24, 0xd9, - 0x49, 0x1c, 0x86, 0xdc, 0x85, 0xe1, 0x98, 0x7d, 0x22, 0x39, 0x5c, 0x17, 0x8b, 0x75, 0x81, 0x7f, - 0xd7, 0x74, 0x13, 0xe4, 0xff, 0x63, 0x2c, 0xb9, 0x31, 0x37, 0xac, 0xea, 0xc8, 0xfb, 0xce, 0x0d, - 0xab, 0x5a, 0xd6, 0xfb, 0xcc, 0x63, 0xdc, 0x30, 0x9f, 0xa9, 0x26, 0xd7, 0x8a, 0xc8, 0xa6, 0xf7, - 0x20, 0xab, 0xc9, 0xd5, 0x18, 0x14, 0x0b, 0x2c, 0xda, 0x84, 0xb1, 0x86, 0xf4, 0xdf, 0xa6, 0x22, - 0xe4, 0xc3, 0x05, 0xbd, 0xc2, 0xea, 0x80, 0x81, 0x07, 0xad, 0x2c, 0x69, 0x9c, 0xb0, 0xc1, 0x97, - 0xca, 0xa9, 0xf4, 0x0c, 0xb5, 0x5c, 0xd0, 0xd3, 0x11, 0x91, 0x24, 0xad, 0xa1, 0xe7, 0xf1, 0xa9, - 0xfd, 0x0d, 0x0b, 0x86, 0xb8, 0xc3, 0xaf, 0x98, 0xd7, 0x54, 0x3b, 0x3a, 0x49, 0xc7, 0xf3, 0x0e, - 0x05, 0x8a, 0x93, 0x14, 0x74, 0x17, 0x2a, 0xec, 0x07, 0x73, 0x5e, 0x94, 0x8b, 0x44, 0xf0, 0xf0, - 0xfa, 0xf5, 0xa6, 0xde, 0x91, 0x0c, 0x70, 0xca, 0xcb, 0xfe, 0x5e, 0x99, 0x8a, 0xbe, 0x94, 0xd4, - 0xd8, 0xdb, 0xad, 0x93, 0xd8, 0xdb, 0x4b, 0xc7, 0xbf, 0xb7, 0xbf, 0x0b, 0x93, 0x0d, 0xed, 0xe8, - 0x26, 0xfd, 0xe2, 0x97, 0x0b, 0x4e, 0x2b, 0xed, 0xbc, 0x87, 0x3b, 0xb8, 0x96, 0x4c, 0x76, 0x38, - 0xcb, 0x1f, 0x11, 0x18, 0xe3, 0xf3, 0x41, 0xd4, 0x37, 0xc0, 0xea, 0x9b, 0x2f, 0x32, 0xc3, 0xf4, - 0xca, 0xd8, 0x2c, 0xae, 0x6b, 0x8c, 0xb0, 0xc1, 0xd6, 0xfe, 0x9b, 0x83, 0x30, 0xb8, 0xbc, 0x43, - 0x82, 0xe4, 0x04, 0x44, 0x5d, 0x13, 0x26, 0xbc, 0x60, 0x27, 0xf4, 0x77, 0x88, 0xcb, 0xf1, 0x47, - 0xdb, 0xde, 0x1f, 0x11, 0x95, 0x4c, 0xac, 0x1a, 0xcc, 0x70, 0x86, 0xf9, 0x71, 0x98, 0xd6, 0xaf, - 0xc3, 0x10, 0x9f, 0x19, 0xc2, 0xae, 0xce, 0x71, 0x80, 0xb3, 0x81, 0x15, 0x2b, 0x28, 0x75, 0x00, - 0x70, 0xdf, 0xbb, 0x60, 0x84, 0xde, 0x81, 0x89, 0x4d, 0x2f, 0x8a, 0x13, 0x6a, 0x1d, 0xc7, 0x89, - 0xd3, 0x6c, 0x1d, 0xc1, 0xa8, 0x56, 0x23, 0xb2, 0x62, 0x70, 0xc2, 0x19, 0xce, 0x68, 0x0b, 0xc6, - 0xa9, 0x4d, 0x97, 0x56, 0x35, 0xdc, 0x77, 0x55, 0xca, 0xa7, 0x76, 0x43, 0x67, 0x84, 0x4d, 0xbe, - 0x54, 0x24, 0x35, 0x98, 0x0d, 0x38, 0xc2, 0xb4, 0x1b, 0x25, 0x92, 0xb8, 0xf1, 0xc7, 0x71, 0x54, - 0xb2, 0xb1, 0x18, 0x8a, 0x8a, 0x29, 0xd9, 0xd2, 0x48, 0x09, 0xfb, 0x5b, 0x74, 0x2f, 0xa6, 0x63, - 0x78, 0x02, 0xdb, 0xd7, 0x35, 0x73, 0xfb, 0x7a, 0xaa, 0xc0, 0x97, 0xed, 0xb1, 0x75, 0xbd, 0x0d, - 0xa3, 0xda, 0x87, 0x47, 0xf3, 0x50, 0x69, 0xc8, 0x63, 0x7e, 0x21, 0xc5, 0x95, 0x2a, 0xa5, 0xce, - 0xff, 0x71, 0x4a, 0x43, 0xc7, 0x85, 0xaa, 0xa0, 0xd9, 0xa0, 0x20, 0xaa, 0xa0, 0x62, 0x86, 0xb1, - 0x5f, 0x04, 0x58, 0x7e, 0x40, 0x1a, 0x0b, 0x0d, 0x16, 0x8b, 0xa2, 0x1d, 0x88, 0x59, 0xbd, 0x0f, - 0xc4, 0xec, 0x6f, 0x5a, 0x30, 0xb1, 0xb2, 0x64, 0xe8, 0xf4, 0x73, 0x00, 0x5c, 0x37, 0xbe, 0x7b, - 0xf7, 0xa6, 0x74, 0xf8, 0x72, 0xaf, 0x9c, 0x82, 0x62, 0x8d, 0x02, 0x3d, 0x06, 0x65, 0xbf, 0x1d, - 0x08, 0x95, 0x75, 0x78, 0x7f, 0x6f, 0xb6, 0x7c, 0xa3, 0x1d, 0x60, 0x0a, 0xd3, 0xa2, 0x6f, 0xca, - 0x85, 0xa3, 0x6f, 0xf2, 0xe3, 0x50, 0xbf, 0x5e, 0x86, 0xa9, 0x15, 0x9f, 0x3c, 0x30, 0x5a, 0xfd, - 0x0c, 0x0c, 0xb9, 0x91, 0xb7, 0x43, 0xa2, 0xac, 0x22, 0x50, 0x65, 0x50, 0x2c, 0xb0, 0x85, 0x03, - 0x82, 0xde, 0xea, 0xdc, 0xc8, 0x8f, 0x2f, 0x18, 0x2a, 0xb7, 0xcf, 0x68, 0x13, 0x86, 0xf9, 0x01, - 0x6a, 0x3c, 0x3d, 0xc8, 0xa6, 0xe2, 0xab, 0x87, 0x37, 0x26, 0x3b, 0x3e, 0x73, 0xc2, 0x21, 0xc1, - 0x43, 0x31, 0x94, 0x2c, 0x13, 0x50, 0x2c, 0x99, 0xcf, 0x7c, 0x0c, 0xc6, 0x74, 0xca, 0xbe, 0x62, - 0x32, 0x7e, 0xd1, 0x82, 0xd3, 0x2b, 0x7e, 0xd8, 0xb8, 0x97, 0x89, 0xd8, 0x7a, 0x19, 0x46, 0xe9, - 0x62, 0x8a, 0x8d, 0x70, 0x46, 0x23, 0x6e, 0x53, 0xa0, 0xb0, 0x4e, 0xa7, 0x15, 0xbb, 0x7d, 0x7b, - 0xb5, 0xda, 0x2d, 0xdc, 0x53, 0xa0, 0xb0, 0x4e, 0x67, 0xff, 0xae, 0x05, 0x4f, 0x5c, 0x5d, 0x5a, - 0xae, 0x91, 0x28, 0xf6, 0xe2, 0x84, 0x04, 0x49, 0x47, 0xc4, 0x29, 0xd5, 0x19, 0x5d, 0xad, 0x29, - 0xa9, 0xce, 0x58, 0x65, 0xad, 0x10, 0xd8, 0xf7, 0x4b, 0xd8, 0xf5, 0x37, 0x2c, 0x38, 0x7d, 0xd5, - 0x4b, 0x30, 0x69, 0x85, 0xd9, 0x20, 0xd1, 0x88, 0xb4, 0xc2, 0xd8, 0x4b, 0xc2, 0x68, 0x37, 0x1b, - 0x24, 0x8a, 0x15, 0x06, 0x6b, 0x54, 0xbc, 0xe6, 0x1d, 0x2f, 0xa6, 0x2d, 0x2d, 0x99, 0xa6, 0x2e, - 0x16, 0x70, 0xac, 0x28, 0x68, 0xc7, 0x5c, 0x2f, 0x62, 0x2a, 0xc3, 0xae, 0x58, 0xc1, 0xaa, 0x63, - 0x55, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0xb7, 0x2d, 0x38, 0x7b, 0xd5, 0x6f, 0xc7, 0x09, 0x89, 0x36, - 0x63, 0xa3, 0xb1, 0x2f, 0x42, 0x85, 0x48, 0xe5, 0x5e, 0xb4, 0x55, 0x6d, 0x1a, 0x4a, 0xeb, 0xe7, - 0x11, 0xaa, 0x8a, 0xae, 0x40, 0x20, 0x64, 0x7f, 0x61, 0x7b, 0xbf, 0x59, 0x82, 0xf1, 0x6b, 0xeb, - 0xeb, 0xb5, 0xab, 0x24, 0x11, 0x52, 0x32, 0xdf, 0x29, 0x55, 0xd3, 0x2c, 0x72, 0x6d, 0x6f, 0xc9, - 0xac, 0xba, 0x76, 0xe2, 0xf9, 0x73, 0xfc, 0x42, 0xc0, 0xdc, 0x6a, 0x90, 0xdc, 0x8a, 0xea, 0x49, - 0xe4, 0x05, 0x5b, 0x5d, 0x2d, 0x78, 0x29, 0xc9, 0xcb, 0xbd, 0x24, 0x39, 0x7a, 0x11, 0x86, 0xd8, - 0x7d, 0x04, 0xa9, 0x7a, 0xfc, 0x9c, 0xd2, 0x12, 0x18, 0xf4, 0x60, 0x6f, 0xb6, 0x72, 0x1b, 0xaf, - 0xf2, 0x3f, 0x58, 0x90, 0xa2, 0xb7, 0x60, 0x74, 0x3b, 0x49, 0x5a, 0xd7, 0x88, 0xe3, 0x92, 0x48, - 0x4a, 0x89, 0x0b, 0x87, 0x4b, 0x09, 0x3a, 0x18, 0xbc, 0x40, 0xba, 0xb0, 0x52, 0x58, 0x8c, 0x75, - 0x8e, 0x76, 0x1d, 0x20, 0xc5, 0x3d, 0x24, 0x0b, 0xc4, 0xfe, 0x85, 0x12, 0x0c, 0x5f, 0x73, 0x02, - 0xd7, 0x27, 0x11, 0x5a, 0x81, 0x01, 0xf2, 0x80, 0x34, 0xc4, 0x36, 0x9e, 0xd3, 0xf4, 0x74, 0xab, - 0xe3, 0x5e, 0x35, 0xfa, 0x1f, 0xb3, 0xf2, 0x08, 0xc3, 0x30, 0x6d, 0xf7, 0x55, 0x15, 0x3d, 0xfc, - 0x7c, 0xfe, 0x28, 0xa8, 0x29, 0xc1, 0xf7, 0x49, 0x01, 0xc2, 0x92, 0x11, 0xf3, 0x3f, 0x35, 0x5a, - 0x75, 0x2a, 0xdc, 0x92, 0x62, 0x76, 0xdd, 0xfa, 0x52, 0x8d, 0x93, 0x0b, 0xbe, 0xdc, 0xff, 0x24, - 0x81, 0x38, 0x65, 0x67, 0x5f, 0x81, 0x33, 0xec, 0xf8, 0xd2, 0x49, 0xb6, 0x8d, 0x35, 0x93, 0x3b, - 0x39, 0xed, 0xbf, 0x5b, 0x82, 0x53, 0xab, 0xf5, 0xa5, 0xba, 0xe9, 0x39, 0xbc, 0x02, 0x63, 0x7c, - 0x7b, 0xa6, 0x93, 0xce, 0xf1, 0x45, 0x79, 0xe5, 0x72, 0x5f, 0xd7, 0x70, 0xd8, 0xa0, 0x44, 0x4f, - 0x40, 0xd9, 0x7b, 0x37, 0xc8, 0x46, 0x7b, 0xad, 0xbe, 0x7e, 0x13, 0x53, 0x38, 0x45, 0xd3, 0x9d, - 0x9e, 0x8b, 0x38, 0x85, 0x56, 0xbb, 0xfd, 0x6b, 0x30, 0xe1, 0xc5, 0x8d, 0xd8, 0x5b, 0x0d, 0xe8, - 0xfa, 0x77, 0x1a, 0x72, 0xfa, 0xa6, 0xaa, 0x39, 0x6d, 0xaa, 0xc2, 0xe2, 0x0c, 0xb5, 0x26, 0x6f, - 0x07, 0x0b, 0x6b, 0x0b, 0xf9, 0x61, 0xc4, 0xef, 0x40, 0x45, 0x85, 0x3b, 0xc9, 0x70, 0x36, 0xab, - 0x47, 0x38, 0x5b, 0xbe, 0xc0, 0x91, 0xfe, 0xdc, 0x72, 0x57, 0x7f, 0xee, 0x3f, 0xb6, 0x20, 0x8d, - 0xd7, 0x40, 0x18, 0x2a, 0xad, 0x90, 0x1d, 0x96, 0x44, 0xf2, 0x54, 0xf2, 0xe9, 0x9c, 0x99, 0xc8, - 0x57, 0x02, 0x9f, 0x2b, 0x35, 0x59, 0x16, 0xa7, 0x6c, 0xd0, 0x0d, 0x18, 0x6e, 0x45, 0xa4, 0x9e, - 0xb0, 0x58, 0xf4, 0x3e, 0x38, 0xb2, 0x59, 0x5d, 0xe3, 0x25, 0xb1, 0x64, 0x61, 0xff, 0x0b, 0x0b, - 0xe0, 0x86, 0xd7, 0xf4, 0x12, 0xec, 0x04, 0x5b, 0xe4, 0x04, 0x8c, 0xbd, 0x9b, 0x30, 0x10, 0xb7, - 0x48, 0xa3, 0xd8, 0x71, 0x57, 0xda, 0xb2, 0x7a, 0x8b, 0x34, 0xd2, 0xcf, 0x41, 0xff, 0x61, 0xc6, - 0xc7, 0xfe, 0x2e, 0xc0, 0x44, 0x4a, 0x46, 0x15, 0x6e, 0xf4, 0x82, 0x11, 0x84, 0xfd, 0x58, 0x26, - 0x08, 0xbb, 0xc2, 0xa8, 0xb5, 0xb8, 0xeb, 0x04, 0xca, 0x4d, 0xe7, 0x81, 0xd0, 0xef, 0x5f, 0x2e, - 0xda, 0x20, 0x5a, 0xd3, 0xdc, 0x9a, 0xf3, 0x80, 0xab, 0x53, 0xcf, 0xcb, 0x89, 0xb4, 0xe6, 0x3c, - 0x38, 0xe0, 0x87, 0x5a, 0x6c, 0x25, 0x52, 0x83, 0xe2, 0x4b, 0x7f, 0x94, 0xfe, 0x67, 0xc2, 0x91, - 0x56, 0xc7, 0x6a, 0xf5, 0x02, 0xe1, 0x9e, 0xec, 0xb3, 0x56, 0x2f, 0xc8, 0xd6, 0xea, 0x05, 0x05, - 0x6a, 0xf5, 0x02, 0xf4, 0x65, 0x0b, 0x86, 0x85, 0x57, 0x9f, 0x45, 0xc0, 0x8d, 0x5e, 0xfe, 0x68, - 0x5f, 0x55, 0x8b, 0xe3, 0x01, 0x5e, 0xfd, 0xbc, 0xd4, 0x21, 0x05, 0x34, 0xb7, 0x09, 0xb2, 0x6a, - 0xf4, 0xab, 0x16, 0x4c, 0x88, 0xdf, 0x98, 0xbc, 0xdb, 0x26, 0x71, 0x22, 0x76, 0xab, 0x4f, 0x1e, - 0xa5, 0x35, 0x82, 0x05, 0x6f, 0xd4, 0x47, 0xa4, 0xa8, 0x31, 0x91, 0xb9, 0x6d, 0xcb, 0xb4, 0x07, - 0x7d, 0xd7, 0x82, 0x33, 0x4d, 0xe7, 0x01, 0xaf, 0x91, 0xc3, 0xb0, 0x93, 0x78, 0xa1, 0x88, 0xf2, - 0x5b, 0xe9, 0x77, 0x9e, 0x74, 0x30, 0xe2, 0xcd, 0x95, 0x01, 0x3c, 0x67, 0xba, 0x91, 0xe4, 0x36, - 0xba, 0x6b, 0x0b, 0x67, 0x36, 0x61, 0x44, 0x4e, 0xcc, 0x2e, 0xda, 0x7b, 0x55, 0xdf, 0x94, 0x73, - 0x6c, 0xe5, 0x39, 0xe9, 0xf1, 0x9a, 0x7b, 0xbd, 0xed, 0x04, 0x89, 0x97, 0xec, 0x6a, 0xda, 0x3e, - 0xab, 0x47, 0x4c, 0xc5, 0x63, 0xad, 0xe7, 0x1d, 0x18, 0xd3, 0xe7, 0xdd, 0xb1, 0xd6, 0xf5, 0x2e, - 0x9c, 0xee, 0x32, 0xab, 0x8e, 0xb5, 0xca, 0xfb, 0xf0, 0x58, 0xcf, 0xf9, 0x71, 0x9c, 0x15, 0xdb, - 0xff, 0xdc, 0xd2, 0x45, 0xe7, 0x09, 0xf8, 0x52, 0xd6, 0x4c, 0x5f, 0xca, 0x85, 0xa2, 0x6b, 0xa8, - 0x87, 0x43, 0x65, 0x53, 0x6f, 0x3e, 0xdd, 0x12, 0xd0, 0x3a, 0x0c, 0xf9, 0x14, 0x22, 0x8f, 0xb2, - 0x2e, 0xf6, 0xb3, 0x4a, 0x53, 0x6d, 0x83, 0xc1, 0x63, 0x2c, 0x78, 0xd9, 0xdf, 0xb5, 0x60, 0xe0, - 0xa7, 0x78, 0x45, 0xa4, 0x83, 0xb5, 0xb8, 0xb1, 0x3c, 0x87, 0x9d, 0xfb, 0xcb, 0x0f, 0x12, 0x12, - 0xc4, 0x4c, 0xb9, 0xec, 0x3a, 0x44, 0xbf, 0x56, 0x82, 0x51, 0x5a, 0x95, 0x0c, 0x46, 0x78, 0x15, - 0xc6, 0x7d, 0x67, 0x83, 0xf8, 0xd2, 0x0f, 0x9c, 0x35, 0xc4, 0x6e, 0xe8, 0x48, 0x6c, 0xd2, 0xd2, - 0xc2, 0x9b, 0xba, 0x9b, 0x5c, 0x28, 0x49, 0xaa, 0xb0, 0xe1, 0x43, 0xc7, 0x26, 0x2d, 0xb5, 0x05, - 0xee, 0x3b, 0x49, 0x63, 0x5b, 0x18, 0x69, 0xaa, 0xb9, 0x77, 0x29, 0x10, 0x73, 0x1c, 0x5a, 0x80, - 0x49, 0x39, 0x63, 0xef, 0x50, 0xeb, 0x3d, 0x0c, 0x84, 0x02, 0xa9, 0xae, 0x99, 0x62, 0x13, 0x8d, - 0xb3, 0xf4, 0xe8, 0x63, 0x30, 0x41, 0x07, 0x27, 0x6c, 0x27, 0x32, 0xd4, 0x62, 0x90, 0x85, 0x5a, - 0xb0, 0x48, 0xdd, 0x75, 0x03, 0x83, 0x33, 0x94, 0xf6, 0x5b, 0x70, 0xfa, 0x46, 0xe8, 0xb8, 0x8b, - 0x8e, 0xef, 0x04, 0x0d, 0x12, 0xad, 0x06, 0x5b, 0xb9, 0xa7, 0xd2, 0xfa, 0xc9, 0x71, 0x29, 0xef, - 0xe4, 0xd8, 0x8e, 0x00, 0xe9, 0x15, 0x88, 0x20, 0xa1, 0x37, 0x61, 0xd8, 0xe3, 0x55, 0x89, 0x69, - 0x7b, 0x29, 0xcf, 0xcd, 0xd4, 0xd1, 0x46, 0x2d, 0xe8, 0x85, 0x03, 0xb0, 0x64, 0x49, 0x6d, 0x8b, - 0x6e, 0x7e, 0xa9, 0x7c, 0xf3, 0xcd, 0xfe, 0x4b, 0x16, 0x4c, 0xde, 0xcc, 0xdc, 0x61, 0x7c, 0x06, - 0x86, 0x62, 0x12, 0x75, 0x71, 0xb2, 0xd5, 0x19, 0x14, 0x0b, 0xec, 0x43, 0x37, 0xdc, 0x7f, 0xb9, - 0x04, 0x15, 0x16, 0x6e, 0xda, 0xa2, 0x76, 0xc2, 0xf1, 0xab, 0xa9, 0x6b, 0x86, 0x9a, 0x9a, 0x63, - 0x3e, 0xaa, 0x86, 0xf5, 0xd2, 0x52, 0xd1, 0x6d, 0x75, 0xb7, 0xaf, 0x90, 0xe5, 0x98, 0x32, 0xe4, - 0xf7, 0xbf, 0x26, 0xcc, 0xab, 0x80, 0xf2, 0xde, 0x1f, 0x3b, 0xcb, 0x55, 0xb4, 0xef, 0xbb, 0xb3, - 0x5c, 0xd5, 0xb2, 0x1e, 0xc2, 0xa9, 0xa6, 0x35, 0x9e, 0x89, 0xef, 0x4f, 0xb0, 0x20, 0x42, 0xc7, - 0xf7, 0x3e, 0x4f, 0xd4, 0x15, 0xd9, 0x59, 0x11, 0x14, 0x28, 0xa0, 0x07, 0x4c, 0xce, 0x88, 0x7f, - 0xfc, 0x06, 0x74, 0x5a, 0xc4, 0xbe, 0x06, 0x93, 0x99, 0xa1, 0x43, 0x2f, 0xc3, 0x60, 0x6b, 0xdb, - 0x89, 0x49, 0x26, 0x3c, 0x65, 0xb0, 0x46, 0x81, 0x07, 0x7b, 0xb3, 0x13, 0xaa, 0x00, 0x83, 0x60, - 0x4e, 0x6d, 0x7f, 0xb9, 0x04, 0x03, 0x37, 0x43, 0xf7, 0x24, 0xa6, 0xda, 0x35, 0x63, 0xaa, 0x3d, - 0x93, 0x9f, 0x3f, 0xa1, 0xe7, 0x2c, 0xab, 0x65, 0x66, 0xd9, 0x85, 0x02, 0xbc, 0x0e, 0x9f, 0x60, - 0x4d, 0x18, 0x65, 0xf9, 0x19, 0x44, 0x7c, 0xce, 0x8b, 0x86, 0x65, 0x35, 0x9b, 0xb1, 0xac, 0x26, - 0x35, 0x52, 0xcd, 0xbe, 0x7a, 0x16, 0x86, 0x45, 0x3c, 0x48, 0x36, 0x84, 0x52, 0xd0, 0x62, 0x89, - 0xb7, 0xff, 0x59, 0x19, 0x8c, 0x7c, 0x10, 0xe8, 0x07, 0x16, 0xcc, 0x45, 0xfc, 0x3a, 0x8a, 0x5b, - 0x6d, 0x47, 0x5e, 0xb0, 0x55, 0x6f, 0x6c, 0x13, 0xb7, 0xed, 0x7b, 0xc1, 0xd6, 0xea, 0x56, 0x10, - 0x2a, 0xf0, 0xf2, 0x03, 0xd2, 0x68, 0x33, 0xf7, 0x6b, 0xe1, 0x34, 0x14, 0xea, 0x2c, 0xf4, 0xf2, - 0xfe, 0xde, 0xec, 0x1c, 0xee, 0xab, 0x16, 0xdc, 0x67, 0xab, 0xd0, 0x1f, 0x58, 0x30, 0xcf, 0x33, - 0x22, 0x14, 0xef, 0x49, 0x21, 0x8b, 0xb4, 0x26, 0x99, 0xa6, 0xec, 0xd6, 0x49, 0xd4, 0x5c, 0x7c, - 0x45, 0x0c, 0xf2, 0x7c, 0xad, 0xbf, 0x5a, 0x71, 0xbf, 0xcd, 0xb4, 0xff, 0x55, 0x19, 0xc6, 0xe9, - 0x78, 0xa6, 0xb7, 0xa0, 0x5f, 0x36, 0xa6, 0xc9, 0x93, 0x99, 0x69, 0x72, 0xca, 0x20, 0x7e, 0x38, - 0x17, 0xa0, 0x63, 0x38, 0xe5, 0x3b, 0x71, 0x72, 0x8d, 0x38, 0x51, 0xb2, 0x41, 0x1c, 0x76, 0xe4, - 0x98, 0x0d, 0x67, 0x28, 0x70, 0x8a, 0xa9, 0x62, 0x8c, 0x6e, 0x64, 0x99, 0xe1, 0x4e, 0xfe, 0x68, - 0x07, 0x10, 0x3b, 0xde, 0x8c, 0x9c, 0x20, 0xe6, 0x7d, 0xf1, 0x84, 0xc3, 0xb6, 0xbf, 0x5a, 0x67, - 0x44, 0xad, 0xe8, 0x46, 0x07, 0x37, 0xdc, 0xa5, 0x06, 0xed, 0x00, 0x7b, 0xb0, 0xe8, 0x01, 0xf6, - 0x50, 0x4e, 0xec, 0xf2, 0x57, 0x2c, 0x38, 0x4d, 0x3f, 0x8b, 0x19, 0xe7, 0x1a, 0xa3, 0x10, 0x26, - 0xe9, 0xb4, 0xf3, 0x49, 0x22, 0x61, 0x62, 0x7d, 0xe5, 0x68, 0xd6, 0x26, 0x9f, 0x54, 0x7d, 0xbb, - 0x6e, 0x32, 0xc3, 0x59, 0xee, 0xf6, 0x37, 0x2d, 0x60, 0x81, 0x74, 0x27, 0xb0, 0x99, 0x5d, 0x35, - 0x37, 0x33, 0x3b, 0x5f, 0x62, 0xf4, 0xd8, 0xc7, 0x5e, 0x82, 0x29, 0x8a, 0xad, 0x45, 0xe1, 0x83, - 0x5d, 0xa9, 0x68, 0xe7, 0x7b, 0x6e, 0xbf, 0x52, 0xe2, 0xcb, 0x46, 0xdd, 0xab, 0x43, 0xbf, 0x64, - 0xc1, 0x48, 0xc3, 0x69, 0x39, 0x0d, 0x9e, 0x4d, 0xa7, 0x80, 0x77, 0xc6, 0x28, 0x3f, 0xb7, 0x24, - 0xca, 0x72, 0xcf, 0xc2, 0x87, 0x65, 0xd7, 0x25, 0x38, 0xd7, 0x9b, 0xa0, 0x2a, 0x9f, 0xb9, 0x07, - 0xe3, 0x06, 0xb3, 0x63, 0x35, 0x43, 0x7f, 0xc9, 0xe2, 0x42, 0x5f, 0x99, 0x0a, 0xf7, 0xe1, 0x54, - 0xa0, 0xfd, 0xa7, 0xe2, 0x4c, 0x6a, 0xc6, 0x73, 0xc5, 0xc5, 0x3a, 0x93, 0x82, 0x5a, 0xd0, 0x60, - 0x86, 0x21, 0xee, 0xac, 0xc3, 0xfe, 0x7b, 0x16, 0x3c, 0xaa, 0x13, 0x6a, 0x17, 0x21, 0xf3, 0xfc, - 0xc6, 0x55, 0x18, 0x09, 0x5b, 0x24, 0x72, 0x52, 0xb3, 0xe8, 0x82, 0x1c, 0xff, 0x5b, 0x02, 0x7e, - 0xb0, 0x37, 0x7b, 0x46, 0xe7, 0x2e, 0xe1, 0x58, 0x95, 0x44, 0x36, 0x0c, 0xb1, 0x71, 0x89, 0xc5, - 0x15, 0x56, 0x96, 0x5d, 0x86, 0x9d, 0x96, 0xc4, 0x58, 0x60, 0xec, 0xbf, 0x66, 0xf1, 0xe9, 0xa6, - 0x37, 0x1d, 0x7d, 0x01, 0xa6, 0x9a, 0xd4, 0x82, 0x5a, 0x7e, 0xd0, 0xa2, 0x1b, 0x29, 0x3b, 0x25, - 0xb6, 0x8a, 0x6c, 0x1f, 0x3d, 0xba, 0xbb, 0x38, 0x2d, 0x5a, 0x3f, 0xb5, 0x96, 0x61, 0x8b, 0x3b, - 0x2a, 0xb2, 0xff, 0xb3, 0x58, 0xb3, 0x4c, 0x87, 0x7b, 0x16, 0x86, 0x5b, 0xa1, 0xbb, 0xb4, 0x5a, - 0xc5, 0x62, 0xac, 0x94, 0xd0, 0xa9, 0x71, 0x30, 0x96, 0x78, 0x74, 0x19, 0x80, 0x3c, 0x48, 0x48, - 0x14, 0x38, 0xbe, 0x3a, 0xdd, 0x55, 0xaa, 0xd2, 0xb2, 0xc2, 0x60, 0x8d, 0x8a, 0x96, 0x69, 0x45, - 0xe1, 0x8e, 0xe7, 0xb2, 0x08, 0xfe, 0xb2, 0x59, 0xa6, 0xa6, 0x30, 0x58, 0xa3, 0xa2, 0x76, 0x6b, - 0x3b, 0x88, 0xf9, 0x36, 0xe6, 0x6c, 0x88, 0x64, 0x28, 0x23, 0xa9, 0xdd, 0x7a, 0x5b, 0x47, 0x62, - 0x93, 0xd6, 0xfe, 0x0f, 0x15, 0x80, 0x54, 0x51, 0x42, 0x5f, 0xee, 0x5c, 0xa3, 0x1f, 0x29, 0xaa, - 0x65, 0x3d, 0xbc, 0x05, 0x8a, 0xbe, 0x66, 0xc1, 0xa8, 0xe3, 0xfb, 0x61, 0xc3, 0x49, 0x58, 0x8f, - 0x4a, 0x45, 0xa5, 0x85, 0x68, 0xc9, 0x42, 0x5a, 0x96, 0x37, 0xe6, 0x45, 0x79, 0xf8, 0xa7, 0x61, - 0x72, 0xdb, 0xa3, 0x37, 0x01, 0x7d, 0x58, 0x2a, 0xda, 0xfc, 0xa3, 0xcc, 0x64, 0x15, 0xed, 0x0a, - 0x93, 0x91, 0x9a, 0x8e, 0x8d, 0xde, 0x32, 0xf2, 0x7d, 0x0c, 0x14, 0xb9, 0x39, 0x69, 0xa8, 0x0e, - 0x79, 0xa9, 0x3e, 0xd0, 0x67, 0xf4, 0xe0, 0xe6, 0xc1, 0x22, 0x57, 0x93, 0x35, 0x0d, 0x36, 0x27, - 0xb0, 0x39, 0x81, 0x49, 0xd7, 0xdc, 0x2c, 0x45, 0x80, 0xd6, 0xa5, 0xfc, 0x1a, 0x32, 0xbb, 0x6c, - 0xba, 0x3d, 0x66, 0x10, 0x38, 0x5b, 0x05, 0xfa, 0x0c, 0x0f, 0x3d, 0x5f, 0x0d, 0x36, 0x43, 0x11, - 0xa4, 0x75, 0xb1, 0xc0, 0x37, 0xdf, 0x8d, 0x13, 0xd2, 0xa4, 0x65, 0xd2, 0xfd, 0xf0, 0xa6, 0xe0, - 0x82, 0x15, 0x3f, 0xb4, 0x0e, 0x43, 0xec, 0xa2, 0x4c, 0x3c, 0x3d, 0x52, 0xc4, 0x79, 0x66, 0xde, - 0x0f, 0x4d, 0x95, 0x10, 0xf6, 0x37, 0xc6, 0x82, 0x17, 0xba, 0x26, 0x6f, 0x88, 0xc7, 0xab, 0xc1, - 0xed, 0x98, 0xb0, 0x1b, 0xe2, 0x95, 0xc5, 0x0f, 0xa6, 0x57, 0xbe, 0x39, 0xbc, 0x6b, 0xc6, 0x33, - 0xa3, 0x24, 0xd5, 0x45, 0xc4, 0x7f, 0x99, 0x48, 0x6d, 0x1a, 0x8a, 0x34, 0xd4, 0x4c, 0xbb, 0x96, - 0x0e, 0xf6, 0x1d, 0x93, 0x19, 0xce, 0x72, 0x3f, 0xd1, 0x5d, 0x70, 0x26, 0x80, 0xa9, 0xec, 0xa2, - 0x3c, 0xd6, 0x5d, 0xf7, 0x27, 0x03, 0x30, 0x61, 0x4e, 0x0e, 0x34, 0x0f, 0x15, 0xc1, 0x44, 0x25, - 0x56, 0x52, 0x6b, 0x60, 0x4d, 0x22, 0x70, 0x4a, 0xc3, 0x52, 0x4c, 0xb1, 0xe2, 0x5a, 0x78, 0x4e, - 0x9a, 0x62, 0x4a, 0x61, 0xb0, 0x46, 0x45, 0x95, 0xd7, 0x8d, 0x30, 0x4c, 0x94, 0xf0, 0x56, 0xf3, - 0x66, 0x91, 0x41, 0xb1, 0xc0, 0x52, 0xa1, 0x7d, 0x8f, 0x7e, 0x4c, 0xdf, 0x74, 0x04, 0x2a, 0xa1, - 0x7d, 0x5d, 0x47, 0x62, 0x93, 0x96, 0x6e, 0x42, 0x61, 0xcc, 0x26, 0xa2, 0x50, 0x91, 0xd3, 0x70, - 0xa7, 0x3a, 0xbf, 0x3c, 0x26, 0xf1, 0xe8, 0xd3, 0xf0, 0xa8, 0xba, 0xeb, 0x85, 0xb9, 0x63, 0x55, - 0xd6, 0x38, 0x64, 0x58, 0xb9, 0x8f, 0x2e, 0x75, 0x27, 0xc3, 0xbd, 0xca, 0xa3, 0xd7, 0x60, 0x42, - 0xa8, 0xb7, 0x92, 0xe3, 0xb0, 0x79, 0x1a, 0x7e, 0xdd, 0xc0, 0xe2, 0x0c, 0x35, 0xaa, 0xc2, 0x14, - 0x85, 0x30, 0xbd, 0x52, 0x72, 0xe0, 0x77, 0xd6, 0xd4, 0xee, 0x7c, 0x3d, 0x83, 0xc7, 0x1d, 0x25, - 0xd0, 0x02, 0x4c, 0x72, 0xfd, 0x82, 0xda, 0x72, 0xec, 0x3b, 0x88, 0xc8, 0x4a, 0xb5, 0x10, 0x6e, - 0x99, 0x68, 0x9c, 0xa5, 0x47, 0x57, 0x60, 0xcc, 0x89, 0x1a, 0xdb, 0x5e, 0x42, 0x1a, 0x49, 0x3b, - 0xe2, 0xf9, 0x17, 0xb4, 0x70, 0x82, 0x05, 0x0d, 0x87, 0x0d, 0x4a, 0xfb, 0xf3, 0x70, 0xba, 0x4b, - 0x18, 0x37, 0x9d, 0x38, 0x4e, 0xcb, 0x93, 0x7d, 0xca, 0x04, 0x2e, 0x2d, 0xd4, 0x56, 0x65, 0x6f, - 0x34, 0x2a, 0x3a, 0x3b, 0x99, 0x47, 0x59, 0xcb, 0x7b, 0xa8, 0x66, 0xe7, 0x8a, 0x44, 0xe0, 0x94, - 0xc6, 0xfe, 0xd3, 0x0a, 0x68, 0x0e, 0x97, 0x02, 0xe1, 0x2a, 0x57, 0x60, 0x4c, 0xa6, 0xf2, 0xd4, - 0x52, 0xe8, 0xa9, 0x6e, 0x5e, 0xd5, 0x70, 0xd8, 0xa0, 0xa4, 0x6d, 0x0b, 0xa4, 0x1b, 0x29, 0x1b, - 0x26, 0xa5, 0xfc, 0x4b, 0x38, 0xa5, 0x41, 0x17, 0x61, 0x24, 0x26, 0xfe, 0xe6, 0x0d, 0x2f, 0xb8, - 0x27, 0x26, 0xb6, 0x92, 0xcc, 0x75, 0x01, 0xc7, 0x8a, 0x02, 0x2d, 0x42, 0xb9, 0xed, 0xb9, 0x62, - 0x2a, 0x4b, 0xb5, 0xa1, 0x7c, 0x7b, 0xb5, 0x7a, 0xb0, 0x37, 0xfb, 0x64, 0xaf, 0xbc, 0xa6, 0xd4, - 0xa4, 0x8e, 0xe7, 0xe8, 0xf2, 0xa3, 0x85, 0xbb, 0xb9, 0xd6, 0x87, 0xfa, 0x74, 0xad, 0x5f, 0x06, - 0x10, 0xbd, 0x96, 0x73, 0xb9, 0x9c, 0x7e, 0xb5, 0xab, 0x0a, 0x83, 0x35, 0x2a, 0x6a, 0x98, 0x37, - 0x22, 0xe2, 0x48, 0xdb, 0x95, 0x87, 0x17, 0x8f, 0x1c, 0xdd, 0x30, 0x5f, 0xca, 0x32, 0xc3, 0x9d, - 0xfc, 0x51, 0x08, 0xa7, 0x5c, 0xba, 0x90, 0x8c, 0x4a, 0x2b, 0xfd, 0xc7, 0x34, 0xd3, 0x0a, 0xab, - 0x59, 0x46, 0xb8, 0x93, 0x37, 0xfa, 0x1c, 0xcc, 0x48, 0x60, 0xe7, 0x6d, 0x4e, 0xb6, 0x5c, 0xca, - 0x8b, 0xe7, 0xf6, 0xf7, 0x66, 0x67, 0xaa, 0x3d, 0xa9, 0xf0, 0x21, 0x1c, 0xd0, 0x9b, 0x30, 0xc4, - 0x8e, 0x62, 0xe2, 0xe9, 0x51, 0xb6, 0xe3, 0xbd, 0x54, 0x24, 0x32, 0x9e, 0xce, 0xfa, 0x39, 0x76, - 0xa0, 0x23, 0x62, 0x3e, 0xd3, 0xf3, 0x2d, 0x06, 0xc4, 0x82, 0x27, 0x6a, 0xc1, 0xa8, 0x13, 0x04, - 0x61, 0xe2, 0x70, 0x45, 0x6c, 0xac, 0x88, 0x2e, 0xa9, 0x55, 0xb1, 0x90, 0x96, 0xe5, 0xf5, 0xa8, - 0x40, 0x32, 0x0d, 0x83, 0xf5, 0x2a, 0xd0, 0x7d, 0x98, 0x0c, 0xef, 0x53, 0x81, 0x29, 0x4f, 0x23, - 0xe2, 0xe9, 0x71, 0xb3, 0x63, 0x39, 0xbe, 0x55, 0xa3, 0xb0, 0x26, 0xc9, 0x4c, 0xa6, 0x38, 0x5b, - 0x0b, 0x9a, 0x33, 0x3c, 0xcc, 0x13, 0x69, 0x64, 0x73, 0xea, 0x61, 0xd6, 0x1d, 0xca, 0xec, 0xc6, - 0x30, 0x8f, 0x66, 0x64, 0x12, 0x61, 0x32, 0x73, 0x63, 0x38, 0x45, 0x61, 0x9d, 0x6e, 0xe6, 0xa3, - 0x30, 0xaa, 0x0d, 0x7c, 0x3f, 0x21, 0xb4, 0x33, 0xaf, 0xc1, 0x54, 0x76, 0x40, 0xfb, 0x0a, 0xc1, - 0xfd, 0x9f, 0x25, 0x98, 0xec, 0x72, 0xd4, 0x73, 0xcf, 0x63, 0x61, 0xe0, 0x86, 0xe8, 0xbb, 0xee, - 0x05, 0x2e, 0x66, 0x18, 0x53, 0x80, 0x95, 0x0a, 0x08, 0x30, 0x29, 0x4d, 0xcb, 0x3d, 0xa5, 0xa9, - 0x10, 0x5a, 0x03, 0xef, 0x45, 0x68, 0x99, 0xfb, 0xc4, 0x60, 0xa1, 0x7d, 0xe2, 0x21, 0x08, 0x3a, - 0x63, 0xab, 0x19, 0x2e, 0xb0, 0xd5, 0x7c, 0xa3, 0x04, 0x53, 0x69, 0xb8, 0xb1, 0xc8, 0xef, 0x7b, - 0xfc, 0x27, 0x07, 0xeb, 0xc6, 0xc9, 0x41, 0x5e, 0xfa, 0xde, 0x4c, 0xfb, 0x7a, 0x9e, 0x22, 0xbc, - 0x99, 0x39, 0x45, 0x78, 0xa9, 0x4f, 0xbe, 0x87, 0x9f, 0x28, 0x7c, 0xa7, 0x04, 0x67, 0xb3, 0x45, - 0x96, 0x7c, 0xc7, 0x6b, 0x9e, 0xc0, 0x78, 0x7d, 0xda, 0x18, 0xaf, 0x57, 0xfa, 0xeb, 0x17, 0x6b, - 0x64, 0xcf, 0x41, 0x73, 0x32, 0x83, 0xf6, 0xd1, 0xa3, 0x30, 0x3f, 0x7c, 0xe4, 0x7e, 0xcf, 0x82, - 0xc7, 0xba, 0x96, 0x3b, 0x01, 0x5f, 0xe9, 0x1b, 0xa6, 0xaf, 0xf4, 0xc5, 0x23, 0xf4, 0xae, 0x87, - 0xf3, 0xf4, 0xbf, 0x95, 0x7a, 0xf4, 0x8a, 0x79, 0x93, 0x6e, 0xc1, 0xa8, 0xd3, 0x68, 0x90, 0x38, - 0x5e, 0x0b, 0x5d, 0x95, 0x7b, 0xe8, 0x05, 0xb6, 0xb7, 0xa4, 0xe0, 0x83, 0xbd, 0xd9, 0x99, 0x2c, - 0x8b, 0x14, 0x8d, 0x75, 0x0e, 0x66, 0x56, 0xb4, 0xd2, 0x31, 0x65, 0x45, 0xbb, 0x0c, 0xb0, 0xa3, - 0xac, 0xd8, 0xac, 0x93, 0x4a, 0xb3, 0x6f, 0x35, 0x2a, 0xf4, 0xe7, 0x99, 0x46, 0xc8, 0xe3, 0x2a, - 0x06, 0xcc, 0x9b, 0x8b, 0x39, 0xdf, 0x4f, 0x8f, 0xd1, 0xe0, 0x17, 0x24, 0x95, 0x43, 0x4f, 0xb1, - 0xb4, 0xbf, 0x5d, 0x86, 0x9f, 0x3b, 0x64, 0xd2, 0xa1, 0x05, 0xf3, 0x98, 0xf4, 0xf9, 0xac, 0xf7, - 0x66, 0xa6, 0x6b, 0x61, 0xc3, 0x9d, 0x93, 0xf9, 0x56, 0xa5, 0xf7, 0xfc, 0xad, 0xbe, 0xae, 0xfb, - 0xda, 0x78, 0xa0, 0xe4, 0xd5, 0x23, 0x2f, 0xab, 0x9f, 0x55, 0xef, 0xf8, 0x97, 0x2c, 0x78, 0xb2, - 0x6b, 0xb7, 0x8c, 0xb0, 0x8c, 0x79, 0xa8, 0x34, 0x28, 0x50, 0xbb, 0xd3, 0x92, 0x5e, 0x26, 0x93, - 0x08, 0x9c, 0xd2, 0x18, 0xd1, 0x17, 0xa5, 0xdc, 0xe8, 0x8b, 0xdf, 0xb1, 0xe0, 0x4c, 0xb6, 0x11, - 0x27, 0x20, 0x75, 0xea, 0xa6, 0xd4, 0x99, 0xeb, 0xef, 0xe3, 0xf7, 0x10, 0x38, 0xbf, 0x3a, 0x0e, - 0x8f, 0x74, 0xec, 0x59, 0x7c, 0x14, 0x7f, 0xde, 0x82, 0x53, 0x5b, 0x4c, 0xf7, 0xd6, 0x2e, 0x0e, - 0x89, 0x7e, 0xe5, 0xdc, 0xb6, 0x3a, 0xf4, 0xbe, 0x11, 0xb7, 0x24, 0x3a, 0x48, 0x70, 0x67, 0x65, - 0xe8, 0xab, 0x16, 0x9c, 0x71, 0xee, 0xc7, 0x1d, 0x6f, 0x47, 0x88, 0x89, 0xf4, 0x5a, 0x8e, 0xab, - 0x2b, 0xe7, 0xd5, 0x89, 0xc5, 0xe9, 0xfd, 0xbd, 0xd9, 0x33, 0xdd, 0xa8, 0x70, 0xd7, 0x5a, 0xe9, - 0xf7, 0xdd, 0x16, 0x17, 0x13, 0x8a, 0x5d, 0x81, 0xeb, 0x76, 0x8d, 0x81, 0x0b, 0x25, 0x89, 0xc1, - 0x8a, 0x23, 0x7a, 0x1b, 0x2a, 0x5b, 0xf2, 0xae, 0x50, 0x56, 0xe8, 0xf5, 0x18, 0xe6, 0x6e, 0x57, - 0x8b, 0x78, 0xb0, 0xbc, 0x42, 0xe1, 0x94, 0x29, 0xba, 0x06, 0xe5, 0x60, 0x33, 0x16, 0xb7, 0x72, - 0xf3, 0x82, 0x6e, 0xcc, 0x50, 0x27, 0x7e, 0x91, 0xf1, 0xe6, 0x4a, 0x1d, 0x53, 0x16, 0x94, 0x53, - 0xb4, 0xe1, 0x0a, 0x1f, 0x6f, 0x0e, 0x27, 0xbc, 0x58, 0xed, 0xe4, 0x84, 0x17, 0xab, 0x98, 0xb2, - 0x40, 0x35, 0x18, 0x64, 0xd7, 0x1e, 0x84, 0x03, 0x37, 0xe7, 0xea, 0x76, 0xc7, 0xe5, 0x0e, 0x9e, - 0x7a, 0x8f, 0x81, 0x31, 0x67, 0x84, 0xd6, 0x61, 0xa8, 0xc1, 0xd2, 0xa4, 0x0b, 0xcb, 0x3a, 0x2f, - 0xa9, 0x41, 0x47, 0x4a, 0x75, 0x7e, 0xd0, 0xc4, 0xe1, 0x58, 0xf0, 0x62, 0x5c, 0x49, 0x6b, 0x7b, - 0x33, 0x16, 0xa6, 0x73, 0x1e, 0xd7, 0x8e, 0x84, 0xf7, 0x82, 0x2b, 0x83, 0x63, 0xc1, 0x0b, 0x55, - 0xa1, 0xb4, 0xd9, 0x10, 0x19, 0x3c, 0x73, 0x1c, 0xb7, 0xe6, 0xad, 0xd4, 0xc5, 0xa1, 0xfd, 0xbd, - 0xd9, 0xd2, 0xca, 0x12, 0x2e, 0x6d, 0x36, 0xd0, 0x1b, 0x30, 0xbc, 0xc9, 0xef, 0x19, 0x8a, 0x6c, - 0x9d, 0x97, 0xf2, 0x2e, 0x43, 0x76, 0x5c, 0x4a, 0xe4, 0x17, 0x22, 0x04, 0x02, 0x4b, 0x76, 0x2c, - 0x91, 0x99, 0xba, 0x39, 0x29, 0xd2, 0x75, 0xce, 0xf5, 0x77, 0xd3, 0x52, 0x58, 0x94, 0x0a, 0x8a, - 0x35, 0x8e, 0x74, 0xce, 0x3b, 0xf2, 0xc5, 0x07, 0x96, 0xaa, 0x33, 0x77, 0xce, 0x77, 0x7d, 0x20, - 0x82, 0xcf, 0x79, 0x85, 0xc2, 0x29, 0x53, 0xd4, 0x86, 0xf1, 0x9d, 0xb8, 0xb5, 0x4d, 0xe4, 0xd2, - 0x67, 0xf9, 0x3b, 0x47, 0x2f, 0x7f, 0x3c, 0x27, 0x29, 0xab, 0x28, 0xe2, 0x45, 0x49, 0xdb, 0xf1, - 0x3b, 0x24, 0x18, 0xcb, 0x1c, 0x75, 0x47, 0x67, 0x8b, 0xcd, 0x5a, 0xe8, 0x27, 0x79, 0xb7, 0x1d, - 0x6e, 0xec, 0x26, 0x44, 0xe4, 0xf7, 0xcc, 0xf9, 0x24, 0xaf, 0x73, 0xe2, 0xce, 0x4f, 0x22, 0x10, - 0x58, 0xb2, 0x53, 0x43, 0xc6, 0xa4, 0xf1, 0x54, 0xe1, 0x21, 0xeb, 0xe8, 0x43, 0x3a, 0x64, 0x4c, - 0xfa, 0xa6, 0x4c, 0x99, 0xd4, 0x6d, 0x6d, 0x87, 0x49, 0x18, 0x64, 0x64, 0xff, 0xa9, 0x22, 0x52, - 0xb7, 0xd6, 0xa5, 0x64, 0xa7, 0xd4, 0xed, 0x46, 0x85, 0xbb, 0xd6, 0x6a, 0xff, 0x97, 0xc1, 0xce, - 0xed, 0x96, 0xa9, 0xc3, 0x7f, 0xb5, 0xf3, 0xf4, 0xf1, 0x93, 0xfd, 0x5b, 0x7d, 0x0f, 0xf1, 0x1c, - 0xf2, 0xab, 0x16, 0x3c, 0xd2, 0xea, 0xba, 0x99, 0x8a, 0x0d, 0xab, 0x5f, 0xe3, 0x91, 0x0f, 0x98, - 0x4a, 0x5e, 0xdb, 0x1d, 0x8f, 0x7b, 0xd4, 0x99, 0x55, 0x41, 0xcb, 0xef, 0x59, 0x05, 0xbd, 0x0b, - 0x23, 0x4c, 0x67, 0x4a, 0x33, 0x6d, 0xf4, 0x99, 0x94, 0x82, 0x6d, 0x7d, 0x4b, 0x82, 0x05, 0x56, - 0xcc, 0xe8, 0xc0, 0x3d, 0x91, 0xed, 0x04, 0x26, 0x0c, 0x2d, 0x12, 0xbc, 0x72, 0x6f, 0xc7, 0x8a, - 0x18, 0x89, 0x27, 0x6a, 0x87, 0x11, 0x1f, 0xe4, 0x11, 0xe0, 0xc3, 0x2b, 0x3b, 0x59, 0x95, 0xf6, - 0x1f, 0x5a, 0x5d, 0x34, 0x30, 0x6e, 0x86, 0x7c, 0xdc, 0x34, 0x43, 0x9e, 0xc9, 0x9a, 0x21, 0x1d, - 0xae, 0x03, 0xc3, 0x02, 0x29, 0x9e, 0xac, 0xb1, 0x68, 0x12, 0x10, 0xdb, 0x87, 0xf3, 0x79, 0xcb, - 0x9b, 0xc5, 0xfa, 0xb8, 0xea, 0xc8, 0x2c, 0x8d, 0xf5, 0x71, 0x57, 0xab, 0x98, 0x61, 0x8a, 0xde, - 0x23, 0xb7, 0x7f, 0xa1, 0x04, 0xe5, 0x5a, 0xe8, 0x9e, 0x80, 0x2b, 0xe4, 0xaa, 0xe1, 0x0a, 0x79, - 0x3a, 0xf7, 0xc5, 0xab, 0x9e, 0x8e, 0x8f, 0x5b, 0x19, 0xc7, 0xc7, 0x87, 0xf2, 0x59, 0x1d, 0xee, - 0xe6, 0xf8, 0x6e, 0x19, 0xf4, 0x37, 0xbb, 0xd0, 0xbf, 0x3f, 0x4a, 0x08, 0x68, 0xb9, 0xd8, 0x33, - 0x5e, 0xa2, 0x0e, 0x16, 0x2a, 0x24, 0x2f, 0x8e, 0xfd, 0xcc, 0x46, 0x82, 0xde, 0x25, 0xde, 0xd6, - 0x76, 0x42, 0xdc, 0x6c, 0xc7, 0x4e, 0x2e, 0x12, 0xf4, 0x4f, 0x2c, 0x98, 0xcc, 0xd4, 0x8e, 0xfc, - 0x6e, 0x37, 0x4e, 0x8e, 0xe8, 0xdc, 0x38, 0x95, 0x7b, 0x45, 0x65, 0x0e, 0x40, 0xf9, 0xa8, 0xa5, - 0x0b, 0x82, 0x69, 0x63, 0xca, 0x89, 0x1d, 0x63, 0x8d, 0x02, 0xbd, 0x0c, 0xa3, 0x49, 0xd8, 0x0a, - 0xfd, 0x70, 0x6b, 0xf7, 0x3a, 0x91, 0x19, 0x0e, 0x94, 0x7f, 0x7f, 0x3d, 0x45, 0x61, 0x9d, 0xce, - 0xfe, 0x5e, 0x19, 0xb2, 0x2f, 0xbe, 0xfd, 0xff, 0x79, 0xfa, 0xb3, 0x33, 0x4f, 0x7f, 0xdf, 0x82, - 0x29, 0x5a, 0x3b, 0x0b, 0xf4, 0x90, 0x11, 0x9b, 0x2a, 0x73, 0xbc, 0x75, 0x48, 0xe6, 0xf8, 0x67, - 0xa8, 0xb4, 0x73, 0xc3, 0x76, 0x22, 0x9c, 0x26, 0x9a, 0x10, 0xa3, 0x50, 0x2c, 0xb0, 0x82, 0x8e, - 0x44, 0x91, 0xb8, 0xda, 0xa2, 0xd3, 0x91, 0x28, 0xc2, 0x02, 0x2b, 0x13, 0xcb, 0x0f, 0xf4, 0x48, - 0x2c, 0xcf, 0x72, 0x04, 0x89, 0xe0, 0x02, 0xa1, 0x10, 0x68, 0x39, 0x82, 0x64, 0xd4, 0x41, 0x4a, - 0x63, 0x7f, 0xab, 0x0c, 0x63, 0xb5, 0xd0, 0x4d, 0x43, 0xb1, 0x5f, 0x32, 0x42, 0xb1, 0xcf, 0x67, - 0x42, 0xb1, 0xa7, 0x74, 0xda, 0x87, 0x13, 0x89, 0x2d, 0x72, 0x49, 0xb1, 0xa7, 0x0f, 0x8e, 0x18, - 0x85, 0x6d, 0xe4, 0x92, 0x52, 0x8c, 0xb0, 0xc9, 0xf7, 0xcf, 0x52, 0xf4, 0xf5, 0xff, 0xb6, 0x60, - 0xa2, 0x16, 0xba, 0x74, 0x82, 0xfe, 0x59, 0x9a, 0x8d, 0x7a, 0x06, 0xaa, 0xa1, 0x43, 0x32, 0x50, - 0xfd, 0x13, 0x0b, 0x86, 0x6b, 0xa1, 0x7b, 0x02, 0x0e, 0xc5, 0x15, 0xd3, 0xa1, 0xf8, 0x64, 0xae, - 0xe4, 0xed, 0xe1, 0x43, 0xfc, 0x76, 0x19, 0xc6, 0x69, 0x8b, 0xc3, 0x2d, 0xf9, 0xbd, 0x8c, 0xb1, - 0xb1, 0x0a, 0x8c, 0x0d, 0x55, 0x09, 0x43, 0xdf, 0x0f, 0xef, 0x67, 0xbf, 0xdd, 0x0a, 0x83, 0x62, - 0x81, 0x45, 0x17, 0x61, 0xa4, 0x15, 0x91, 0x1d, 0x2f, 0x6c, 0xc7, 0xd9, 0x6b, 0x72, 0x35, 0x01, - 0xc7, 0x8a, 0x02, 0xbd, 0x04, 0x63, 0xb1, 0x17, 0x34, 0x88, 0x0c, 0x3d, 0x18, 0x60, 0xa1, 0x07, - 0x3c, 0xd9, 0x9f, 0x06, 0xc7, 0x06, 0x15, 0xba, 0x0b, 0x15, 0xf6, 0x9f, 0xad, 0xa0, 0xfe, 0x33, - 0xc3, 0xf3, 0x0c, 0x57, 0x92, 0x01, 0x4e, 0x79, 0xa1, 0xcb, 0x00, 0x89, 0x0c, 0x92, 0x88, 0x45, - 0xa6, 0x0e, 0xa5, 0x97, 0xaa, 0xf0, 0x89, 0x18, 0x6b, 0x54, 0xe8, 0x79, 0xa8, 0x24, 0x8e, 0xe7, - 0xdf, 0xf0, 0x02, 0x12, 0x8b, 0x20, 0x13, 0x91, 0xb8, 0x57, 0x00, 0x71, 0x8a, 0xa7, 0xfb, 0x3d, - 0xbb, 0xa4, 0xcb, 0x5f, 0x9d, 0x18, 0x61, 0xd4, 0x6c, 0xbf, 0xbf, 0xa1, 0xa0, 0x58, 0xa3, 0xb0, - 0xaf, 0xc0, 0xd9, 0x5a, 0xe8, 0xd6, 0xc2, 0x28, 0x59, 0x09, 0xa3, 0xfb, 0x4e, 0xe4, 0xca, 0xef, - 0x37, 0x2b, 0xf3, 0xc5, 0xd2, 0x3d, 0x79, 0x90, 0xfb, 0xd8, 0x8c, 0xfc, 0xaf, 0x2f, 0xb2, 0x1d, - 0xbf, 0xcf, 0x18, 0xff, 0x1f, 0x95, 0x00, 0xd5, 0x58, 0x18, 0x87, 0xf1, 0x48, 0xc9, 0x36, 0x4c, - 0xc4, 0xe4, 0x86, 0x17, 0xb4, 0x1f, 0x08, 0x56, 0xc5, 0x2e, 0x55, 0xd4, 0x97, 0xf5, 0x32, 0xfc, - 0x46, 0xab, 0x09, 0xc3, 0x19, 0xbe, 0x74, 0x30, 0xa3, 0x76, 0xb0, 0x10, 0xdf, 0x8e, 0x49, 0x24, - 0x1e, 0xe5, 0x60, 0x83, 0x89, 0x25, 0x10, 0xa7, 0x78, 0x3a, 0x79, 0xd8, 0x9f, 0x9b, 0x61, 0x80, - 0xc3, 0x30, 0x91, 0xd3, 0x8d, 0x25, 0x69, 0xd7, 0xe0, 0xd8, 0xa0, 0x42, 0x2b, 0x80, 0xe2, 0x76, - 0xab, 0xe5, 0xb3, 0x93, 0x31, 0xc7, 0xbf, 0x1a, 0x85, 0xed, 0x16, 0x8f, 0xe6, 0x15, 0xf9, 0xcd, - 0xeb, 0x1d, 0x58, 0xdc, 0xa5, 0x04, 0x15, 0x16, 0x9b, 0x31, 0xfb, 0x2d, 0x6e, 0xec, 0x72, 0xff, - 0x5c, 0x9d, 0x81, 0xb0, 0xc4, 0xd9, 0x5f, 0x64, 0x1b, 0x1c, 0x7b, 0x2d, 0x21, 0x69, 0x47, 0x04, - 0x35, 0x61, 0xbc, 0xc5, 0x36, 0xb1, 0x24, 0x0a, 0x7d, 0x9f, 0x48, 0xfd, 0xf2, 0x68, 0x81, 0x24, - 0x3c, 0x3f, 0xba, 0xce, 0x0e, 0x9b, 0xdc, 0xed, 0x3f, 0x1c, 0x65, 0xb2, 0x4a, 0x1c, 0x4e, 0x0e, - 0x8b, 0x90, 0x51, 0xa1, 0xc9, 0x7d, 0xb0, 0xc8, 0xbb, 0x47, 0xe9, 0x3e, 0x20, 0x02, 0x50, 0xb1, - 0xe4, 0x82, 0x3e, 0xcb, 0x02, 0xa2, 0xb9, 0x80, 0x28, 0xfe, 0x6c, 0x19, 0xa7, 0x37, 0x82, 0xa1, - 0x05, 0x0b, 0xac, 0xb1, 0x43, 0x37, 0x60, 0x5c, 0x24, 0xd7, 0x17, 0x0e, 0x86, 0xb2, 0x61, 0x62, - 0x8f, 0x63, 0x1d, 0x79, 0x90, 0x05, 0x60, 0xb3, 0x30, 0xda, 0x82, 0x27, 0xb4, 0xc7, 0x63, 0xba, - 0x04, 0x3d, 0x71, 0xc9, 0xf3, 0xe4, 0xfe, 0xde, 0xec, 0x13, 0xeb, 0x87, 0x11, 0xe2, 0xc3, 0xf9, - 0xa0, 0x5b, 0x70, 0xd6, 0x69, 0x24, 0xde, 0x0e, 0xa9, 0x12, 0xc7, 0xf5, 0xbd, 0x80, 0x98, 0xd7, - 0xba, 0x1f, 0xdb, 0xdf, 0x9b, 0x3d, 0xbb, 0xd0, 0x8d, 0x00, 0x77, 0x2f, 0x87, 0x3e, 0x0e, 0x15, - 0x37, 0x88, 0xc5, 0x18, 0x0c, 0x19, 0x6f, 0x25, 0x55, 0xaa, 0x37, 0xeb, 0xaa, 0xff, 0xe9, 0x1f, - 0x9c, 0x16, 0x40, 0xef, 0xf2, 0x47, 0xaf, 0x95, 0x35, 0xc3, 0xdf, 0xe8, 0x7a, 0xa5, 0x90, 0xfd, - 0x6c, 0x5c, 0xb6, 0xe0, 0xbe, 0x37, 0x15, 0x5c, 0x68, 0xdc, 0xc3, 0x30, 0xaa, 0x40, 0x9f, 0x02, - 0x14, 0x93, 0x68, 0xc7, 0x6b, 0x90, 0x85, 0x06, 0xcb, 0x90, 0xc9, 0x0e, 0xf9, 0x46, 0x8c, 0x28, - 0x7b, 0x54, 0xef, 0xa0, 0xc0, 0x5d, 0x4a, 0xa1, 0x6b, 0x54, 0xf2, 0xe8, 0x50, 0x11, 0x0b, 0x2a, - 0x15, 0xc3, 0xe9, 0x2a, 0x69, 0x45, 0xa4, 0xe1, 0x24, 0xc4, 0x35, 0x39, 0xe2, 0x4c, 0x39, 0xba, - 0x2f, 0xa9, 0x24, 0xe8, 0x60, 0x46, 0x30, 0x76, 0x26, 0x42, 0xa7, 0x76, 0xd6, 0x76, 0x18, 0x27, - 0x37, 0x49, 0x72, 0x3f, 0x8c, 0xee, 0x31, 0x9f, 0xfd, 0x88, 0x96, 0x70, 0x2c, 0x45, 0x61, 0x9d, - 0x8e, 0xea, 0x50, 0xec, 0xb0, 0x68, 0xb5, 0xca, 0x3c, 0xf1, 0x23, 0xe9, 0xda, 0xb9, 0xc6, 0xc1, - 0x58, 0xe2, 0x25, 0xe9, 0x6a, 0x6d, 0x89, 0x79, 0xd5, 0x33, 0xa4, 0xab, 0xb5, 0x25, 0x2c, 0xf1, - 0x28, 0xec, 0x7c, 0x91, 0x6a, 0xa2, 0xc8, 0x09, 0x47, 0xa7, 0x24, 0x2f, 0xf8, 0x28, 0xd5, 0x03, - 0x98, 0x52, 0xaf, 0x62, 0xf1, 0x4c, 0x90, 0xf1, 0xf4, 0x64, 0x91, 0x27, 0xb7, 0xbb, 0x26, 0x94, - 0x54, 0xc1, 0xbf, 0xab, 0x19, 0x9e, 0xb8, 0xa3, 0x16, 0x23, 0x3d, 0xc1, 0x54, 0x6e, 0x62, 0xfb, - 0x79, 0xa8, 0xc4, 0xed, 0x0d, 0x37, 0x6c, 0x3a, 0x5e, 0xc0, 0x5c, 0xdf, 0xfa, 0x03, 0xd2, 0x12, - 0x81, 0x53, 0x1a, 0x54, 0x83, 0x11, 0x47, 0xbe, 0x9d, 0x8e, 0x8a, 0x5c, 0x5f, 0x56, 0x8f, 0xa6, - 0x33, 0xbf, 0xa8, 0x7a, 0x2d, 0x5d, 0x71, 0x41, 0xaf, 0xc2, 0xb8, 0xb8, 0x7d, 0x43, 0x22, 0xd6, - 0xea, 0xd3, 0x66, 0xd8, 0x77, 0x5d, 0x22, 0xd9, 0x04, 0x33, 0x69, 0x67, 0x3e, 0x01, 0xa7, 0x3a, - 0x96, 0x58, 0x5f, 0xc1, 0x73, 0xff, 0x76, 0x00, 0x2a, 0xca, 0x43, 0x85, 0xe6, 0x4d, 0x67, 0xe4, - 0x63, 0x59, 0x67, 0xe4, 0x08, 0x55, 0x08, 0x74, 0xff, 0xe3, 0xe7, 0xba, 0x3c, 0x60, 0xfb, 0x5c, - 0xee, 0x9c, 0x2a, 0x7e, 0x9f, 0xa5, 0x8f, 0x67, 0x7e, 0x53, 0x2b, 0x65, 0xe0, 0x50, 0x2b, 0xa5, - 0xe0, 0x5b, 0x55, 0xd4, 0x1e, 0x69, 0x85, 0xee, 0x6a, 0x2d, 0xfb, 0x14, 0x4b, 0x8d, 0x02, 0x31, - 0xc7, 0x31, 0x3d, 0x92, 0xee, 0x11, 0x4c, 0x8f, 0x1c, 0x3e, 0xa2, 0x1e, 0x29, 0x19, 0xe0, 0x94, - 0x17, 0xda, 0x81, 0x53, 0x0d, 0xf3, 0x65, 0x1d, 0x75, 0x4b, 0xe5, 0x85, 0x3e, 0x5e, 0xb6, 0x69, - 0x6b, 0xaf, 0x08, 0x2c, 0x65, 0xf9, 0xe1, 0xce, 0x2a, 0xd0, 0xab, 0x30, 0xf2, 0x6e, 0x18, 0x2f, - 0xf9, 0x4e, 0x1c, 0x0b, 0x41, 0x29, 0x6f, 0x03, 0x8c, 0xbc, 0x7e, 0xab, 0xce, 0xe0, 0x07, 0x7b, - 0xb3, 0xa3, 0xb5, 0xd0, 0x95, 0x7f, 0xb1, 0x2a, 0x60, 0xff, 0x36, 0xf7, 0x86, 0x09, 0xfb, 0x98, - 0xc4, 0x6d, 0xff, 0x24, 0x92, 0x69, 0xdf, 0x32, 0x4c, 0xf7, 0x87, 0xe0, 0x8f, 0xfd, 0x77, 0x16, - 0xf3, 0xc7, 0xae, 0x93, 0x66, 0xcb, 0x77, 0x92, 0x93, 0x08, 0x6b, 0xfc, 0x2c, 0x8c, 0x24, 0xa2, - 0xb6, 0x62, 0x99, 0xc0, 0xb5, 0xe6, 0x31, 0x3f, 0xb5, 0x92, 0x71, 0x12, 0x8a, 0x15, 0x43, 0xfb, - 0x5f, 0xf2, 0xaf, 0x22, 0x31, 0x27, 0x60, 0x74, 0xde, 0x34, 0x8d, 0xce, 0x67, 0x0b, 0xf7, 0xa5, - 0x87, 0xf1, 0xf9, 0x3d, 0xb3, 0x07, 0x4c, 0x15, 0xfd, 0xd9, 0x39, 0x30, 0xb0, 0x6f, 0x81, 0xf9, - 0x02, 0x11, 0x7a, 0x8d, 0x07, 0x0a, 0x73, 0x21, 0x7b, 0xb1, 0xef, 0x20, 0x61, 0xfb, 0xd7, 0x4b, - 0x70, 0x86, 0xbb, 0x0c, 0x17, 0x76, 0x42, 0xcf, 0xad, 0x85, 0xae, 0x08, 0x9b, 0x76, 0x61, 0xac, - 0xa5, 0x99, 0x0a, 0xc5, 0x32, 0x43, 0xe8, 0xc6, 0x45, 0xaa, 0x9e, 0xe9, 0x50, 0x6c, 0x70, 0xa5, - 0xb5, 0x90, 0x1d, 0xaf, 0xa1, 0x3c, 0x50, 0xa5, 0xbe, 0xe5, 0x9e, 0xaa, 0x65, 0x59, 0xe3, 0x83, - 0x0d, 0xae, 0xc7, 0x90, 0xb4, 0xde, 0xfe, 0xfb, 0x16, 0x3c, 0xda, 0x23, 0x7b, 0x04, 0xad, 0xee, - 0x3e, 0x73, 0xd3, 0x8a, 0x27, 0xae, 0x54, 0x75, 0xdc, 0x79, 0x8b, 0x05, 0x16, 0x6d, 0x00, 0x70, - 0xe7, 0x2b, 0x7b, 0xf0, 0xb8, 0x54, 0x24, 0x5a, 0xa2, 0xe3, 0x8e, 0xb6, 0x76, 0x7d, 0x57, 0x3d, - 0x71, 0xac, 0x71, 0xb5, 0xbf, 0x59, 0x86, 0x41, 0xfe, 0x92, 0x6a, 0x0d, 0x86, 0xb7, 0x79, 0x36, - 0xcb, 0xfe, 0x92, 0x69, 0xa6, 0xaa, 0x20, 0x07, 0x60, 0xc9, 0x06, 0xad, 0xc1, 0x69, 0xaa, 0x77, - 0x78, 0x8e, 0x5f, 0x25, 0xbe, 0xb3, 0x2b, 0x6d, 0x0b, 0x9e, 0xc9, 0x5c, 0x26, 0xdd, 0x3d, 0xbd, - 0xda, 0x49, 0x82, 0xbb, 0x95, 0x43, 0xaf, 0x75, 0x24, 0x9f, 0xe2, 0x59, 0x42, 0xd5, 0x8d, 0xaf, - 0xc3, 0x13, 0x50, 0x51, 0xed, 0xa7, 0xd5, 0x61, 0x45, 0x69, 0x0f, 0x56, 0x9a, 0x96, 0x93, 0x49, - 0x8b, 0xaa, 0x30, 0x15, 0xb7, 0xd9, 0xd9, 0xf5, 0xfa, 0x76, 0x44, 0xe2, 0xed, 0xd0, 0x77, 0xc5, - 0x5b, 0x6b, 0x4a, 0x63, 0xac, 0x67, 0xf0, 0xb8, 0xa3, 0x04, 0xe5, 0xb2, 0xe9, 0x78, 0x7e, 0x3b, - 0x22, 0x29, 0x97, 0x21, 0x93, 0xcb, 0x4a, 0x06, 0x8f, 0x3b, 0x4a, 0xd8, 0x7f, 0x6c, 0xc1, 0xe9, - 0x2e, 0x01, 0x1e, 0x3c, 0xec, 0x70, 0xcb, 0x8b, 0x13, 0x95, 0xaf, 0x5a, 0x0b, 0x3b, 0xe4, 0x70, - 0xac, 0x28, 0xe8, 0x2c, 0xe4, 0xa6, 0x71, 0xf6, 0xd8, 0x54, 0x1c, 0x61, 0x0b, 0x6c, 0x7f, 0xa9, - 0xa4, 0xd0, 0x79, 0x18, 0x68, 0xc7, 0x24, 0x92, 0x4f, 0x37, 0x49, 0x11, 0xc5, 0xbc, 0x21, 0x0c, - 0x43, 0x95, 0x9d, 0x2d, 0xe5, 0x88, 0xd0, 0x94, 0x1d, 0xee, 0x8a, 0xe0, 0x38, 0xfb, 0xeb, 0x65, - 0x98, 0xcc, 0x04, 0x7a, 0xd1, 0x86, 0x34, 0xc3, 0xc0, 0x4b, 0x42, 0x95, 0xbe, 0x88, 0xbf, 0x16, - 0x43, 0x5a, 0xdb, 0x6b, 0x02, 0x8e, 0x15, 0x05, 0x7a, 0xc6, 0x7c, 0xd6, 0x3a, 0x6d, 0xf3, 0x62, - 0xd5, 0x78, 0xe1, 0xae, 0x68, 0x0e, 0xfd, 0xa7, 0x60, 0xa0, 0x15, 0xaa, 0xd7, 0x4a, 0xd5, 0xa4, - 0xc7, 0x8b, 0xd5, 0x5a, 0x18, 0xfa, 0x98, 0x21, 0xd1, 0xd3, 0xa2, 0xf7, 0x19, 0xff, 0x2d, 0x76, - 0xdc, 0x30, 0xd6, 0x86, 0xe0, 0x59, 0x18, 0xbe, 0x47, 0x76, 0x23, 0x2f, 0xd8, 0xca, 0x7a, 0xaf, - 0xaf, 0x73, 0x30, 0x96, 0x78, 0x33, 0x4f, 0xfe, 0xf0, 0x31, 0xe7, 0xc9, 0x1f, 0xc9, 0x8d, 0x55, - 0xfd, 0xb6, 0x05, 0x93, 0x2c, 0xa7, 0x9f, 0xb8, 0x4e, 0xeb, 0x85, 0xc1, 0x09, 0x6c, 0x8f, 0x4f, - 0xc1, 0x60, 0x44, 0x2b, 0xcd, 0xa6, 0xba, 0x66, 0x2d, 0xc1, 0x1c, 0x87, 0x1e, 0x87, 0x01, 0xd6, - 0x04, 0xfa, 0x19, 0xc7, 0x78, 0xea, 0xe0, 0xaa, 0x93, 0x38, 0x98, 0x41, 0xd9, 0xcd, 0x08, 0x4c, - 0x5a, 0xbe, 0xc7, 0x1b, 0x9d, 0x3a, 0x9d, 0xde, 0x6f, 0x37, 0x23, 0xba, 0x36, 0xf2, 0x61, 0xdd, - 0x8c, 0xe8, 0xce, 0xfc, 0x70, 0x15, 0xf5, 0x7f, 0x94, 0xe0, 0x5c, 0xd7, 0x72, 0xe9, 0x39, 0xd8, - 0x8a, 0x71, 0x0e, 0x76, 0x39, 0x73, 0x0e, 0x66, 0x1f, 0x5e, 0xfa, 0xe1, 0x9c, 0x8c, 0x75, 0x3f, - 0xb0, 0x2a, 0x9f, 0xe0, 0x81, 0xd5, 0x40, 0x51, 0xd5, 0x61, 0x30, 0x47, 0x75, 0xf8, 0x3d, 0x0b, - 0x1e, 0xeb, 0x3a, 0x64, 0xef, 0xbb, 0xab, 0x28, 0x5d, 0x5b, 0xd9, 0x43, 0xb1, 0xfe, 0xe5, 0x72, - 0x8f, 0x5e, 0x31, 0x15, 0xfb, 0x02, 0x95, 0x42, 0x0c, 0x19, 0x0b, 0xa5, 0x68, 0x8c, 0x4b, 0x20, - 0x0e, 0xc3, 0x0a, 0x8b, 0x62, 0xed, 0x2a, 0x07, 0x6f, 0xe4, 0xf2, 0x11, 0x17, 0xd4, 0x9c, 0xe9, - 0x2d, 0xd4, 0xef, 0x08, 0x67, 0x2e, 0x78, 0xa0, 0xbb, 0x9a, 0xd1, 0x54, 0x3e, 0x8a, 0xd1, 0x34, - 0xd6, 0xdd, 0x60, 0x42, 0x0b, 0x30, 0xd9, 0xf4, 0x02, 0xf6, 0xbc, 0x9e, 0xa9, 0x95, 0xa8, 0xfb, - 0x74, 0x6b, 0x26, 0x1a, 0x67, 0xe9, 0x67, 0x5e, 0x85, 0xf1, 0xa3, 0xfb, 0x64, 0x7e, 0x5c, 0x86, - 0x9f, 0x3b, 0x44, 0x28, 0xf0, 0xdd, 0xc1, 0xf8, 0x2e, 0xda, 0xee, 0xd0, 0xf1, 0x6d, 0x6a, 0x70, - 0x66, 0xb3, 0xed, 0xfb, 0xbb, 0x2c, 0x8a, 0x84, 0xb8, 0x92, 0x42, 0x68, 0x7c, 0xea, 0xe1, 0xdb, - 0x95, 0x2e, 0x34, 0xb8, 0x6b, 0x49, 0xf4, 0x29, 0x40, 0xe1, 0x06, 0xcb, 0x7a, 0xe9, 0xa6, 0x77, - 0xa0, 0xd9, 0x27, 0x28, 0xa7, 0x4b, 0xf5, 0x56, 0x07, 0x05, 0xee, 0x52, 0x8a, 0xea, 0x7f, 0xec, - 0xcd, 0x5c, 0xd5, 0xac, 0x8c, 0xfe, 0x87, 0x75, 0x24, 0x36, 0x69, 0xd1, 0x55, 0x38, 0xe5, 0xec, - 0x38, 0x1e, 0xcf, 0x62, 0x23, 0x19, 0x70, 0x05, 0x50, 0x79, 0x3d, 0x16, 0xb2, 0x04, 0xb8, 0xb3, - 0x0c, 0x6a, 0x19, 0x6e, 0x2c, 0x9e, 0xef, 0xfa, 0xe3, 0x47, 0x98, 0xc1, 0x85, 0x1d, 0x5b, 0xf6, - 0x7f, 0xb5, 0xe8, 0xd6, 0xd7, 0xe5, 0x25, 0x36, 0xe3, 0x09, 0x77, 0xed, 0x72, 0x4b, 0xe7, 0x13, - 0xee, 0xdc, 0x1f, 0x68, 0xd0, 0xf2, 0xa9, 0x11, 0xa7, 0xe1, 0xa8, 0x86, 0xb6, 0x29, 0x6e, 0x75, - 0x29, 0x0a, 0xf4, 0x69, 0x18, 0x76, 0xbd, 0x1d, 0x2f, 0x0e, 0x23, 0xb1, 0x80, 0xfa, 0x0c, 0x71, - 0x4c, 0xe5, 0x65, 0x95, 0xb3, 0xc1, 0x92, 0x9f, 0xfd, 0x2b, 0x25, 0x18, 0x97, 0x35, 0xbe, 0xde, - 0x0e, 0x13, 0xe7, 0x04, 0xb6, 0xf4, 0xd7, 0x8d, 0x2d, 0x7d, 0xbe, 0xd8, 0x25, 0x37, 0xd6, 0xb8, - 0x9e, 0x5b, 0xf9, 0xa7, 0x33, 0x5b, 0xf9, 0xa5, 0x7e, 0x98, 0x1e, 0xbe, 0x85, 0xff, 0x6b, 0x0b, - 0x4e, 0x19, 0xf4, 0x27, 0xb0, 0x93, 0xd4, 0xcc, 0x9d, 0xe4, 0xf9, 0x3e, 0x7a, 0xd3, 0x63, 0x07, - 0xf9, 0x56, 0x29, 0xd3, 0x0b, 0xb6, 0x73, 0x7c, 0x01, 0x06, 0xb6, 0x9d, 0xc8, 0x2d, 0x96, 0xd2, - 0xad, 0xa3, 0xf8, 0xdc, 0x35, 0x27, 0x72, 0xb9, 0xfc, 0xbf, 0xa8, 0x5e, 0x8a, 0x71, 0x22, 0x37, - 0x37, 0x4a, 0x9b, 0x55, 0x8a, 0xae, 0xc0, 0x50, 0xdc, 0x08, 0x5b, 0x2a, 0x1a, 0xee, 0x3c, 0x7f, - 0x45, 0x86, 0x42, 0x0e, 0xf6, 0x66, 0x91, 0x59, 0x1d, 0x05, 0x63, 0x41, 0x3f, 0xb3, 0x05, 0x15, - 0x55, 0xf5, 0xb1, 0xc6, 0x03, 0xff, 0xf7, 0x32, 0x9c, 0xee, 0x32, 0x57, 0xd0, 0x17, 0x8d, 0x71, - 0x7b, 0xb5, 0xef, 0xc9, 0xf6, 0x1e, 0x47, 0xee, 0x8b, 0xcc, 0x52, 0x72, 0xc5, 0xec, 0x38, 0x42, - 0xf5, 0xb7, 0x63, 0x92, 0xad, 0x9e, 0x82, 0xf2, 0xab, 0xa7, 0xd5, 0x9e, 0xd8, 0xf0, 0xd3, 0x8a, - 0x54, 0x4b, 0x8f, 0xf5, 0x3b, 0xff, 0xc5, 0x01, 0x38, 0xd3, 0xed, 0x36, 0x2d, 0xfa, 0x8a, 0x95, - 0xc9, 0xdb, 0xfe, 0x5a, 0xff, 0x57, 0x72, 0x79, 0x32, 0x77, 0x91, 0x81, 0x62, 0xce, 0xcc, 0xe4, - 0x9e, 0x3b, 0xe2, 0xa2, 0x76, 0x76, 0xbf, 0x22, 0xe2, 0x39, 0xf8, 0xa5, 0x54, 0xf8, 0xe4, 0x11, - 0x9a, 0x22, 0xd2, 0xf8, 0xc7, 0x99, 0xfb, 0x15, 0x12, 0x9c, 0x7f, 0xbf, 0x42, 0xb6, 0x61, 0xc6, - 0x83, 0x51, 0xad, 0x5f, 0xc7, 0x3a, 0x0d, 0xee, 0xd1, 0x2d, 0x4a, 0x6b, 0xf7, 0xb1, 0x4e, 0x85, - 0xbf, 0x65, 0x41, 0x26, 0x74, 0x45, 0xb9, 0x65, 0xac, 0x9e, 0x6e, 0x99, 0xf3, 0x30, 0x10, 0x85, - 0x3e, 0xc9, 0xe6, 0x14, 0xc7, 0xa1, 0x4f, 0x30, 0xc3, 0xa8, 0xa7, 0x23, 0xcb, 0xbd, 0x9e, 0x8e, - 0xa4, 0x76, 0xba, 0x4f, 0x76, 0x88, 0x74, 0x92, 0x28, 0x31, 0x7e, 0x83, 0x02, 0x31, 0xc7, 0xd9, - 0xbf, 0x5b, 0x86, 0x21, 0xee, 0x89, 0x38, 0x81, 0x7d, 0xba, 0x26, 0x9c, 0x02, 0x85, 0xee, 0xb8, - 0xf2, 0x56, 0xcd, 0x55, 0x9d, 0xc4, 0xe1, 0x93, 0x4b, 0xf5, 0x31, 0x75, 0x24, 0xa0, 0x39, 0x63, - 0x14, 0x66, 0x32, 0xb6, 0x2e, 0x70, 0x1e, 0xda, 0x98, 0x6c, 0x03, 0xc4, 0xec, 0xb1, 0x32, 0xca, - 0x43, 0xe4, 0xe1, 0x7b, 0xa9, 0x50, 0x3b, 0xea, 0xaa, 0x18, 0x6f, 0x4d, 0x9a, 0xfc, 0x4b, 0x21, - 0xb0, 0xc6, 0x7b, 0xe6, 0x15, 0xa8, 0x28, 0xe2, 0x3c, 0x23, 0x60, 0x4c, 0x9f, 0x9c, 0x7f, 0x0e, - 0x26, 0x33, 0x75, 0xf5, 0x65, 0x43, 0xfc, 0x96, 0x05, 0x93, 0x99, 0x57, 0x96, 0xd1, 0x97, 0x2d, - 0x38, 0xe3, 0x77, 0x71, 0x44, 0x89, 0xcf, 0x7c, 0x14, 0x17, 0x96, 0x32, 0x1f, 0xba, 0x61, 0x71, - 0xd7, 0xda, 0xa8, 0x59, 0xc9, 0x5f, 0x5e, 0x74, 0x7c, 0x11, 0x09, 0x38, 0xc6, 0x93, 0x86, 0x72, - 0x18, 0x56, 0x58, 0xfb, 0x27, 0x16, 0x9c, 0xea, 0x78, 0xc8, 0xf7, 0xfd, 0xd2, 0x0d, 0x91, 0x1e, - 0xb5, 0xd4, 0x23, 0x3d, 0xaa, 0xde, 0xcb, 0xf2, 0xa1, 0xbd, 0xfc, 0x75, 0x0b, 0xc4, 0x0c, 0x3d, - 0x01, 0x0d, 0x70, 0xd5, 0xd4, 0x00, 0x3f, 0x58, 0x64, 0xd2, 0xf7, 0x50, 0xfd, 0xfe, 0xd4, 0x02, - 0xc4, 0x09, 0xb2, 0x4f, 0x34, 0x72, 0x47, 0xa6, 0x66, 0xbc, 0xa4, 0xab, 0x44, 0x61, 0xb0, 0x46, - 0xd5, 0x67, 0x96, 0x7d, 0xf5, 0xb4, 0x59, 0xf7, 0x86, 0xa1, 0x4b, 0x30, 0x2a, 0x9e, 0x36, 0x5a, - 0x4b, 0x9f, 0x2d, 0x9b, 0x64, 0x0f, 0x68, 0xa6, 0x60, 0xac, 0xd3, 0x18, 0x5f, 0x6b, 0xe0, 0xd0, - 0xaf, 0xf5, 0xdb, 0x65, 0xc8, 0x86, 0xbf, 0xa0, 0xb7, 0x61, 0xac, 0xe1, 0xb4, 0x9c, 0x0d, 0xcf, - 0xf7, 0x12, 0x8f, 0xc4, 0xc5, 0x8e, 0xdd, 0x96, 0xb4, 0x12, 0xc2, 0x69, 0xae, 0x41, 0xb0, 0xc1, - 0x11, 0xcd, 0x01, 0xb4, 0x22, 0x6f, 0xc7, 0xf3, 0xc9, 0x16, 0xd3, 0xcf, 0x58, 0xfc, 0x2c, 0x3f, - 0x41, 0x92, 0x50, 0xac, 0x51, 0x74, 0x89, 0xb7, 0x2c, 0x9f, 0x44, 0xbc, 0xe5, 0x40, 0x9f, 0xf1, - 0x96, 0x83, 0x85, 0xe2, 0x2d, 0x31, 0x3c, 0x22, 0x7d, 0xdd, 0xf4, 0xff, 0x8a, 0xe7, 0x13, 0x9e, - 0x5e, 0x51, 0xc4, 0xd7, 0xce, 0xec, 0xef, 0xcd, 0x3e, 0x82, 0xbb, 0x52, 0xe0, 0x1e, 0x25, 0xed, - 0x36, 0x9c, 0xae, 0x93, 0xc8, 0x63, 0x59, 0xaf, 0xdc, 0x74, 0x51, 0x7f, 0x0e, 0x2a, 0x51, 0x46, - 0x9e, 0xf4, 0x79, 0xfd, 0x51, 0xcb, 0x93, 0x22, 0xe5, 0x47, 0xca, 0xd2, 0xfe, 0x2b, 0x25, 0x18, - 0x16, 0x61, 0x66, 0x27, 0xb0, 0xd1, 0x5e, 0x37, 0x0c, 0xe2, 0x67, 0xf3, 0xd6, 0x3a, 0x6b, 0x56, - 0x4f, 0x53, 0xb8, 0x9e, 0x31, 0x85, 0x9f, 0x2f, 0xc6, 0xee, 0x70, 0x23, 0xf8, 0x07, 0x25, 0x98, - 0x30, 0xc3, 0xee, 0x4e, 0x60, 0x58, 0xde, 0x80, 0xe1, 0x58, 0xc4, 0xa4, 0x95, 0x8a, 0x44, 0xd4, - 0x64, 0x3f, 0xb1, 0xf2, 0x7a, 0xc8, 0x28, 0x34, 0xc9, 0xae, 0x6b, 0xd8, 0x5b, 0xf9, 0x24, 0xc2, - 0xde, 0xec, 0xef, 0x33, 0x61, 0xac, 0x0f, 0xe4, 0x09, 0x6c, 0x26, 0xaf, 0x9b, 0x62, 0xfb, 0x62, - 0xa1, 0x19, 0x21, 0x9a, 0xd7, 0x63, 0x53, 0xf9, 0x8e, 0x05, 0xa3, 0x82, 0xf0, 0x04, 0x3a, 0xf0, - 0x29, 0xb3, 0x03, 0x4f, 0x17, 0xea, 0x40, 0x8f, 0x96, 0xff, 0x9d, 0x92, 0x6a, 0x79, 0x4d, 0x3c, - 0x79, 0x9b, 0x9b, 0x7d, 0x73, 0xa4, 0x15, 0x85, 0x49, 0xd8, 0x08, 0x7d, 0xa1, 0x46, 0x3c, 0x9e, - 0x5e, 0x74, 0xe0, 0xf0, 0x03, 0xed, 0x37, 0x56, 0xd4, 0x2c, 0x0e, 0x3f, 0x8c, 0x12, 0xb1, 0xb5, - 0x75, 0x7b, 0x70, 0x77, 0x43, 0x3e, 0x68, 0x4e, 0x61, 0xe2, 0x8e, 0x50, 0xbf, 0x0f, 0xf9, 0xa6, - 0xf7, 0x16, 0x14, 0x27, 0xac, 0x71, 0x95, 0x01, 0xb1, 0xac, 0x86, 0x41, 0xd3, 0x0f, 0x7d, 0x53, - 0xc0, 0xb1, 0xa2, 0xb0, 0x5f, 0x61, 0x12, 0x97, 0x0d, 0x4f, 0x7f, 0x57, 0x0a, 0xfe, 0xf2, 0x90, - 0x1a, 0x58, 0xe6, 0x5c, 0xba, 0xa9, 0x5f, 0x5c, 0x28, 0x2a, 0xd6, 0x68, 0x13, 0xf4, 0x18, 0xbe, - 0xf4, 0x9e, 0x03, 0x22, 0x1d, 0x87, 0x17, 0xaf, 0x14, 0x96, 0x94, 0x7d, 0x1c, 0x57, 0xb0, 0x84, - 0x45, 0x2c, 0x4b, 0xcb, 0x6a, 0x2d, 0x9b, 0x31, 0x75, 0x49, 0x22, 0x70, 0x4a, 0x83, 0xe6, 0x85, - 0x51, 0x63, 0xbe, 0x87, 0x2c, 0x8d, 0x1a, 0x39, 0x24, 0x9a, 0x55, 0x73, 0x09, 0x46, 0x55, 0xde, - 0xf8, 0x1a, 0x4f, 0xff, 0x5d, 0xe1, 0x7a, 0xcf, 0x72, 0x0a, 0xc6, 0x3a, 0x0d, 0x5a, 0x85, 0xd3, - 0xae, 0x8a, 0x7f, 0xae, 0xb5, 0x37, 0x7c, 0xaf, 0x41, 0x8b, 0xf2, 0xbb, 0x4b, 0x8f, 0xee, 0xef, - 0xcd, 0x9e, 0xae, 0x76, 0xa2, 0x71, 0xb7, 0x32, 0x68, 0x1d, 0x26, 0x63, 0x9e, 0x1f, 0x5f, 0x06, - 0xb9, 0x8a, 0x44, 0x82, 0xcf, 0xc9, 0x53, 0x93, 0xba, 0x89, 0x3e, 0x60, 0x20, 0x2e, 0x13, 0x64, - 0x58, 0x6c, 0x96, 0x05, 0x7a, 0x0d, 0x26, 0x7c, 0xfd, 0xf1, 0xaf, 0x9a, 0x08, 0x03, 0x57, 0xf1, - 0x25, 0xc6, 0xd3, 0x60, 0x35, 0x9c, 0xa1, 0x46, 0x6f, 0xc0, 0xb4, 0x0e, 0x11, 0xd9, 0x14, 0x9c, - 0x60, 0x8b, 0xc4, 0x22, 0x31, 0xf7, 0xe3, 0xfb, 0x7b, 0xb3, 0xd3, 0x37, 0x7a, 0xd0, 0xe0, 0x9e, - 0xa5, 0xd1, 0x15, 0x18, 0x93, 0x23, 0xa9, 0x85, 0x84, 0xa7, 0x91, 0x4d, 0x1a, 0x0e, 0x1b, 0x94, - 0xef, 0xed, 0x70, 0xe8, 0x0b, 0xb4, 0xb0, 0xb6, 0xb5, 0xa2, 0x77, 0x60, 0x4c, 0x6f, 0x63, 0x76, - 0xcf, 0xcc, 0x7f, 0x50, 0x4d, 0x6c, 0xd1, 0xaa, 0xe5, 0x3a, 0x0e, 0x1b, 0xbc, 0xed, 0x5b, 0x30, - 0x54, 0xdf, 0x8d, 0x1b, 0x89, 0xff, 0xb0, 0x9e, 0xc2, 0x6e, 0xc0, 0x64, 0xe6, 0xcd, 0x68, 0xf5, - 0xf8, 0xb8, 0xf5, 0xb0, 0x1e, 0x1f, 0xb7, 0xff, 0xc8, 0x82, 0xc1, 0x75, 0xc7, 0xcb, 0x7f, 0xd2, - 0xa2, 0x48, 0x93, 0xd1, 0xcb, 0x30, 0x44, 0x36, 0x37, 0x49, 0x43, 0x3e, 0x66, 0xfe, 0x84, 0x54, - 0x6d, 0x96, 0x19, 0x94, 0x2e, 0x4d, 0x56, 0x19, 0xff, 0x8b, 0x05, 0x31, 0xfa, 0x2c, 0x54, 0x12, - 0xaf, 0x49, 0x16, 0x5c, 0x97, 0xb8, 0x47, 0xb8, 0xb3, 0xa9, 0x44, 0xc5, 0xba, 0x64, 0x82, 0x53, - 0x7e, 0xf6, 0xd7, 0x4a, 0x00, 0xeb, 0xa1, 0x2f, 0x0f, 0xd5, 0x72, 0xba, 0xb9, 0xd8, 0xf1, 0x72, - 0xc7, 0x33, 0x5d, 0x5e, 0xee, 0x40, 0x29, 0xc3, 0x2e, 0xef, 0x76, 0xa8, 0xa1, 0x2a, 0x17, 0x1a, - 0xaa, 0x81, 0x7e, 0x86, 0x6a, 0x09, 0x4e, 0x25, 0xaa, 0x6e, 0xf3, 0xf2, 0x0b, 0x4b, 0x2b, 0xb6, - 0x9e, 0x45, 0xe2, 0x4e, 0x7a, 0xfb, 0x6b, 0x16, 0x88, 0xa0, 0xa9, 0x02, 0x73, 0xd5, 0x95, 0x29, - 0xfb, 0x8d, 0x4c, 0x2e, 0xcf, 0x15, 0xb9, 0xdc, 0x24, 0xf2, 0xb7, 0xa8, 0xd5, 0x63, 0x64, 0x6d, - 0x31, 0xb8, 0xda, 0xbf, 0x61, 0xc1, 0x28, 0x47, 0xaf, 0x31, 0x4d, 0x37, 0xbf, 0x5d, 0x7d, 0xe5, - 0xac, 0x63, 0xd9, 0xec, 0x29, 0x63, 0x95, 0xbb, 0x4c, 0xcf, 0x66, 0x2f, 0x11, 0x38, 0xa5, 0x41, - 0xcf, 0xc2, 0x70, 0xdc, 0xde, 0x60, 0xe4, 0x99, 0x08, 0xaa, 0x3a, 0x07, 0x63, 0x89, 0xb7, 0x7f, - 0x11, 0x81, 0xd1, 0x35, 0x23, 0x4f, 0x9a, 0xf5, 0xd0, 0xf3, 0xa4, 0xbd, 0x09, 0x23, 0xa4, 0xd9, - 0x4a, 0x76, 0xab, 0x5e, 0x54, 0x2c, 0x67, 0xe5, 0xb2, 0xa0, 0xee, 0xe4, 0x2e, 0x31, 0x58, 0x71, - 0xec, 0x91, 0xf5, 0xae, 0xfc, 0xbe, 0xc8, 0x7a, 0x37, 0xf0, 0x53, 0xc9, 0x7a, 0xf7, 0x06, 0x0c, - 0x6f, 0x79, 0x09, 0x26, 0xad, 0x50, 0xdc, 0x86, 0xcd, 0x39, 0xe8, 0xbc, 0xca, 0x89, 0x3b, 0x53, - 0x59, 0x09, 0x04, 0x96, 0xec, 0xd0, 0x3a, 0x0c, 0x71, 0xeb, 0x48, 0x24, 0x92, 0xfb, 0x70, 0x11, - 0x8f, 0x53, 0x67, 0x4e, 0x35, 0x11, 0x26, 0x27, 0x78, 0xc9, 0x2c, 0x77, 0xc3, 0xef, 0x3d, 0xcb, - 0x9d, 0xca, 0x4d, 0x37, 0xf2, 0xb0, 0x72, 0xd3, 0x19, 0x39, 0xfe, 0x2a, 0xc7, 0x91, 0xe3, 0xef, - 0x6b, 0x16, 0x9c, 0x6d, 0x75, 0xcb, 0x90, 0x29, 0xb2, 0xcc, 0x7d, 0xe2, 0x08, 0x39, 0x43, 0x8d, - 0xaa, 0xd9, 0x1d, 0xc3, 0xae, 0x64, 0xb8, 0x7b, 0xc5, 0x32, 0x59, 0xe0, 0xe8, 0x7b, 0x4f, 0x16, - 0x78, 0xdc, 0xe9, 0xe8, 0xd2, 0xd4, 0x81, 0xe3, 0xc7, 0x92, 0x3a, 0x70, 0xe2, 0x21, 0xa6, 0x0e, - 0xd4, 0x92, 0xfe, 0x4d, 0x3e, 0xdc, 0xa4, 0x7f, 0xdb, 0x30, 0xea, 0x86, 0xf7, 0x83, 0xfb, 0x4e, - 0xe4, 0x2e, 0xd4, 0x56, 0x45, 0x8e, 0xb9, 0x9c, 0x34, 0x26, 0xd5, 0xb4, 0x80, 0x51, 0x03, 0x77, - 0xad, 0xa6, 0x48, 0xac, 0xb3, 0x16, 0xe9, 0x0f, 0x4f, 0xbd, 0xc7, 0xf4, 0x87, 0x46, 0x12, 0x41, - 0x74, 0x1c, 0x49, 0x04, 0xdf, 0x66, 0xf9, 0x0c, 0x36, 0xbd, 0xad, 0x35, 0xa7, 0xc5, 0xee, 0xe0, - 0xe5, 0xd6, 0xb0, 0x24, 0xc9, 0x3b, 0x6b, 0x50, 0x28, 0x9c, 0x32, 0xed, 0x4c, 0x53, 0x78, 0xe6, - 0xa4, 0xd3, 0x14, 0x9e, 0x3d, 0xc6, 0x34, 0x85, 0x8f, 0x9c, 0x68, 0x9a, 0xc2, 0x47, 0x7f, 0x2a, - 0x69, 0x0a, 0xff, 0x02, 0x9c, 0x3b, 0xfc, 0x73, 0xa4, 0x89, 0xb0, 0x6b, 0xa9, 0x53, 0x23, 0x93, - 0x08, 0x9b, 0xa9, 0x3a, 0x1a, 0x55, 0xe1, 0x5c, 0x69, 0xdf, 0xb2, 0xe0, 0xd1, 0x1e, 0xa9, 0x84, - 0x0a, 0x5f, 0x5f, 0x69, 0xc1, 0x64, 0xcb, 0x2c, 0x5a, 0xf8, 0xc2, 0x99, 0x91, 0xba, 0x48, 0x85, - 0x42, 0x66, 0x10, 0x38, 0xcb, 0x7e, 0xf1, 0x83, 0x3f, 0xfc, 0xf1, 0xb9, 0x0f, 0xfc, 0xe8, 0xc7, - 0xe7, 0x3e, 0xf0, 0x07, 0x3f, 0x3e, 0xf7, 0x81, 0x9f, 0xdf, 0x3f, 0x67, 0xfd, 0x70, 0xff, 0x9c, - 0xf5, 0xa3, 0xfd, 0x73, 0xd6, 0x1f, 0xef, 0x9f, 0xb3, 0xbe, 0xf6, 0x93, 0x73, 0x1f, 0xf8, 0x4c, - 0x69, 0xe7, 0xd2, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xde, 0xa0, 0xf7, 0xc5, 0xbb, 0x00, - 0x00, + 0x95, 0x98, 0x7b, 0x86, 0x5f, 0xf3, 0xf8, 0xb9, 0xb5, 0x1f, 0xa2, 0x68, 0x69, 0xb9, 0x6a, 0x59, + 0xf2, 0x4a, 0x5a, 0x91, 0xde, 0x95, 0x64, 0xad, 0x2d, 0x47, 0x36, 0xc9, 0x21, 0x77, 0xe9, 0xfd, + 0x1a, 0xd5, 0x70, 0x77, 0x65, 0x5b, 0xb1, 0xd4, 0x9c, 0x2e, 0x92, 0xad, 0xed, 0xe9, 0x1e, 0x75, + 0xf7, 0x70, 0x97, 0x76, 0x0c, 0xdc, 0xf9, 0x0c, 0x5f, 0x82, 0x38, 0x89, 0x83, 0x83, 0x81, 0x20, + 0x09, 0xe0, 0x4b, 0x80, 0x04, 0x4e, 0x0e, 0x41, 0xe2, 0x18, 0x67, 0xfb, 0x10, 0x5f, 0x82, 0x5c, + 0xce, 0x8e, 0x2f, 0x48, 0x0e, 0x06, 0x0e, 0xc9, 0x5d, 0x72, 0x09, 0xef, 0x44, 0x27, 0xf7, 0x33, + 0x3f, 0x72, 0xff, 0x98, 0x20, 0x09, 0xea, 0xb3, 0xab, 0x7a, 0x66, 0xd8, 0x3d, 0xd4, 0x92, 0x96, + 0x0f, 0xf7, 0x6f, 0xe6, 0xbd, 0x57, 0xaf, 0x3e, 0xba, 0xea, 0xd5, 0x7b, 0xaf, 0x5e, 0xbd, 0x82, + 0x0b, 0xf7, 0x2e, 0xc7, 0x73, 0x5e, 0x38, 0x7f, 0xaf, 0xbd, 0x4e, 0xa2, 0x80, 0x24, 0x24, 0x9e, + 0x6f, 0xdd, 0xdb, 0x9c, 0x77, 0x5a, 0xde, 0xfc, 0xf6, 0xc5, 0xf9, 0x4d, 0x12, 0x90, 0xc8, 0x49, + 0x88, 0x3b, 0xd7, 0x8a, 0xc2, 0x24, 0x44, 0x8f, 0x71, 0xea, 0xb9, 0x94, 0x7a, 0xae, 0x75, 0x6f, + 0x73, 0xce, 0x69, 0x79, 0x73, 0xdb, 0x17, 0x67, 0x9e, 0xdf, 0xf4, 0x92, 0xad, 0xf6, 0xfa, 0x5c, + 0x23, 0x6c, 0xce, 0x6f, 0x86, 0x9b, 0xe1, 0x3c, 0x2b, 0xb4, 0xde, 0xde, 0x60, 0xff, 0xd8, 0x1f, + 0xf6, 0x8b, 0x33, 0x9b, 0x79, 0x51, 0x54, 0xed, 0xb4, 0xbc, 0xa6, 0xd3, 0xd8, 0xf2, 0x02, 0x12, + 0xed, 0xa8, 0xca, 0x23, 0x12, 0x87, 0xed, 0xa8, 0x41, 0xb2, 0x4d, 0x38, 0xb0, 0x54, 0x3c, 0xdf, + 0x24, 0x89, 0xd3, 0xa5, 0xe1, 0x33, 0xf3, 0xbd, 0x4a, 0x45, 0xed, 0x20, 0xf1, 0x9a, 0x9d, 0xd5, + 0x7c, 0x34, 0xaf, 0x40, 0xdc, 0xd8, 0x22, 0x4d, 0xa7, 0xa3, 0xdc, 0x0b, 0xbd, 0xca, 0xb5, 0x13, + 0xcf, 0x9f, 0xf7, 0x82, 0x24, 0x4e, 0xa2, 0x6c, 0x21, 0xfb, 0xf7, 0x2d, 0x38, 0xb7, 0x70, 0xb7, + 0xbe, 0xec, 0x3b, 0x71, 0xe2, 0x35, 0x16, 0xfd, 0xb0, 0x71, 0xaf, 0x9e, 0x84, 0x11, 0xb9, 0x13, + 0xfa, 0xed, 0x26, 0xa9, 0xb3, 0x81, 0x40, 0x17, 0x60, 0x64, 0x9b, 0xfd, 0x5f, 0xad, 0x4e, 0x5b, + 0xe7, 0xac, 0xf3, 0x95, 0xc5, 0xa9, 0x1f, 0xef, 0xce, 0x7e, 0x60, 0x6f, 0x77, 0x76, 0xe4, 0x8e, + 0x80, 0x63, 0x45, 0x81, 0x9e, 0x86, 0xa1, 0x8d, 0x78, 0x6d, 0xa7, 0x45, 0xa6, 0x4b, 0x8c, 0x76, + 0x42, 0xd0, 0x0e, 0xad, 0xd4, 0x29, 0x14, 0x0b, 0x2c, 0x9a, 0x87, 0x4a, 0xcb, 0x89, 0x12, 0x2f, + 0xf1, 0xc2, 0x60, 0xba, 0x7c, 0xce, 0x3a, 0x3f, 0xb8, 0x78, 0x42, 0x90, 0x56, 0x6a, 0x12, 0x81, + 0x53, 0x1a, 0xda, 0x8c, 0x88, 0x38, 0xee, 0xad, 0xc0, 0xdf, 0x99, 0x1e, 0x38, 0x67, 0x9d, 0x1f, + 0x49, 0x9b, 0x81, 0x05, 0x1c, 0x2b, 0x0a, 0xfb, 0xfb, 0x25, 0x18, 0x59, 0xd8, 0xd8, 0xf0, 0x02, + 0x2f, 0xd9, 0x41, 0x6f, 0xc1, 0x58, 0x10, 0xba, 0x44, 0xfe, 0x67, 0xbd, 0x18, 0xbd, 0xf4, 0xec, + 0xdc, 0x41, 0x93, 0x6a, 0xee, 0xa6, 0x56, 0x62, 0x71, 0x6a, 0x6f, 0x77, 0x76, 0x4c, 0x87, 0x60, + 0x83, 0x23, 0x7a, 0x03, 0x46, 0x5b, 0xa1, 0xab, 0x2a, 0x28, 0xb1, 0x0a, 0x9e, 0x39, 0xb8, 0x82, + 0x5a, 0x5a, 0x60, 0x71, 0x72, 0x6f, 0x77, 0x76, 0x54, 0x03, 0x60, 0x9d, 0x1d, 0xf2, 0x61, 0x92, + 0xfe, 0x0d, 0x12, 0x4f, 0xd5, 0x50, 0x66, 0x35, 0x3c, 0x9f, 0x5f, 0x83, 0x56, 0x68, 0xf1, 0xe4, + 0xde, 0xee, 0xec, 0x64, 0x06, 0x88, 0xb3, 0xac, 0xed, 0x2f, 0xc0, 0xc4, 0x42, 0x92, 0x38, 0x8d, + 0x2d, 0xe2, 0xf2, 0xef, 0x8b, 0x5e, 0x84, 0x81, 0xc0, 0x69, 0x12, 0xf1, 0xf5, 0xcf, 0x89, 0x61, + 0x1f, 0xb8, 0xe9, 0x34, 0xc9, 0xfe, 0xee, 0xec, 0xd4, 0xed, 0xc0, 0x7b, 0xa7, 0x2d, 0xe6, 0x0c, + 0x85, 0x61, 0x46, 0x8d, 0x2e, 0x01, 0xb8, 0x64, 0xdb, 0x6b, 0x90, 0x9a, 0x93, 0x6c, 0x89, 0xd9, + 0x80, 0x44, 0x59, 0xa8, 0x2a, 0x0c, 0xd6, 0xa8, 0xec, 0x2f, 0x5b, 0x50, 0x59, 0xd8, 0x0e, 0x3d, + 0xb7, 0x16, 0xba, 0x31, 0x6a, 0xc3, 0x64, 0x2b, 0x22, 0x1b, 0x24, 0x52, 0xa0, 0x69, 0xeb, 0x5c, + 0xf9, 0xfc, 0xe8, 0xa5, 0x4b, 0x39, 0xfd, 0x36, 0x0b, 0x2d, 0x07, 0x49, 0xb4, 0xb3, 0xf8, 0x88, + 0xa8, 0x7a, 0x32, 0x83, 0xc5, 0xd9, 0x3a, 0xec, 0xbf, 0x59, 0x82, 0xd3, 0x0b, 0x5f, 0x68, 0x47, + 0xa4, 0xea, 0xc5, 0xf7, 0xb2, 0x4b, 0xc1, 0xf5, 0xe2, 0x7b, 0x37, 0xd3, 0xc1, 0x50, 0x73, 0xb0, + 0x2a, 0xe0, 0x58, 0x51, 0xa0, 0xe7, 0x61, 0x98, 0xfe, 0xbe, 0x8d, 0x57, 0x45, 0xef, 0x4f, 0x0a, + 0xe2, 0xd1, 0xaa, 0x93, 0x38, 0x55, 0x8e, 0xc2, 0x92, 0x06, 0xdd, 0x80, 0xd1, 0x06, 0x5b, 0xb9, + 0x9b, 0x37, 0x42, 0x97, 0xb0, 0x2f, 0x5c, 0x59, 0x7c, 0x8e, 0x92, 0x2f, 0xa5, 0xe0, 0xfd, 0xdd, + 0xd9, 0x69, 0xde, 0x36, 0xc1, 0x42, 0xc3, 0x61, 0xbd, 0x3c, 0xb2, 0xd5, 0x42, 0x1c, 0x60, 0x9c, + 0xa0, 0xcb, 0x22, 0x3c, 0xaf, 0xad, 0xa9, 0x41, 0xb6, 0xa6, 0xc6, 0x7a, 0xac, 0xa7, 0x7f, 0x6c, + 0x89, 0x31, 0x59, 0xf1, 0x7c, 0x53, 0x3c, 0x5c, 0x02, 0x88, 0x49, 0x23, 0x22, 0x89, 0x36, 0x2a, + 0xea, 0x33, 0xd7, 0x15, 0x06, 0x6b, 0x54, 0x74, 0xf1, 0xc7, 0x5b, 0x4e, 0xc4, 0x66, 0x8b, 0x18, + 0x1b, 0xb5, 0xf8, 0xeb, 0x12, 0x81, 0x53, 0x1a, 0x63, 0xf1, 0x97, 0x73, 0x17, 0xff, 0x6f, 0x59, + 0x30, 0xbc, 0xe8, 0x05, 0xae, 0x17, 0x6c, 0xa2, 0xb7, 0x60, 0x84, 0xca, 0x66, 0xd7, 0x49, 0x1c, + 0xb1, 0xee, 0x3f, 0x22, 0x27, 0x8f, 0x2e, 0x2a, 0xe5, 0xf4, 0x89, 0xe7, 0x28, 0x35, 0x9d, 0x44, + 0xb7, 0xd6, 0xdf, 0x26, 0x8d, 0xe4, 0x06, 0x49, 0x9c, 0xb4, 0x3b, 0x29, 0x0c, 0x2b, 0xae, 0xe8, + 0x36, 0x0c, 0x25, 0x4e, 0xb4, 0x49, 0x12, 0xb1, 0xec, 0x73, 0x16, 0x25, 0xe7, 0x81, 0xe9, 0x94, + 0x23, 0x41, 0x83, 0xa4, 0x02, 0x72, 0x8d, 0x31, 0xc1, 0x82, 0x99, 0xdd, 0x80, 0xb1, 0x25, 0xa7, + 0xe5, 0xac, 0x7b, 0xbe, 0x97, 0x78, 0x24, 0x46, 0x1f, 0x86, 0xb2, 0xe3, 0xba, 0x6c, 0x01, 0x54, + 0x16, 0x4f, 0xef, 0xed, 0xce, 0x96, 0x17, 0x5c, 0x77, 0x7f, 0x77, 0x16, 0x14, 0xd5, 0x0e, 0xa6, + 0x14, 0xe8, 0x59, 0x18, 0x70, 0xa3, 0xb0, 0x35, 0x5d, 0x62, 0x94, 0x67, 0xe8, 0x4a, 0xad, 0x46, + 0x61, 0x2b, 0x43, 0xca, 0x68, 0xec, 0x1f, 0x96, 0x00, 0x2d, 0x91, 0xd6, 0xd6, 0x4a, 0xdd, 0xf8, + 0xa6, 0xe7, 0x61, 0xa4, 0x19, 0x06, 0x5e, 0x12, 0x46, 0xb1, 0xa8, 0x90, 0xcd, 0x8b, 0x1b, 0x02, + 0x86, 0x15, 0x16, 0x9d, 0x83, 0x81, 0x56, 0xba, 0xbc, 0xc7, 0xa4, 0x68, 0x60, 0x0b, 0x9b, 0x61, + 0x28, 0x45, 0x3b, 0x26, 0x91, 0x98, 0xcf, 0x8a, 0xe2, 0x76, 0x4c, 0x22, 0xcc, 0x30, 0xe9, 0x0c, + 0xa2, 0x73, 0x4b, 0xcc, 0xd6, 0xcc, 0x0c, 0xa2, 0x18, 0xac, 0x51, 0xa1, 0x37, 0xa1, 0xc2, 0xff, + 0x61, 0xb2, 0xc1, 0xa6, 0x6e, 0xae, 0x50, 0xb8, 0x1e, 0x36, 0x1c, 0x3f, 0x3b, 0xf8, 0xe3, 0x6c, + 0xc6, 0x49, 0x46, 0x38, 0xe5, 0x69, 0xcc, 0xb8, 0xa1, 0xdc, 0x19, 0xf7, 0xb7, 0x2c, 0x40, 0x4b, + 0x5e, 0xe0, 0x92, 0xe8, 0x18, 0xb6, 0xce, 0xfe, 0x16, 0xc3, 0x1f, 0xd2, 0xa6, 0x85, 0xcd, 0x56, + 0x18, 0x90, 0x20, 0x59, 0x0a, 0x03, 0x97, 0x6f, 0xa7, 0x1f, 0x87, 0x81, 0x84, 0x56, 0xc5, 0x9b, + 0xf5, 0xb4, 0xfc, 0x2c, 0xb4, 0x82, 0xfd, 0xdd, 0xd9, 0x33, 0x9d, 0x25, 0x58, 0x13, 0x58, 0x19, + 0xf4, 0x31, 0x18, 0x8a, 0x13, 0x27, 0x69, 0xc7, 0xa2, 0xa1, 0x4f, 0xc8, 0x86, 0xd6, 0x19, 0x74, + 0x7f, 0x77, 0x76, 0x52, 0x15, 0xe3, 0x20, 0x2c, 0x0a, 0xa0, 0x67, 0x60, 0xb8, 0x49, 0xe2, 0xd8, + 0xd9, 0x94, 0x02, 0x6e, 0x52, 0x94, 0x1d, 0xbe, 0xc1, 0xc1, 0x58, 0xe2, 0xd1, 0x93, 0x30, 0x48, + 0xa2, 0x28, 0x8c, 0xc4, 0x8c, 0x18, 0x17, 0x84, 0x83, 0xcb, 0x14, 0x88, 0x39, 0xce, 0xfe, 0xcf, + 0x16, 0x4c, 0xaa, 0xb6, 0xf2, 0xba, 0x8e, 0x61, 0xc9, 0xbb, 0x00, 0x0d, 0xd9, 0xc1, 0x98, 0x2d, + 0x34, 0xad, 0x8e, 0xee, 0xd3, 0xaf, 0x73, 0x40, 0xd3, 0x3a, 0x14, 0x28, 0xc6, 0x1a, 0x5f, 0xfb, + 0xdf, 0x5a, 0x70, 0x32, 0xd3, 0xb7, 0xeb, 0x5e, 0x9c, 0xa0, 0x37, 0x3a, 0xfa, 0x37, 0x57, 0xac, + 0x7f, 0xb4, 0x34, 0xeb, 0x9d, 0x9a, 0x2f, 0x12, 0xa2, 0xf5, 0x0d, 0xc3, 0xa0, 0x97, 0x90, 0xa6, + 0xec, 0xd6, 0xf3, 0x05, 0xbb, 0xc5, 0xdb, 0x97, 0x7e, 0xa5, 0x55, 0xca, 0x03, 0x73, 0x56, 0xf6, + 0xff, 0xb6, 0xa0, 0xb2, 0x14, 0x06, 0x1b, 0xde, 0xe6, 0x0d, 0xa7, 0x75, 0x0c, 0xdf, 0xa7, 0x0e, + 0x03, 0x8c, 0x3b, 0xef, 0xc2, 0xc5, 0xbc, 0x2e, 0x88, 0x86, 0xcd, 0xd1, 0x3d, 0x95, 0x2b, 0x0b, + 0x4a, 0x4c, 0x51, 0x10, 0x66, 0xcc, 0x66, 0x5e, 0x86, 0x8a, 0x22, 0x40, 0x53, 0x50, 0xbe, 0x47, + 0xb8, 0x26, 0x59, 0xc1, 0xf4, 0x27, 0x3a, 0x05, 0x83, 0xdb, 0x8e, 0xdf, 0x16, 0x8b, 0x17, 0xf3, + 0x3f, 0x1f, 0x2f, 0x5d, 0xb6, 0xec, 0x1f, 0xb2, 0x15, 0x28, 0x2a, 0x59, 0x0e, 0xb6, 0x85, 0x70, + 0xf8, 0x8a, 0x05, 0xa7, 0xfc, 0x2e, 0x42, 0x49, 0x8c, 0xc9, 0x61, 0xc4, 0xd9, 0x63, 0xa2, 0xd9, + 0xa7, 0xba, 0x61, 0x71, 0xd7, 0xda, 0xa8, 0xac, 0x0f, 0x5b, 0x74, 0xc2, 0x39, 0x3e, 0x6b, 0xba, + 0xd0, 0x01, 0x6e, 0x09, 0x18, 0x56, 0x58, 0xfb, 0x4f, 0x2c, 0x38, 0xa5, 0xfa, 0x71, 0x8d, 0xec, + 0xd4, 0x89, 0x4f, 0x1a, 0x49, 0x18, 0xbd, 0x5f, 0x7a, 0xf2, 0x38, 0xff, 0x26, 0x5c, 0x26, 0x8d, + 0x0a, 0x06, 0xe5, 0x6b, 0x64, 0x87, 0x7f, 0x20, 0xbd, 0xa3, 0xe5, 0x03, 0x3b, 0xfa, 0x2f, 0x2c, + 0x18, 0x57, 0x1d, 0x3d, 0x86, 0x25, 0x77, 0xdd, 0x5c, 0x72, 0x1f, 0x2e, 0x38, 0x5f, 0x7b, 0x2c, + 0xb6, 0xdf, 0x29, 0xc1, 0x69, 0x45, 0x63, 0x6c, 0x47, 0xef, 0x93, 0xef, 0xd4, 0x5f, 0x77, 0xaf, + 0x91, 0x9d, 0xb5, 0x90, 0xea, 0x13, 0xdd, 0xbb, 0x8b, 0x2e, 0xc2, 0xa8, 0x4b, 0x36, 0x9c, 0xb6, + 0x9f, 0x28, 0xb5, 0x79, 0x90, 0xdb, 0x53, 0xd5, 0x14, 0x8c, 0x75, 0x1a, 0x63, 0x26, 0x0c, 0x1c, + 0x38, 0x13, 0xbe, 0x39, 0xca, 0x04, 0x57, 0xe2, 0xd0, 0xcf, 0x4b, 0x55, 0x19, 0xcd, 0x0e, 0x1a, + 0xd3, 0xed, 0x20, 0x61, 0xf3, 0x3c, 0x09, 0x83, 0x5e, 0x93, 0x6e, 0x6e, 0x25, 0x73, 0xcf, 0x5a, + 0xa5, 0x40, 0xcc, 0x71, 0xe8, 0x29, 0x18, 0x6e, 0x84, 0xcd, 0xa6, 0x13, 0xb8, 0xd3, 0x65, 0xa6, + 0x5c, 0x8d, 0xd2, 0xfd, 0x6f, 0x89, 0x83, 0xb0, 0xc4, 0xa1, 0xc7, 0x60, 0xc0, 0x89, 0x36, 0xe3, + 0xe9, 0x01, 0x46, 0x33, 0x42, 0x6b, 0x5a, 0x88, 0x36, 0x63, 0xcc, 0xa0, 0x54, 0x69, 0xba, 0x1f, + 0x46, 0xf7, 0xbc, 0x60, 0xb3, 0xea, 0x45, 0x4c, 0x03, 0xd2, 0x94, 0xa6, 0xbb, 0x0a, 0x83, 0x35, + 0x2a, 0x54, 0x83, 0xc1, 0x56, 0x18, 0x25, 0xf1, 0xf4, 0x10, 0x1b, 0xf8, 0xe7, 0x72, 0xe7, 0x19, + 0xef, 0x77, 0x2d, 0x8c, 0x92, 0xb4, 0x2b, 0xf4, 0x5f, 0x8c, 0x39, 0x23, 0xb4, 0x04, 0x65, 0x12, + 0x6c, 0x4f, 0x0f, 0x33, 0x7e, 0x1f, 0x3a, 0x98, 0xdf, 0x72, 0xb0, 0x7d, 0xc7, 0x89, 0xd2, 0x85, + 0xb9, 0x1c, 0x6c, 0x63, 0x5a, 0x1a, 0x35, 0xa0, 0x22, 0xbd, 0x2e, 0xf1, 0xf4, 0x48, 0x91, 0xa9, + 0x88, 0x05, 0x39, 0x26, 0xef, 0xb4, 0xbd, 0x88, 0x34, 0x49, 0x90, 0xc4, 0xa9, 0x05, 0x21, 0xb1, + 0x31, 0x4e, 0xf9, 0xa2, 0x06, 0x8c, 0x71, 0x45, 0xeb, 0x46, 0xd8, 0x0e, 0x92, 0x78, 0xba, 0xc2, + 0x9a, 0x9c, 0x63, 0xa2, 0xdf, 0x49, 0x4b, 0x2c, 0x9e, 0x12, 0xec, 0xc7, 0x34, 0x60, 0x8c, 0x0d, + 0xa6, 0xe8, 0x0d, 0x18, 0xf7, 0xbd, 0x6d, 0x12, 0x90, 0x38, 0xae, 0x45, 0xe1, 0x3a, 0x99, 0x06, + 0xd6, 0x9b, 0x27, 0xf3, 0xcc, 0xd5, 0x70, 0x9d, 0x2c, 0x9e, 0xd8, 0xdb, 0x9d, 0x1d, 0xbf, 0xae, + 0x97, 0xc6, 0x26, 0x33, 0xf4, 0x26, 0x4c, 0x50, 0xad, 0xce, 0x4b, 0xd9, 0x8f, 0x16, 0x67, 0x8f, + 0xf6, 0x76, 0x67, 0x27, 0xb0, 0x51, 0x1c, 0x67, 0xd8, 0xa1, 0x35, 0xa8, 0xf8, 0xde, 0x06, 0x69, + 0xec, 0x34, 0x7c, 0x32, 0x3d, 0xc6, 0x78, 0xe7, 0x2c, 0xce, 0xeb, 0x92, 0x9c, 0x6b, 0xd2, 0xea, + 0x2f, 0x4e, 0x19, 0xa1, 0x3b, 0x70, 0x26, 0x21, 0x51, 0xd3, 0x0b, 0x1c, 0xba, 0xa8, 0x84, 0x9a, + 0xc7, 0x7c, 0x02, 0xe3, 0x6c, 0xd6, 0x9e, 0x15, 0x03, 0x7b, 0x66, 0xad, 0x2b, 0x15, 0xee, 0x51, + 0x1a, 0xdd, 0x82, 0x49, 0xb6, 0x9e, 0x6a, 0x6d, 0xdf, 0xaf, 0x85, 0xbe, 0xd7, 0xd8, 0x99, 0x9e, + 0x60, 0x0c, 0x9f, 0x92, 0x96, 0xfe, 0xaa, 0x89, 0xa6, 0x16, 0x50, 0xfa, 0x0f, 0x67, 0x4b, 0x23, + 0x1f, 0x26, 0x63, 0xd2, 0x68, 0x47, 0x5e, 0xb2, 0x43, 0xe7, 0x3e, 0x79, 0x90, 0x4c, 0x4f, 0x16, + 0xb1, 0xe8, 0xea, 0x66, 0x21, 0xee, 0x66, 0xc9, 0x00, 0x71, 0x96, 0x35, 0x15, 0x15, 0x71, 0xe2, + 0x7a, 0xc1, 0xf4, 0x14, 0x93, 0x40, 0x6a, 0x7d, 0xd5, 0x29, 0x10, 0x73, 0x1c, 0x33, 0x94, 0xe9, + 0x8f, 0x5b, 0x54, 0x4a, 0x9f, 0x60, 0x84, 0xa9, 0xa1, 0x2c, 0x11, 0x38, 0xa5, 0xa1, 0x7b, 0x60, + 0x92, 0xec, 0x4c, 0x23, 0x46, 0xaa, 0x96, 0xda, 0xda, 0xda, 0x67, 0x30, 0x85, 0xa3, 0x3b, 0x30, + 0x4c, 0x82, 0xed, 0x95, 0x28, 0x6c, 0x4e, 0x9f, 0x2c, 0x22, 0x03, 0x96, 0x39, 0x31, 0xdf, 0x3f, + 0x52, 0x5d, 0x5d, 0x80, 0xb1, 0x64, 0x86, 0x1e, 0xc0, 0x74, 0x97, 0xaf, 0xc4, 0x3f, 0xca, 0x29, + 0xf6, 0x51, 0x3e, 0x21, 0xca, 0x4e, 0xaf, 0xf5, 0xa0, 0xdb, 0x3f, 0x00, 0x87, 0x7b, 0x72, 0xb7, + 0xd7, 0x61, 0x42, 0x09, 0x2a, 0xf6, 0xbd, 0xd1, 0x2c, 0x0c, 0x52, 0x59, 0x2c, 0x2d, 0xd7, 0x0a, + 0x1d, 0x54, 0x2a, 0xa2, 0x63, 0xcc, 0xe1, 0x6c, 0x50, 0xbd, 0x2f, 0x90, 0xc5, 0x9d, 0x84, 0x70, + 0x0b, 0xa6, 0xac, 0x0d, 0xaa, 0x44, 0xe0, 0x94, 0xc6, 0xfe, 0xbf, 0x5c, 0x1f, 0x48, 0xa5, 0x61, + 0x81, 0x9d, 0xe0, 0x02, 0x8c, 0x6c, 0x85, 0x71, 0x42, 0xa9, 0x59, 0x1d, 0x83, 0xa9, 0x06, 0x70, + 0x55, 0xc0, 0xb1, 0xa2, 0x40, 0xaf, 0xc0, 0x78, 0x43, 0xaf, 0x40, 0x6c, 0x63, 0xa7, 0x45, 0x11, + 0xb3, 0x76, 0x6c, 0xd2, 0xa2, 0xcb, 0x30, 0xc2, 0xdc, 0xb9, 0x8d, 0xd0, 0x17, 0xb6, 0x92, 0xdc, + 0x95, 0x47, 0x6a, 0x02, 0xbe, 0xaf, 0xfd, 0xc6, 0x8a, 0x9a, 0x5a, 0x9c, 0xb4, 0x09, 0xab, 0x35, + 0xb1, 0x81, 0x28, 0x8b, 0xf3, 0x2a, 0x83, 0x62, 0x81, 0xb5, 0xff, 0x59, 0x49, 0x1b, 0x65, 0xaa, + 0xe9, 0x13, 0xf4, 0x59, 0x18, 0xbe, 0xef, 0x78, 0x89, 0x17, 0x6c, 0x0a, 0xed, 0xe1, 0x85, 0x82, + 0xbb, 0x09, 0x2b, 0x7e, 0x97, 0x17, 0xe5, 0x3b, 0x9f, 0xf8, 0x83, 0x25, 0x43, 0xca, 0x3b, 0x6a, + 0x07, 0x01, 0xe5, 0x5d, 0xea, 0x9f, 0x37, 0xe6, 0x45, 0x39, 0x6f, 0xf1, 0x07, 0x4b, 0x86, 0x68, + 0x03, 0x40, 0xce, 0x25, 0xe2, 0x0a, 0x37, 0xea, 0x47, 0xfb, 0x61, 0xbf, 0xa6, 0x4a, 0x2f, 0x4e, + 0xd0, 0xbd, 0x36, 0xfd, 0x8f, 0x35, 0xce, 0x76, 0xc2, 0x94, 0xb0, 0xce, 0x66, 0xa1, 0xcf, 0xd1, + 0x25, 0xed, 0x44, 0x09, 0x71, 0x17, 0x92, 0xac, 0x27, 0xfa, 0x60, 0x5d, 0x72, 0xcd, 0x6b, 0x12, + 0x7d, 0xf9, 0x0b, 0x26, 0x38, 0xe5, 0x67, 0x7f, 0xaf, 0x0c, 0xd3, 0xbd, 0x9a, 0x4b, 0xa7, 0x24, + 0x79, 0xe0, 0x25, 0x4b, 0x54, 0x4d, 0xb2, 0xcc, 0x29, 0xb9, 0x2c, 0xe0, 0x58, 0x51, 0xd0, 0xb9, + 0x11, 0x7b, 0x9b, 0xd2, 0x2a, 0x18, 0x4c, 0xe7, 0x46, 0x9d, 0x41, 0xb1, 0xc0, 0x52, 0xba, 0x88, + 0x38, 0xb1, 0xf0, 0xe2, 0x6b, 0x73, 0x08, 0x33, 0x28, 0x16, 0x58, 0xdd, 0xf2, 0x1f, 0xc8, 0xb1, + 0xfc, 0x8d, 0x21, 0x1a, 0x7c, 0xb8, 0x43, 0x84, 0x3e, 0x0f, 0xb0, 0xe1, 0x05, 0x5e, 0xbc, 0xc5, + 0xb8, 0x0f, 0xf5, 0xcd, 0x5d, 0x29, 0x59, 0x2b, 0x8a, 0x0b, 0xd6, 0x38, 0xa2, 0x97, 0x60, 0x54, + 0x2d, 0xcf, 0xd5, 0xea, 0xf4, 0xb0, 0xe9, 0xf9, 0x4d, 0x65, 0x55, 0x15, 0xeb, 0x74, 0xf6, 0xdb, + 0xd9, 0xf9, 0x22, 0x56, 0x85, 0x36, 0xbe, 0x56, 0xd1, 0xf1, 0x2d, 0x1d, 0x3c, 0xbe, 0xf6, 0x7f, + 0x2a, 0xc3, 0xa4, 0x51, 0x59, 0x3b, 0x2e, 0x20, 0xd1, 0x5e, 0xa3, 0x1b, 0x96, 0x93, 0x10, 0xb1, + 0x26, 0x2f, 0xf4, 0xb3, 0x68, 0xf4, 0xed, 0x8d, 0xae, 0x05, 0xce, 0x09, 0x6d, 0x41, 0xc5, 0x77, + 0x62, 0xe6, 0x3b, 0x20, 0x62, 0x2d, 0xf6, 0xc7, 0x36, 0x35, 0x3f, 0x9c, 0x38, 0xd1, 0x76, 0x0f, + 0x5e, 0x4b, 0xca, 0x9c, 0xee, 0xb6, 0x54, 0xd9, 0x91, 0x47, 0x47, 0xaa, 0x39, 0x54, 0x23, 0xda, + 0xc1, 0x1c, 0x87, 0x2e, 0xc3, 0x58, 0x44, 0xd8, 0x4c, 0x59, 0xa2, 0xfa, 0x1c, 0x9b, 0x7a, 0x83, + 0xa9, 0xe2, 0x87, 0x35, 0x1c, 0x36, 0x28, 0x53, 0xbd, 0x7f, 0xe8, 0x00, 0xbd, 0xff, 0x19, 0x18, + 0x66, 0x3f, 0xd4, 0xac, 0x50, 0x5f, 0x68, 0x95, 0x83, 0xb1, 0xc4, 0x67, 0x27, 0xd1, 0x48, 0xc1, + 0x49, 0xf4, 0x2c, 0x4c, 0x54, 0x1d, 0xd2, 0x0c, 0x83, 0xe5, 0xc0, 0x6d, 0x85, 0x5e, 0x90, 0xa0, + 0x69, 0x18, 0x60, 0xfb, 0x09, 0x5f, 0xef, 0x03, 0x94, 0x03, 0x1e, 0xa0, 0xba, 0xbb, 0xfd, 0xff, + 0x2c, 0x18, 0xaf, 0x12, 0x9f, 0x24, 0x84, 0xdb, 0x3d, 0x31, 0x5a, 0x01, 0xb4, 0x19, 0x39, 0x0d, + 0x52, 0x23, 0x91, 0x17, 0xba, 0x75, 0xd2, 0x08, 0x03, 0x76, 0xe2, 0x42, 0x37, 0xc8, 0x33, 0x7b, + 0xbb, 0xb3, 0xe8, 0x4a, 0x07, 0x16, 0x77, 0x29, 0x81, 0x5c, 0x18, 0x6f, 0x45, 0xc4, 0x70, 0x90, + 0x59, 0xf9, 0xaa, 0x46, 0x4d, 0x2f, 0xc2, 0xb5, 0x61, 0x03, 0x84, 0x4d, 0xa6, 0xe8, 0x53, 0x30, + 0x15, 0x46, 0xad, 0x2d, 0x27, 0xa8, 0x92, 0x16, 0x09, 0x5c, 0x6a, 0x02, 0x08, 0xb3, 0xfe, 0xd4, + 0xde, 0xee, 0xec, 0xd4, 0xad, 0x0c, 0x0e, 0x77, 0x50, 0xdb, 0xbf, 0x56, 0x82, 0xd3, 0xd5, 0xf0, + 0x7e, 0x70, 0xdf, 0x89, 0xdc, 0x85, 0xda, 0x2a, 0xd7, 0xeb, 0x99, 0x77, 0x59, 0x7a, 0xb5, 0xad, + 0x9e, 0x5e, 0xed, 0xcf, 0xc1, 0xc8, 0x86, 0x47, 0x7c, 0x17, 0x93, 0x0d, 0xd1, 0xbd, 0x8b, 0x45, + 0xdc, 0xfe, 0x2b, 0xb4, 0x8c, 0xf4, 0x9b, 0x70, 0xab, 0x73, 0x45, 0xb0, 0xc1, 0x8a, 0x21, 0x6a, + 0xc3, 0x94, 0x34, 0x5c, 0x24, 0x56, 0xac, 0x8e, 0x17, 0x8a, 0xd9, 0x45, 0x66, 0x35, 0x6c, 0x3c, + 0x70, 0x86, 0x21, 0xee, 0xa8, 0x82, 0x1a, 0x9c, 0x4d, 0xba, 0x37, 0x0c, 0xb0, 0xb9, 0xc2, 0x0c, + 0x4e, 0x66, 0x3b, 0x33, 0xa8, 0xfd, 0x0f, 0x2d, 0x78, 0xa4, 0x63, 0xb4, 0x84, 0x63, 0xe1, 0x75, + 0x69, 0xd1, 0xf3, 0xe3, 0xb9, 0x9c, 0x56, 0x76, 0x1d, 0xf3, 0x62, 0xd6, 0x7d, 0x29, 0xdf, 0xba, + 0xb7, 0x6f, 0xc1, 0xa9, 0xe5, 0x66, 0x2b, 0xd9, 0xa9, 0x7a, 0xa6, 0x33, 0xfe, 0x65, 0x18, 0x6a, + 0x12, 0xd7, 0x6b, 0x37, 0xc5, 0x67, 0x9d, 0x95, 0x82, 0xf4, 0x06, 0x83, 0xee, 0xef, 0xce, 0x8e, + 0xd7, 0x93, 0x30, 0x72, 0x36, 0x09, 0x07, 0x60, 0x41, 0x6e, 0xbf, 0x6b, 0xc1, 0xa4, 0x5c, 0x50, + 0x0b, 0xae, 0x1b, 0x91, 0x38, 0x46, 0x33, 0x50, 0xf2, 0x5a, 0x82, 0x11, 0x08, 0x46, 0xa5, 0xd5, + 0x1a, 0x2e, 0x79, 0x2d, 0xf4, 0x59, 0xa8, 0xf0, 0x33, 0x9c, 0x74, 0x72, 0xf4, 0x79, 0x26, 0xc4, + 0x8c, 0xa9, 0x35, 0xc9, 0x03, 0xa7, 0xec, 0xa4, 0x5a, 0xc9, 0x44, 0x75, 0xd9, 0x3c, 0x51, 0xb8, + 0x2a, 0xe0, 0x58, 0x51, 0xa0, 0xf3, 0x30, 0x12, 0x84, 0x2e, 0x3f, 0x66, 0xe3, 0x9b, 0x2e, 0x9b, + 0x72, 0x37, 0x05, 0x0c, 0x2b, 0xac, 0xfd, 0x35, 0x0b, 0xc6, 0x64, 0x1f, 0x0b, 0x6a, 0xb8, 0x74, + 0x91, 0xa4, 0xda, 0x6d, 0xba, 0x48, 0xa8, 0x86, 0xca, 0x30, 0x86, 0x62, 0x5a, 0xee, 0x47, 0x31, + 0xb5, 0x7f, 0xa3, 0x04, 0x13, 0xb2, 0x39, 0xf5, 0xf6, 0x7a, 0x4c, 0xe8, 0xbe, 0x5d, 0x71, 0xf8, + 0xe0, 0x13, 0x39, 0xcf, 0x9e, 0xcf, 0x33, 0x5e, 0x8c, 0x6f, 0x96, 0xea, 0x05, 0x0b, 0x92, 0x0f, + 0x4e, 0x59, 0xa2, 0x6d, 0x38, 0x11, 0x84, 0x09, 0xdb, 0x0f, 0x14, 0xbe, 0x98, 0x0f, 0x3c, 0x5b, + 0xcf, 0xa3, 0xa2, 0x9e, 0x13, 0x37, 0xb3, 0xfc, 0x70, 0x67, 0x15, 0xe8, 0x96, 0x74, 0xca, 0x94, + 0x59, 0x5d, 0xcf, 0x16, 0xab, 0xab, 0xb7, 0x4f, 0xc6, 0xfe, 0x91, 0x05, 0x15, 0x49, 0x76, 0x1c, + 0x87, 0x21, 0x77, 0x61, 0x38, 0x66, 0x9f, 0x48, 0x0e, 0xd7, 0x85, 0x62, 0x5d, 0xe0, 0xdf, 0x35, + 0xdd, 0x04, 0xf9, 0xff, 0x18, 0x4b, 0x6e, 0xcc, 0x0d, 0xab, 0x3a, 0xf2, 0xbe, 0x73, 0xc3, 0xaa, + 0x96, 0xf5, 0x3e, 0xf3, 0x18, 0x37, 0xcc, 0x67, 0xaa, 0xc9, 0xb5, 0x22, 0xb2, 0xe1, 0x3d, 0xc8, + 0x6a, 0x72, 0x35, 0x06, 0xc5, 0x02, 0x8b, 0x36, 0x60, 0xac, 0x21, 0xfd, 0xb7, 0xa9, 0x08, 0xf9, + 0x48, 0x41, 0xaf, 0xb0, 0x3a, 0x60, 0xe0, 0x41, 0x2b, 0x4b, 0x1a, 0x27, 0x6c, 0xf0, 0xa5, 0x72, + 0x2a, 0x3d, 0x43, 0x2d, 0x17, 0xf4, 0x74, 0x44, 0x24, 0x49, 0x6b, 0xe8, 0x79, 0x7c, 0x6a, 0x7f, + 0xcb, 0x82, 0x21, 0xee, 0xf0, 0x2b, 0xe6, 0x35, 0xd5, 0x8e, 0x4e, 0xd2, 0xf1, 0xbc, 0x43, 0x81, + 0xe2, 0x24, 0x05, 0xdd, 0x85, 0x0a, 0xfb, 0xc1, 0x9c, 0x17, 0xe5, 0x22, 0x11, 0x3c, 0xbc, 0x7e, + 0xbd, 0xa9, 0x77, 0x24, 0x03, 0x9c, 0xf2, 0xb2, 0x7f, 0x50, 0xa6, 0xa2, 0x2f, 0x25, 0x35, 0xf6, + 0x76, 0xeb, 0x38, 0xf6, 0xf6, 0xd2, 0xd1, 0xef, 0xed, 0xef, 0xc0, 0x64, 0x43, 0x3b, 0xba, 0x49, + 0xbf, 0xf8, 0xa5, 0x82, 0xd3, 0x4a, 0x3b, 0xef, 0xe1, 0x0e, 0xae, 0x25, 0x93, 0x1d, 0xce, 0xf2, + 0x47, 0x04, 0xc6, 0xf8, 0x7c, 0x10, 0xf5, 0x0d, 0xb0, 0xfa, 0xe6, 0x8b, 0xcc, 0x30, 0xbd, 0x32, + 0x36, 0x8b, 0xeb, 0x1a, 0x23, 0x6c, 0xb0, 0xb5, 0xff, 0xf6, 0x20, 0x0c, 0x2e, 0x6f, 0x93, 0x20, + 0x39, 0x06, 0x51, 0xd7, 0x84, 0x09, 0x2f, 0xd8, 0x0e, 0xfd, 0x6d, 0xe2, 0x72, 0xfc, 0xe1, 0xb6, + 0xf7, 0x33, 0xa2, 0x92, 0x89, 0x55, 0x83, 0x19, 0xce, 0x30, 0x3f, 0x0a, 0xd3, 0xfa, 0x35, 0x18, + 0xe2, 0x33, 0x43, 0xd8, 0xd5, 0x39, 0x0e, 0x70, 0x36, 0xb0, 0x62, 0x05, 0xa5, 0x0e, 0x00, 0xee, + 0x7b, 0x17, 0x8c, 0xd0, 0xdb, 0x30, 0xb1, 0xe1, 0x45, 0x71, 0x42, 0xad, 0xe3, 0x38, 0x71, 0x9a, + 0xad, 0x43, 0x18, 0xd5, 0x6a, 0x44, 0x56, 0x0c, 0x4e, 0x38, 0xc3, 0x19, 0x6d, 0xc2, 0x38, 0xb5, + 0xe9, 0xd2, 0xaa, 0x86, 0xfb, 0xae, 0x4a, 0xf9, 0xd4, 0xae, 0xeb, 0x8c, 0xb0, 0xc9, 0x97, 0x8a, + 0xa4, 0x06, 0xb3, 0x01, 0x47, 0x98, 0x76, 0xa3, 0x44, 0x12, 0x37, 0xfe, 0x38, 0x8e, 0x4a, 0x36, + 0x16, 0x43, 0x51, 0x31, 0x25, 0x5b, 0x1a, 0x29, 0x61, 0x7f, 0x87, 0xee, 0xc5, 0x74, 0x0c, 0x8f, + 0x61, 0xfb, 0xba, 0x6a, 0x6e, 0x5f, 0x4f, 0x16, 0xf8, 0xb2, 0x3d, 0xb6, 0xae, 0xb7, 0x60, 0x54, + 0xfb, 0xf0, 0x68, 0x1e, 0x2a, 0x0d, 0x79, 0xcc, 0x2f, 0xa4, 0xb8, 0x52, 0xa5, 0xd4, 0xf9, 0x3f, + 0x4e, 0x69, 0xe8, 0xb8, 0x50, 0x15, 0x34, 0x1b, 0x14, 0x44, 0x15, 0x54, 0xcc, 0x30, 0xf6, 0x0b, + 0x00, 0xcb, 0x0f, 0x48, 0x63, 0xa1, 0xc1, 0x62, 0x51, 0xb4, 0x03, 0x31, 0xab, 0xf7, 0x81, 0x98, + 0xfd, 0x6d, 0x0b, 0x26, 0x56, 0x96, 0x0c, 0x9d, 0x7e, 0x0e, 0x80, 0xeb, 0xc6, 0x77, 0xef, 0xde, + 0x94, 0x0e, 0x5f, 0xee, 0x95, 0x53, 0x50, 0xac, 0x51, 0xa0, 0x47, 0xa1, 0xec, 0xb7, 0x03, 0xa1, + 0xb2, 0x0e, 0xef, 0xed, 0xce, 0x96, 0xaf, 0xb7, 0x03, 0x4c, 0x61, 0x5a, 0xf4, 0x4d, 0xb9, 0x70, + 0xf4, 0x4d, 0x7e, 0x1c, 0xea, 0x37, 0xca, 0x30, 0xb5, 0xe2, 0x93, 0x07, 0x46, 0xab, 0x9f, 0x86, + 0x21, 0x37, 0xf2, 0xb6, 0x49, 0x94, 0x55, 0x04, 0xaa, 0x0c, 0x8a, 0x05, 0xb6, 0x70, 0x40, 0xd0, + 0x9b, 0x9d, 0x1b, 0xf9, 0xd1, 0x05, 0x43, 0xe5, 0xf6, 0x19, 0x6d, 0xc0, 0x30, 0x3f, 0x40, 0x8d, + 0xa7, 0x07, 0xd9, 0x54, 0x7c, 0xe5, 0xe0, 0xc6, 0x64, 0xc7, 0x67, 0x4e, 0x38, 0x24, 0x78, 0x28, + 0x86, 0x92, 0x65, 0x02, 0x8a, 0x25, 0xf3, 0x99, 0x8f, 0xc3, 0x98, 0x4e, 0xd9, 0x57, 0x4c, 0xc6, + 0x2f, 0x59, 0x70, 0x72, 0xc5, 0x0f, 0x1b, 0xf7, 0x32, 0x11, 0x5b, 0x2f, 0xc1, 0x28, 0x5d, 0x4c, + 0xb1, 0x11, 0xce, 0x68, 0xc4, 0x6d, 0x0a, 0x14, 0xd6, 0xe9, 0xb4, 0x62, 0xb7, 0x6f, 0xaf, 0x56, + 0xbb, 0x85, 0x7b, 0x0a, 0x14, 0xd6, 0xe9, 0xec, 0xdf, 0xb5, 0xe0, 0xf1, 0x2b, 0x4b, 0xcb, 0x35, + 0x12, 0xc5, 0x5e, 0x9c, 0x90, 0x20, 0xe9, 0x88, 0x38, 0xa5, 0x3a, 0xa3, 0xab, 0x35, 0x25, 0xd5, + 0x19, 0xab, 0xac, 0x15, 0x02, 0xfb, 0x7e, 0x09, 0xbb, 0xfe, 0x96, 0x05, 0x27, 0xaf, 0x78, 0x09, + 0x26, 0xad, 0x30, 0x1b, 0x24, 0x1a, 0x91, 0x56, 0x18, 0x7b, 0x49, 0x18, 0xed, 0x64, 0x83, 0x44, + 0xb1, 0xc2, 0x60, 0x8d, 0x8a, 0xd7, 0xbc, 0xed, 0xc5, 0xb4, 0xa5, 0x25, 0xd3, 0xd4, 0xc5, 0x02, + 0x8e, 0x15, 0x05, 0xed, 0x98, 0xeb, 0x45, 0x4c, 0x65, 0xd8, 0x11, 0x2b, 0x58, 0x75, 0xac, 0x2a, + 0x11, 0x38, 0xa5, 0xb1, 0xff, 0xae, 0x05, 0xa7, 0xaf, 0xf8, 0xed, 0x38, 0x21, 0xd1, 0x46, 0x6c, + 0x34, 0xf6, 0x05, 0xa8, 0x10, 0xa9, 0xdc, 0x8b, 0xb6, 0xaa, 0x4d, 0x43, 0x69, 0xfd, 0x3c, 0x42, + 0x55, 0xd1, 0x15, 0x08, 0x84, 0xec, 0x2f, 0x6c, 0xef, 0x37, 0x4b, 0x30, 0x7e, 0x75, 0x6d, 0xad, + 0x76, 0x85, 0x24, 0x42, 0x4a, 0xe6, 0x3b, 0xa5, 0xb0, 0x66, 0x91, 0x1f, 0xa4, 0xfc, 0xb4, 0x13, + 0xcf, 0x9f, 0xe3, 0x57, 0x02, 0xe6, 0x56, 0x83, 0xe4, 0x56, 0x54, 0x4f, 0x22, 0x2f, 0xd8, 0xec, + 0x6a, 0xc3, 0x4b, 0x59, 0x5e, 0xee, 0x25, 0xcb, 0xd1, 0x0b, 0x30, 0xc4, 0xee, 0x24, 0x48, 0xe5, + 0xe3, 0x83, 0x4a, 0x4f, 0x60, 0xd0, 0xfd, 0xdd, 0xd9, 0xca, 0x6d, 0xbc, 0xca, 0xff, 0x60, 0x41, + 0x8a, 0xde, 0x84, 0xd1, 0xad, 0x24, 0x69, 0x5d, 0x25, 0x8e, 0x4b, 0x22, 0x29, 0x27, 0xce, 0x1f, + 0x2c, 0x27, 0xe8, 0x70, 0xf0, 0x02, 0xe9, 0xd2, 0x4a, 0x61, 0x31, 0xd6, 0x39, 0xda, 0x75, 0x80, + 0x14, 0xf7, 0x90, 0x6c, 0x10, 0xfb, 0x17, 0x4b, 0x30, 0x7c, 0xd5, 0x09, 0x5c, 0x9f, 0x44, 0x68, + 0x05, 0x06, 0xc8, 0x03, 0xd2, 0x10, 0x1b, 0x79, 0x4e, 0xd3, 0xd3, 0xcd, 0x8e, 0xfb, 0xd5, 0xe8, + 0x7f, 0xcc, 0xca, 0x23, 0x0c, 0xc3, 0xb4, 0xdd, 0x57, 0x54, 0xfc, 0xf0, 0x73, 0xf9, 0xa3, 0xa0, + 0x26, 0x05, 0xdf, 0x29, 0x05, 0x08, 0x4b, 0x46, 0xcc, 0x03, 0xd5, 0x68, 0xd5, 0xa9, 0x78, 0x4b, + 0x8a, 0x59, 0x76, 0x6b, 0x4b, 0x35, 0x4e, 0x2e, 0xf8, 0x72, 0x0f, 0x94, 0x04, 0xe2, 0x94, 0x9d, + 0x7d, 0x19, 0x4e, 0xb1, 0x03, 0x4c, 0x27, 0xd9, 0x32, 0x56, 0x4d, 0xee, 0xf4, 0xb4, 0xff, 0x5e, + 0x09, 0x4e, 0xac, 0xd6, 0x97, 0xea, 0xa6, 0xef, 0xf0, 0x32, 0x8c, 0xf1, 0x0d, 0x9a, 0x4e, 0x3a, + 0xc7, 0x17, 0xe5, 0x95, 0xd3, 0x7d, 0x4d, 0xc3, 0x61, 0x83, 0x12, 0x3d, 0x0e, 0x65, 0xef, 0x9d, + 0x20, 0x1b, 0xef, 0xb5, 0xfa, 0xda, 0x4d, 0x4c, 0xe1, 0x14, 0x4d, 0xf7, 0x7a, 0x2e, 0xe4, 0x14, + 0x5a, 0xed, 0xf7, 0xaf, 0xc2, 0x84, 0x17, 0x37, 0x62, 0x6f, 0x35, 0xa0, 0x12, 0xc0, 0x69, 0xc8, + 0xe9, 0x9b, 0x2a, 0xe7, 0xb4, 0xa9, 0x0a, 0x8b, 0x33, 0xd4, 0x9a, 0xc4, 0x1d, 0x2c, 0xac, 0x2f, + 0xe4, 0x07, 0x12, 0xbf, 0x0d, 0x15, 0x15, 0xf0, 0x24, 0x03, 0xda, 0xac, 0x1e, 0x01, 0x6d, 0xf9, + 0x22, 0x47, 0x7a, 0x74, 0xcb, 0x5d, 0x3d, 0xba, 0xff, 0xc4, 0x82, 0x34, 0x62, 0x03, 0x61, 0xa8, + 0xb4, 0x42, 0x76, 0x5c, 0x12, 0xc9, 0x73, 0xc9, 0xa7, 0x72, 0x66, 0x22, 0x5f, 0x09, 0x7c, 0xae, + 0xd4, 0x64, 0x59, 0x9c, 0xb2, 0x41, 0xd7, 0x61, 0xb8, 0x15, 0x91, 0x7a, 0xc2, 0xa2, 0xd1, 0xfb, + 0xe0, 0xc8, 0x66, 0x75, 0x8d, 0x97, 0xc4, 0x92, 0x85, 0xfd, 0x2f, 0x2d, 0x80, 0xeb, 0x5e, 0xd3, + 0x4b, 0xb0, 0x13, 0x6c, 0x92, 0x63, 0x30, 0xf7, 0x6e, 0xc2, 0x40, 0xdc, 0x22, 0x8d, 0x62, 0x07, + 0x5e, 0x69, 0xcb, 0xea, 0x2d, 0xd2, 0x48, 0x3f, 0x07, 0xfd, 0x87, 0x19, 0x1f, 0xfb, 0xfb, 0x00, + 0x13, 0x29, 0x19, 0x55, 0xb9, 0xd1, 0xf3, 0x46, 0x18, 0xf6, 0xa3, 0x99, 0x30, 0xec, 0x0a, 0xa3, + 0xd6, 0x22, 0xaf, 0x13, 0x28, 0x37, 0x9d, 0x07, 0x42, 0xc3, 0x7f, 0xa9, 0x68, 0x83, 0x68, 0x4d, + 0x73, 0x37, 0x9c, 0x07, 0x5c, 0xa1, 0x7a, 0x4e, 0x4e, 0xa4, 0x1b, 0xce, 0x83, 0x7d, 0x7e, 0xac, + 0xc5, 0x56, 0x22, 0x35, 0x29, 0xbe, 0xfc, 0x47, 0xe9, 0x7f, 0x26, 0x1c, 0x69, 0x75, 0xac, 0x56, + 0x2f, 0x10, 0x0e, 0xca, 0x3e, 0x6b, 0xf5, 0x82, 0x6c, 0xad, 0x5e, 0x50, 0xa0, 0x56, 0x2f, 0x40, + 0x5f, 0xb1, 0x60, 0x58, 0xf8, 0xf5, 0x59, 0x0c, 0xdc, 0xe8, 0xa5, 0x8f, 0xf5, 0x55, 0xb5, 0x38, + 0x20, 0xe0, 0xd5, 0xcf, 0x4b, 0x2d, 0x52, 0x40, 0x73, 0x9b, 0x20, 0xab, 0x46, 0xbf, 0x6a, 0xc1, + 0x84, 0xf8, 0x8d, 0xc9, 0x3b, 0x6d, 0x12, 0x27, 0x62, 0xb7, 0xfa, 0xd4, 0x61, 0x5a, 0x23, 0x58, + 0xf0, 0x46, 0x7d, 0x54, 0x8a, 0x1a, 0x13, 0x99, 0xdb, 0xb6, 0x4c, 0x7b, 0xd0, 0xf7, 0x2d, 0x38, + 0xd5, 0x74, 0x1e, 0xf0, 0x1a, 0x39, 0x0c, 0x3b, 0x89, 0x17, 0x8a, 0x38, 0xbf, 0x95, 0x7e, 0xe7, + 0x49, 0x07, 0x23, 0xde, 0x5c, 0x19, 0xc2, 0x73, 0xaa, 0x1b, 0x49, 0x6e, 0xa3, 0xbb, 0xb6, 0x70, + 0x66, 0x03, 0x46, 0xe4, 0xc4, 0xec, 0xa2, 0xbf, 0x57, 0xf5, 0x4d, 0x39, 0xc7, 0x5a, 0x9e, 0x93, + 0x3e, 0xaf, 0xb9, 0xd7, 0xda, 0x4e, 0x90, 0x78, 0xc9, 0x8e, 0xa6, 0xef, 0xb3, 0x7a, 0xc4, 0x54, + 0x3c, 0xd2, 0x7a, 0xde, 0x86, 0x31, 0x7d, 0xde, 0x1d, 0x69, 0x5d, 0xef, 0xc0, 0xc9, 0x2e, 0xb3, + 0xea, 0x48, 0xab, 0xbc, 0x0f, 0x8f, 0xf6, 0x9c, 0x1f, 0x47, 0x59, 0xb1, 0xfd, 0x9b, 0x96, 0x2e, + 0x3a, 0x8f, 0xc1, 0x9b, 0x72, 0xc3, 0xf4, 0xa6, 0x9c, 0x2f, 0xba, 0x86, 0x7a, 0xb8, 0x54, 0x36, + 0xf4, 0xe6, 0xd3, 0x2d, 0x01, 0xad, 0xc1, 0x90, 0x4f, 0x21, 0xf2, 0x30, 0xeb, 0x42, 0x3f, 0xab, + 0x34, 0xd5, 0x36, 0x18, 0x3c, 0xc6, 0x82, 0x97, 0xfd, 0x7d, 0x0b, 0x06, 0x7e, 0x86, 0x97, 0x44, + 0x3a, 0x58, 0x8b, 0x5b, 0xcb, 0x73, 0xd8, 0xb9, 0xbf, 0xfc, 0x20, 0x21, 0x41, 0xcc, 0x94, 0xcb, + 0xae, 0x43, 0xf4, 0x6b, 0x25, 0x18, 0xa5, 0x55, 0xc9, 0x70, 0x84, 0x57, 0x60, 0xdc, 0x77, 0xd6, + 0x89, 0x2f, 0x3d, 0xc1, 0x59, 0x53, 0xec, 0xba, 0x8e, 0xc4, 0x26, 0x2d, 0x2d, 0xbc, 0xa1, 0x3b, + 0xca, 0x85, 0x92, 0xa4, 0x0a, 0x1b, 0x5e, 0x74, 0x6c, 0xd2, 0x52, 0x5b, 0xe0, 0xbe, 0x93, 0x34, + 0xb6, 0x84, 0x99, 0xa6, 0x9a, 0x7b, 0x97, 0x02, 0x31, 0xc7, 0xa1, 0x05, 0x98, 0x94, 0x33, 0xf6, + 0x0e, 0xb5, 0xdf, 0xc3, 0x40, 0x28, 0x90, 0xea, 0xa2, 0x29, 0x36, 0xd1, 0x38, 0x4b, 0x8f, 0x3e, + 0x0e, 0x13, 0x74, 0x70, 0xc2, 0x76, 0x22, 0x83, 0x2d, 0x06, 0x59, 0xb0, 0x05, 0x8b, 0xd5, 0x5d, + 0x33, 0x30, 0x38, 0x43, 0x69, 0xbf, 0x09, 0x27, 0xaf, 0x87, 0x8e, 0xbb, 0xe8, 0xf8, 0x4e, 0xd0, + 0x20, 0xd1, 0x6a, 0xb0, 0x99, 0x7b, 0x2e, 0xad, 0x9f, 0x1d, 0x97, 0xf2, 0xce, 0x8e, 0xed, 0x08, + 0x90, 0x5e, 0x81, 0x08, 0x13, 0x7a, 0x03, 0x86, 0x3d, 0x5e, 0x95, 0x98, 0xb6, 0x17, 0xf3, 0x1c, + 0x4d, 0x1d, 0x6d, 0xd4, 0xc2, 0x5e, 0x38, 0x00, 0x4b, 0x96, 0xd4, 0xb6, 0xe8, 0xe6, 0x99, 0xca, + 0x37, 0xdf, 0xec, 0xbf, 0x62, 0xc1, 0xe4, 0xcd, 0xcc, 0x2d, 0xc6, 0xa7, 0x61, 0x28, 0x26, 0x51, + 0x17, 0x37, 0x5b, 0x9d, 0x41, 0xb1, 0xc0, 0x3e, 0x74, 0xd3, 0xfd, 0x57, 0x4a, 0x50, 0x61, 0x01, + 0xa7, 0x2d, 0x6a, 0x27, 0x1c, 0xbd, 0x9a, 0x7a, 0xc3, 0x50, 0x53, 0x73, 0xcc, 0x47, 0xd5, 0xb0, + 0x5e, 0x5a, 0x2a, 0xba, 0xad, 0x6e, 0xf7, 0x15, 0xb2, 0x1c, 0x53, 0x86, 0xfc, 0x06, 0xd8, 0x84, + 0x79, 0x19, 0x50, 0xde, 0xfc, 0x63, 0xa7, 0xb9, 0x8a, 0xf6, 0x7d, 0x77, 0x9a, 0xab, 0x5a, 0xd6, + 0x43, 0x38, 0xd5, 0xb4, 0xc6, 0x33, 0xf1, 0xfd, 0x49, 0x16, 0x46, 0xe8, 0xf8, 0xde, 0x17, 0x88, + 0xba, 0x24, 0x3b, 0x2b, 0xc2, 0x02, 0x05, 0x74, 0x9f, 0xc9, 0x19, 0xf1, 0x8f, 0xdf, 0x81, 0x4e, + 0x8b, 0xd8, 0x57, 0x61, 0x32, 0x33, 0x74, 0xe8, 0x25, 0x18, 0x6c, 0x6d, 0x39, 0x31, 0xc9, 0x04, + 0xa8, 0x0c, 0xd6, 0x28, 0x70, 0x7f, 0x77, 0x76, 0x42, 0x15, 0x60, 0x10, 0xcc, 0xa9, 0xed, 0xaf, + 0x94, 0x60, 0xe0, 0x66, 0xe8, 0x1e, 0xc7, 0x54, 0xbb, 0x6a, 0x4c, 0xb5, 0xa7, 0xf3, 0x33, 0x28, + 0xf4, 0x9c, 0x65, 0xb5, 0xcc, 0x2c, 0x3b, 0x5f, 0x80, 0xd7, 0xc1, 0x13, 0xac, 0x09, 0xa3, 0x2c, + 0x43, 0x83, 0x88, 0xd0, 0x79, 0xc1, 0xb0, 0xac, 0x66, 0x33, 0x96, 0xd5, 0xa4, 0x46, 0xaa, 0xd9, + 0x57, 0xcf, 0xc0, 0xb0, 0x88, 0x08, 0xc9, 0x06, 0x51, 0x0a, 0x5a, 0x2c, 0xf1, 0xf6, 0x3f, 0x2f, + 0x83, 0x91, 0x11, 0x02, 0xfd, 0xc8, 0x82, 0xb9, 0x88, 0x5f, 0x48, 0x71, 0xab, 0xed, 0xc8, 0x0b, + 0x36, 0xeb, 0x8d, 0x2d, 0xe2, 0xb6, 0x7d, 0x2f, 0xd8, 0x5c, 0xdd, 0x0c, 0x42, 0x05, 0x5e, 0x7e, + 0x40, 0x1a, 0x6d, 0xe6, 0x80, 0x2d, 0x9c, 0x88, 0x42, 0x9d, 0x86, 0x5e, 0xda, 0xdb, 0x9d, 0x9d, + 0xc3, 0x7d, 0xd5, 0x82, 0xfb, 0x6c, 0x15, 0xfa, 0x03, 0x0b, 0xe6, 0x79, 0x4e, 0x84, 0xe2, 0x3d, + 0x29, 0x64, 0x91, 0xd6, 0x24, 0xd3, 0x94, 0xdd, 0x1a, 0x89, 0x9a, 0x8b, 0x2f, 0x8b, 0x41, 0x9e, + 0xaf, 0xf5, 0x57, 0x2b, 0xee, 0xb7, 0x99, 0xf6, 0xbf, 0x2e, 0xc3, 0x38, 0x1d, 0xcf, 0xf4, 0x1e, + 0xf4, 0x4b, 0xc6, 0x34, 0x79, 0x22, 0x33, 0x4d, 0x4e, 0x18, 0xc4, 0x0f, 0xe7, 0x0a, 0x74, 0x0c, + 0x27, 0x7c, 0x27, 0x4e, 0xae, 0x12, 0x27, 0x4a, 0xd6, 0x89, 0xc3, 0x0e, 0x1d, 0xb3, 0x01, 0x0d, + 0x05, 0xce, 0x31, 0x55, 0x94, 0xd1, 0xf5, 0x2c, 0x33, 0xdc, 0xc9, 0x1f, 0x6d, 0x03, 0x62, 0x07, + 0x9c, 0x91, 0x13, 0xc4, 0xbc, 0x2f, 0x9e, 0x70, 0xd8, 0xf6, 0x57, 0xeb, 0x8c, 0xa8, 0x15, 0x5d, + 0xef, 0xe0, 0x86, 0xbb, 0xd4, 0xa0, 0x1d, 0x61, 0x0f, 0x16, 0x3d, 0xc2, 0x1e, 0xca, 0x89, 0x5e, + 0xfe, 0xaa, 0x05, 0x27, 0xe9, 0x67, 0x31, 0x23, 0x5d, 0x63, 0x14, 0xc2, 0x24, 0x9d, 0x76, 0x3e, + 0x49, 0x24, 0x4c, 0xac, 0xaf, 0x1c, 0xcd, 0xda, 0xe4, 0x93, 0xaa, 0x6f, 0xd7, 0x4c, 0x66, 0x38, + 0xcb, 0xdd, 0xfe, 0xb6, 0x05, 0x2c, 0x94, 0xee, 0x18, 0x36, 0xb3, 0x2b, 0xe6, 0x66, 0x66, 0xe7, + 0x4b, 0x8c, 0x1e, 0xfb, 0xd8, 0x8b, 0x30, 0x45, 0xb1, 0xb5, 0x28, 0x7c, 0xb0, 0x23, 0x15, 0xed, + 0x7c, 0xcf, 0xed, 0x57, 0x4b, 0x7c, 0xd9, 0xa8, 0x9b, 0x75, 0xe8, 0x97, 0x2d, 0x18, 0x69, 0x38, + 0x2d, 0xa7, 0xc1, 0xf3, 0xe9, 0x14, 0xf0, 0xce, 0x18, 0xe5, 0xe7, 0x96, 0x44, 0x59, 0xee, 0x59, + 0xf8, 0x88, 0xec, 0xba, 0x04, 0xe7, 0x7a, 0x13, 0x54, 0xe5, 0x33, 0xf7, 0x60, 0xdc, 0x60, 0x76, + 0xa4, 0x66, 0xe8, 0x2f, 0x5b, 0x5c, 0xe8, 0x2b, 0x53, 0xe1, 0x3e, 0x9c, 0x08, 0xb4, 0xff, 0x54, + 0x9c, 0x49, 0xcd, 0x78, 0xae, 0xb8, 0x58, 0x67, 0x52, 0x50, 0x0b, 0x1b, 0xcc, 0x30, 0xc4, 0x9d, + 0x75, 0xd8, 0x7f, 0xdf, 0x82, 0x47, 0x74, 0x42, 0xed, 0x2a, 0x64, 0x9e, 0xdf, 0xb8, 0x0a, 0x23, + 0x61, 0x8b, 0x44, 0x4e, 0x6a, 0x16, 0x9d, 0x97, 0xe3, 0x7f, 0x4b, 0xc0, 0xf7, 0x77, 0x67, 0x4f, + 0xe9, 0xdc, 0x25, 0x1c, 0xab, 0x92, 0xc8, 0x86, 0x21, 0x36, 0x2e, 0xb1, 0xb8, 0xc4, 0xca, 0xf2, + 0xcb, 0xb0, 0xd3, 0x92, 0x18, 0x0b, 0x8c, 0xfd, 0x37, 0x2c, 0x3e, 0xdd, 0xf4, 0xa6, 0xa3, 0x2f, + 0xc2, 0x54, 0x93, 0x5a, 0x50, 0xcb, 0x0f, 0x5a, 0x74, 0x23, 0x65, 0xe7, 0xc4, 0x56, 0x91, 0xed, + 0xa3, 0x47, 0x77, 0x17, 0xa7, 0x45, 0xeb, 0xa7, 0x6e, 0x64, 0xd8, 0xe2, 0x8e, 0x8a, 0xec, 0xff, + 0x22, 0xd6, 0x2c, 0xd3, 0xe1, 0x9e, 0x81, 0xe1, 0x56, 0xe8, 0x2e, 0xad, 0x56, 0xb1, 0x18, 0x2b, + 0x25, 0x74, 0x6a, 0x1c, 0x8c, 0x25, 0x1e, 0x5d, 0x02, 0x20, 0x0f, 0x12, 0x12, 0x05, 0x8e, 0xaf, + 0xce, 0x77, 0x95, 0xaa, 0xb4, 0xac, 0x30, 0x58, 0xa3, 0xa2, 0x65, 0x5a, 0x51, 0xb8, 0xed, 0xb9, + 0x2c, 0x86, 0xbf, 0x6c, 0x96, 0xa9, 0x29, 0x0c, 0xd6, 0xa8, 0xa8, 0xdd, 0xda, 0x0e, 0x62, 0xbe, + 0x8d, 0x39, 0xeb, 0x22, 0x1d, 0xca, 0x48, 0x6a, 0xb7, 0xde, 0xd6, 0x91, 0xd8, 0xa4, 0xb5, 0xff, + 0x63, 0x05, 0x20, 0x55, 0x94, 0xd0, 0x57, 0x3a, 0xd7, 0xe8, 0x47, 0x8b, 0x6a, 0x59, 0x0f, 0x6f, + 0x81, 0xa2, 0xaf, 0x5b, 0x30, 0xea, 0xf8, 0x7e, 0xd8, 0x70, 0x12, 0xd6, 0xa3, 0x52, 0x51, 0x69, + 0x21, 0x5a, 0xb2, 0x90, 0x96, 0xe5, 0x8d, 0x79, 0x41, 0x1e, 0xfe, 0x69, 0x98, 0xdc, 0xf6, 0xe8, + 0x4d, 0x40, 0x1f, 0x91, 0x8a, 0x36, 0xff, 0x28, 0x33, 0x59, 0x45, 0xbb, 0xc2, 0x64, 0xa4, 0xa6, + 0x63, 0xa3, 0x37, 0x8d, 0x8c, 0x1f, 0x03, 0x45, 0xee, 0x4e, 0x1a, 0xaa, 0x43, 0x5e, 0xb2, 0x0f, + 0xf4, 0x59, 0x3d, 0xbc, 0x79, 0xb0, 0xc8, 0xe5, 0x64, 0x4d, 0x83, 0xcd, 0x09, 0x6d, 0x4e, 0x60, + 0xd2, 0x35, 0x37, 0x4b, 0x11, 0xa2, 0x75, 0x31, 0xbf, 0x86, 0xcc, 0x2e, 0x9b, 0x6e, 0x8f, 0x19, + 0x04, 0xce, 0x56, 0x81, 0x3e, 0xcb, 0x83, 0xcf, 0x57, 0x83, 0x8d, 0x50, 0x84, 0x69, 0x5d, 0x28, + 0xf0, 0xcd, 0x77, 0xe2, 0x84, 0x34, 0x69, 0x99, 0x74, 0x3f, 0xbc, 0x29, 0xb8, 0x60, 0xc5, 0x0f, + 0xad, 0xc1, 0x10, 0xbb, 0x2a, 0x13, 0x4f, 0x8f, 0x14, 0x71, 0x9e, 0x99, 0x37, 0x44, 0x53, 0x25, + 0x84, 0xfd, 0x8d, 0xb1, 0xe0, 0x85, 0xae, 0xca, 0x3b, 0xe2, 0xf1, 0x6a, 0x70, 0x3b, 0x26, 0xec, + 0x8e, 0x78, 0x65, 0xf1, 0x43, 0xe9, 0xa5, 0x6f, 0x0e, 0xef, 0x9a, 0xf3, 0xcc, 0x28, 0x49, 0x75, + 0x11, 0xf1, 0x5f, 0xa6, 0x52, 0x9b, 0x86, 0x22, 0x0d, 0x35, 0x13, 0xaf, 0xa5, 0x83, 0x7d, 0xc7, + 0x64, 0x86, 0xb3, 0xdc, 0x8f, 0x75, 0x17, 0x9c, 0x09, 0x60, 0x2a, 0xbb, 0x28, 0x8f, 0x74, 0xd7, + 0xfd, 0xe9, 0x00, 0x4c, 0x98, 0x93, 0x03, 0xcd, 0x43, 0x45, 0x30, 0x51, 0xa9, 0x95, 0xd4, 0x1a, + 0xb8, 0x21, 0x11, 0x38, 0xa5, 0x61, 0x49, 0xa6, 0x58, 0x71, 0x2d, 0x40, 0x27, 0x4d, 0x32, 0xa5, + 0x30, 0x58, 0xa3, 0xa2, 0xca, 0xeb, 0x7a, 0x18, 0x26, 0x4a, 0x78, 0xab, 0x79, 0xb3, 0xc8, 0xa0, + 0x58, 0x60, 0xa9, 0xd0, 0xbe, 0x47, 0x3f, 0xa6, 0x6f, 0x3a, 0x02, 0x95, 0xd0, 0xbe, 0xa6, 0x23, + 0xb1, 0x49, 0x4b, 0x37, 0xa1, 0x30, 0x66, 0x13, 0x51, 0xa8, 0xc8, 0x69, 0xc0, 0x53, 0x9d, 0x5f, + 0x1f, 0x93, 0x78, 0xf4, 0x19, 0x78, 0x44, 0xdd, 0xf6, 0xc2, 0xdc, 0xb1, 0x2a, 0x6b, 0x1c, 0x32, + 0xac, 0xdc, 0x47, 0x96, 0xba, 0x93, 0xe1, 0x5e, 0xe5, 0xd1, 0xab, 0x30, 0x21, 0xd4, 0x5b, 0xc9, + 0x71, 0xd8, 0x3c, 0x0d, 0xbf, 0x66, 0x60, 0x71, 0x86, 0x1a, 0x55, 0x61, 0x8a, 0x42, 0x98, 0x5e, + 0x29, 0x39, 0xf0, 0x5b, 0x6b, 0x6a, 0x77, 0xbe, 0x96, 0xc1, 0xe3, 0x8e, 0x12, 0x68, 0x01, 0x26, + 0xb9, 0x7e, 0x41, 0x6d, 0x39, 0xf6, 0x1d, 0x44, 0x6c, 0xa5, 0x5a, 0x08, 0xb7, 0x4c, 0x34, 0xce, + 0xd2, 0xa3, 0xcb, 0x30, 0xe6, 0x44, 0x8d, 0x2d, 0x2f, 0x21, 0x8d, 0xa4, 0x1d, 0xf1, 0x0c, 0x0c, + 0x5a, 0x38, 0xc1, 0x82, 0x86, 0xc3, 0x06, 0xa5, 0xfd, 0x05, 0x38, 0xd9, 0x25, 0x90, 0x9b, 0x4e, + 0x1c, 0xa7, 0xe5, 0xc9, 0x3e, 0x65, 0x42, 0x97, 0x16, 0x6a, 0xab, 0xb2, 0x37, 0x1a, 0x15, 0x9d, + 0x9d, 0xcc, 0xa3, 0xac, 0x65, 0x3e, 0x54, 0xb3, 0x73, 0x45, 0x22, 0x70, 0x4a, 0x63, 0xff, 0x69, + 0x05, 0x34, 0x87, 0x4b, 0x81, 0x70, 0x95, 0xcb, 0x30, 0x26, 0x93, 0x79, 0x6a, 0x49, 0xf4, 0x54, + 0x37, 0xaf, 0x68, 0x38, 0x6c, 0x50, 0xd2, 0xb6, 0x05, 0xd2, 0x8d, 0x94, 0x0d, 0x94, 0x52, 0xfe, + 0x25, 0x9c, 0xd2, 0xa0, 0x0b, 0x30, 0x12, 0x13, 0x7f, 0xe3, 0xba, 0x17, 0xdc, 0x13, 0x13, 0x5b, + 0x49, 0xe6, 0xba, 0x80, 0x63, 0x45, 0x81, 0x16, 0xa1, 0xdc, 0xf6, 0x5c, 0x31, 0x95, 0xa5, 0xda, + 0x50, 0xbe, 0xbd, 0x5a, 0xdd, 0xdf, 0x9d, 0x7d, 0xa2, 0x57, 0x8e, 0x52, 0x6a, 0x52, 0xc7, 0x73, + 0x74, 0xf9, 0xd1, 0xc2, 0xdd, 0x5c, 0xeb, 0x43, 0x7d, 0xba, 0xd6, 0x2f, 0x01, 0x88, 0x5e, 0xcb, + 0xb9, 0x5c, 0x4e, 0xbf, 0xda, 0x15, 0x85, 0xc1, 0x1a, 0x15, 0x35, 0xcc, 0x1b, 0x11, 0x71, 0xa4, + 0xed, 0xca, 0x03, 0x8c, 0x47, 0x0e, 0x6f, 0x98, 0x2f, 0x65, 0x99, 0xe1, 0x4e, 0xfe, 0x28, 0x84, + 0x13, 0x2e, 0x5d, 0x48, 0x46, 0xa5, 0x95, 0xfe, 0xa3, 0x9a, 0x69, 0x85, 0xd5, 0x2c, 0x23, 0xdc, + 0xc9, 0x1b, 0x7d, 0x1e, 0x66, 0x24, 0xb0, 0xf3, 0x3e, 0x27, 0x5b, 0x2e, 0xe5, 0xc5, 0xb3, 0x7b, + 0xbb, 0xb3, 0x33, 0xd5, 0x9e, 0x54, 0xf8, 0x00, 0x0e, 0xe8, 0x0d, 0x18, 0x62, 0x47, 0x31, 0xf1, + 0xf4, 0x28, 0xdb, 0xf1, 0x5e, 0x2c, 0x12, 0x1b, 0x4f, 0x67, 0xfd, 0x1c, 0x3b, 0xd0, 0x11, 0x51, + 0x9f, 0xe9, 0xf9, 0x16, 0x03, 0x62, 0xc1, 0x13, 0xb5, 0x60, 0xd4, 0x09, 0x82, 0x30, 0x71, 0xb8, + 0x22, 0x36, 0x56, 0x44, 0x97, 0xd4, 0xaa, 0x58, 0x48, 0xcb, 0xf2, 0x7a, 0x54, 0x20, 0x99, 0x86, + 0xc1, 0x7a, 0x15, 0xe8, 0x3e, 0x4c, 0x86, 0xf7, 0xa9, 0xc0, 0x94, 0xa7, 0x11, 0xf1, 0xf4, 0xb8, + 0xd9, 0xb1, 0x1c, 0xdf, 0xaa, 0x51, 0x58, 0x93, 0x64, 0x26, 0x53, 0x9c, 0xad, 0x05, 0xcd, 0x19, + 0x1e, 0xe6, 0x89, 0x34, 0xb6, 0x39, 0xf5, 0x30, 0xeb, 0x0e, 0x65, 0x76, 0x67, 0x98, 0xc7, 0x33, + 0x32, 0x89, 0x30, 0x99, 0xb9, 0x33, 0x9c, 0xa2, 0xb0, 0x4e, 0x37, 0xf3, 0x31, 0x18, 0xd5, 0x06, + 0xbe, 0x9f, 0x20, 0xda, 0x99, 0x57, 0x61, 0x2a, 0x3b, 0xa0, 0x7d, 0x05, 0xe1, 0xfe, 0xaf, 0x12, + 0x4c, 0x76, 0x39, 0xea, 0xb9, 0xe7, 0xb1, 0x40, 0x70, 0x43, 0xf4, 0x5d, 0xf3, 0x02, 0x17, 0x33, + 0x8c, 0x29, 0xc0, 0x4a, 0x05, 0x04, 0x98, 0x94, 0xa6, 0xe5, 0x9e, 0xd2, 0x54, 0x08, 0xad, 0x81, + 0xf7, 0x22, 0xb4, 0xcc, 0x7d, 0x62, 0xb0, 0xd0, 0x3e, 0xf1, 0x10, 0x04, 0x9d, 0xb1, 0xd5, 0x0c, + 0x17, 0xd8, 0x6a, 0xbe, 0x55, 0x82, 0xa9, 0x34, 0xe0, 0x58, 0x64, 0xf8, 0x3d, 0xfa, 0x93, 0x83, + 0x35, 0xe3, 0xe4, 0x20, 0x2f, 0x81, 0x6f, 0xa6, 0x7d, 0x3d, 0x4f, 0x11, 0xde, 0xc8, 0x9c, 0x22, + 0xbc, 0xd8, 0x27, 0xdf, 0x83, 0x4f, 0x14, 0xbe, 0x57, 0x82, 0xd3, 0xd9, 0x22, 0x4b, 0xbe, 0xe3, + 0x35, 0x8f, 0x61, 0xbc, 0x3e, 0x63, 0x8c, 0xd7, 0xcb, 0xfd, 0xf5, 0x8b, 0x35, 0xb2, 0xe7, 0xa0, + 0x39, 0x99, 0x41, 0xfb, 0xd8, 0x61, 0x98, 0x1f, 0x3c, 0x72, 0xbf, 0x67, 0xc1, 0xa3, 0x5d, 0xcb, + 0x1d, 0x83, 0xaf, 0xf4, 0x75, 0xd3, 0x57, 0xfa, 0xc2, 0x21, 0x7a, 0xd7, 0xc3, 0x79, 0xfa, 0xdf, + 0x4b, 0x3d, 0x7a, 0xc5, 0xbc, 0x49, 0xb7, 0x60, 0xd4, 0x69, 0x34, 0x48, 0x1c, 0xdf, 0x08, 0x5d, + 0x95, 0x7d, 0xe8, 0x79, 0xb6, 0xb7, 0xa4, 0xe0, 0xfd, 0xdd, 0xd9, 0x99, 0x2c, 0x8b, 0x14, 0x8d, + 0x75, 0x0e, 0x66, 0x5e, 0xb4, 0xd2, 0x11, 0xe5, 0x45, 0xbb, 0x04, 0xb0, 0xad, 0xac, 0xd8, 0xac, + 0x93, 0x4a, 0xb3, 0x6f, 0x35, 0x2a, 0xf4, 0x17, 0x99, 0x46, 0xc8, 0xe3, 0x2a, 0x06, 0xcc, 0xbb, + 0x8b, 0x39, 0xdf, 0x4f, 0x8f, 0xd1, 0xe0, 0x57, 0x24, 0x95, 0x43, 0x4f, 0xb1, 0xb4, 0xbf, 0x5b, + 0x86, 0x0f, 0x1e, 0x30, 0xe9, 0xd0, 0x82, 0x79, 0x4c, 0xfa, 0x5c, 0xd6, 0x7b, 0x33, 0xd3, 0xb5, + 0xb0, 0xe1, 0xce, 0xc9, 0x7c, 0xab, 0xd2, 0x7b, 0xfe, 0x56, 0xdf, 0xd0, 0x7d, 0x6d, 0x3c, 0x50, + 0xf2, 0xca, 0xa1, 0x97, 0xd5, 0xcf, 0xab, 0x77, 0xfc, 0xcb, 0x16, 0x3c, 0xd1, 0xb5, 0x5b, 0x46, + 0x58, 0xc6, 0x3c, 0x54, 0x1a, 0x14, 0xa8, 0xdd, 0x6a, 0x49, 0xaf, 0x93, 0x49, 0x04, 0x4e, 0x69, + 0x8c, 0xe8, 0x8b, 0x52, 0x6e, 0xf4, 0xc5, 0xef, 0x58, 0x70, 0x2a, 0xdb, 0x88, 0x63, 0x90, 0x3a, + 0x75, 0x53, 0xea, 0xcc, 0xf5, 0xf7, 0xf1, 0x7b, 0x08, 0x9c, 0x5f, 0x1d, 0x87, 0x33, 0x1d, 0x7b, + 0x16, 0x1f, 0xc5, 0x5f, 0xb0, 0xe0, 0xc4, 0x26, 0xd3, 0xbd, 0xb5, 0xab, 0x43, 0xa2, 0x5f, 0x39, + 0xf7, 0xad, 0x0e, 0xbc, 0x71, 0xc4, 0x2d, 0x89, 0x0e, 0x12, 0xdc, 0x59, 0x19, 0xfa, 0x9a, 0x05, + 0xa7, 0x9c, 0xfb, 0x71, 0xc7, 0xeb, 0x11, 0x62, 0x22, 0xbd, 0x9a, 0xe3, 0xea, 0xca, 0x79, 0x77, + 0x62, 0x71, 0x7a, 0x6f, 0x77, 0xf6, 0x54, 0x37, 0x2a, 0xdc, 0xb5, 0x56, 0xfa, 0x7d, 0xb7, 0xc4, + 0xc5, 0x84, 0x62, 0x97, 0xe0, 0xba, 0x5d, 0x63, 0xe0, 0x42, 0x49, 0x62, 0xb0, 0xe2, 0x88, 0xde, + 0x82, 0xca, 0xa6, 0xbc, 0x2d, 0x94, 0x15, 0x7a, 0x3d, 0x86, 0xb9, 0xdb, 0xe5, 0x22, 0x1e, 0x2c, + 0xaf, 0x50, 0x38, 0x65, 0x8a, 0xae, 0x42, 0x39, 0xd8, 0x88, 0xc5, 0xbd, 0xdc, 0xbc, 0xa0, 0x1b, + 0x33, 0xd4, 0x89, 0x5f, 0x65, 0xbc, 0xb9, 0x52, 0xc7, 0x94, 0x05, 0xe5, 0x14, 0xad, 0xbb, 0xc2, + 0xc7, 0x9b, 0xc3, 0x09, 0x2f, 0x56, 0x3b, 0x39, 0xe1, 0xc5, 0x2a, 0xa6, 0x2c, 0x50, 0x0d, 0x06, + 0xd9, 0xb5, 0x07, 0xe1, 0xc0, 0xcd, 0xb9, 0xbc, 0xdd, 0x71, 0xb9, 0x83, 0x27, 0xdf, 0x63, 0x60, + 0xcc, 0x19, 0xa1, 0x35, 0x18, 0x6a, 0xb0, 0x44, 0xe9, 0xc2, 0xb2, 0xce, 0x4b, 0x6b, 0xd0, 0x91, + 0x54, 0x9d, 0x1f, 0x34, 0x71, 0x38, 0x16, 0xbc, 0x18, 0x57, 0xd2, 0xda, 0xda, 0x88, 0x85, 0xe9, + 0x9c, 0xc7, 0xb5, 0x23, 0xe5, 0xbd, 0xe0, 0xca, 0xe0, 0x58, 0xf0, 0x42, 0x55, 0x28, 0x6d, 0x34, + 0x44, 0x0e, 0xcf, 0x1c, 0xc7, 0xad, 0x79, 0x2f, 0x75, 0x71, 0x68, 0x6f, 0x77, 0xb6, 0xb4, 0xb2, + 0x84, 0x4b, 0x1b, 0x0d, 0xf4, 0x3a, 0x0c, 0x6f, 0xf0, 0x9b, 0x86, 0x22, 0x5f, 0xe7, 0xc5, 0xbc, + 0xeb, 0x90, 0x1d, 0xd7, 0x12, 0xf9, 0x85, 0x08, 0x81, 0xc0, 0x92, 0x1d, 0x4b, 0x65, 0xa6, 0xee, + 0x4e, 0x8a, 0x84, 0x9d, 0x73, 0xfd, 0xdd, 0xb5, 0x14, 0x16, 0xa5, 0x82, 0x62, 0x8d, 0x23, 0x9d, + 0xf3, 0x8e, 0x7c, 0xf3, 0x81, 0x25, 0xeb, 0xcc, 0x9d, 0xf3, 0x5d, 0x9f, 0x88, 0xe0, 0x73, 0x5e, + 0xa1, 0x70, 0xca, 0x14, 0xb5, 0x61, 0x7c, 0x3b, 0x6e, 0x6d, 0x11, 0xb9, 0xf4, 0x59, 0x06, 0xcf, + 0xd1, 0x4b, 0x9f, 0xc8, 0x49, 0xcb, 0x2a, 0x8a, 0x78, 0x51, 0xd2, 0x76, 0xfc, 0x0e, 0x09, 0xc6, + 0x72, 0x47, 0xdd, 0xd1, 0xd9, 0x62, 0xb3, 0x16, 0xfa, 0x49, 0xde, 0x69, 0x87, 0xeb, 0x3b, 0x09, + 0x11, 0x19, 0x3e, 0x73, 0x3e, 0xc9, 0x6b, 0x9c, 0xb8, 0xf3, 0x93, 0x08, 0x04, 0x96, 0xec, 0xd4, + 0x90, 0x31, 0x69, 0x3c, 0x55, 0x78, 0xc8, 0x3a, 0xfa, 0x90, 0x0e, 0x19, 0x93, 0xbe, 0x29, 0x53, + 0x26, 0x75, 0x5b, 0x5b, 0x61, 0x12, 0x06, 0x19, 0xd9, 0x7f, 0xa2, 0x88, 0xd4, 0xad, 0x75, 0x29, + 0xd9, 0x29, 0x75, 0xbb, 0x51, 0xe1, 0xae, 0xb5, 0xda, 0xff, 0x75, 0xb0, 0x73, 0xbb, 0x65, 0xea, + 0xf0, 0x5f, 0xef, 0x3c, 0x7d, 0xfc, 0x54, 0xff, 0x56, 0xdf, 0x43, 0x3c, 0x87, 0xfc, 0x9a, 0x05, + 0x67, 0x5a, 0x5d, 0x37, 0x53, 0xb1, 0x61, 0xf5, 0x6b, 0x3c, 0xf2, 0x01, 0x53, 0xe9, 0x6b, 0xbb, + 0xe3, 0x71, 0x8f, 0x3a, 0xb3, 0x2a, 0x68, 0xf9, 0x3d, 0xab, 0xa0, 0x77, 0x61, 0x84, 0xe9, 0x4c, + 0x69, 0xae, 0x8d, 0x3e, 0xd3, 0x52, 0xb0, 0xad, 0x6f, 0x49, 0xb0, 0xc0, 0x8a, 0x19, 0x1d, 0xb8, + 0xc7, 0xb3, 0x9d, 0xc0, 0x84, 0xa1, 0x45, 0x8a, 0x57, 0xee, 0xed, 0x58, 0x11, 0x23, 0xf1, 0x78, + 0xed, 0x20, 0xe2, 0xfd, 0x3c, 0x02, 0x7c, 0x70, 0x65, 0xc7, 0xab, 0xd2, 0xfe, 0x23, 0xab, 0x8b, + 0x06, 0xc6, 0xcd, 0x90, 0x4f, 0x98, 0x66, 0xc8, 0xd3, 0x59, 0x33, 0xa4, 0xc3, 0x75, 0x60, 0x58, + 0x20, 0xc5, 0xd3, 0x35, 0x16, 0x4d, 0x03, 0x62, 0xfb, 0x70, 0x2e, 0x6f, 0x79, 0xb3, 0x58, 0x1f, + 0x57, 0x1d, 0x99, 0xa5, 0xb1, 0x3e, 0xee, 0x6a, 0x15, 0x33, 0x4c, 0xd1, 0x9b, 0xe4, 0xf6, 0x2f, + 0x96, 0xa0, 0x5c, 0x0b, 0xdd, 0x63, 0x70, 0x85, 0x5c, 0x31, 0x5c, 0x21, 0x4f, 0xe5, 0xbe, 0x79, + 0xd5, 0xd3, 0xf1, 0x71, 0x2b, 0xe3, 0xf8, 0xf8, 0x70, 0x3e, 0xab, 0x83, 0xdd, 0x1c, 0xdf, 0x2f, + 0x83, 0xfe, 0x6a, 0x17, 0xfa, 0x0f, 0x87, 0x09, 0x01, 0x2d, 0x17, 0x7b, 0xc8, 0x4b, 0xd4, 0xc1, + 0x42, 0x85, 0xe4, 0xc5, 0xb1, 0x9f, 0xdb, 0x48, 0xd0, 0xbb, 0xc4, 0xdb, 0xdc, 0x4a, 0x88, 0x9b, + 0xed, 0xd8, 0xf1, 0x45, 0x82, 0xfe, 0x89, 0x05, 0x93, 0x99, 0xda, 0x91, 0xdf, 0xed, 0xc6, 0xc9, + 0x21, 0x9d, 0x1b, 0x27, 0x72, 0xaf, 0xa8, 0xcc, 0x01, 0x28, 0x1f, 0xb5, 0x74, 0x41, 0x30, 0x6d, + 0x4c, 0x39, 0xb1, 0x63, 0xac, 0x51, 0xa0, 0x97, 0x60, 0x34, 0x09, 0x5b, 0xa1, 0x1f, 0x6e, 0xee, + 0x5c, 0x23, 0x32, 0xc7, 0x81, 0xf2, 0xef, 0xaf, 0xa5, 0x28, 0xac, 0xd3, 0xd9, 0x3f, 0x28, 0x43, + 0xf6, 0xcd, 0xb7, 0x3f, 0x9f, 0xa7, 0x3f, 0x3f, 0xf3, 0xf4, 0xf7, 0x2d, 0x98, 0xa2, 0xb5, 0xb3, + 0x40, 0x0f, 0x19, 0xb1, 0xa9, 0x72, 0xc7, 0x5b, 0x07, 0xe4, 0x8e, 0x7f, 0x9a, 0x4a, 0x3b, 0x37, + 0x6c, 0x27, 0xc2, 0x69, 0xa2, 0x09, 0x31, 0x0a, 0xc5, 0x02, 0x2b, 0xe8, 0x48, 0x14, 0x89, 0xab, + 0x2d, 0x3a, 0x1d, 0x89, 0x22, 0x2c, 0xb0, 0x32, 0xb5, 0xfc, 0x40, 0x8f, 0xd4, 0xf2, 0x2c, 0x4b, + 0x90, 0x08, 0x2e, 0x10, 0x0a, 0x81, 0x96, 0x25, 0x48, 0x46, 0x1d, 0xa4, 0x34, 0xf6, 0x77, 0xca, + 0x30, 0x56, 0x0b, 0xdd, 0x34, 0x14, 0xfb, 0x45, 0x23, 0x14, 0xfb, 0x5c, 0x26, 0x14, 0x7b, 0x4a, + 0xa7, 0x7d, 0x38, 0x91, 0xd8, 0x22, 0x9b, 0x14, 0x7b, 0xfc, 0xe0, 0x90, 0x51, 0xd8, 0x46, 0x36, + 0x29, 0xc5, 0x08, 0x9b, 0x7c, 0xff, 0x2c, 0x45, 0x5f, 0xff, 0x1f, 0x0b, 0x26, 0x6a, 0xa1, 0x4b, + 0x27, 0xe8, 0x9f, 0xa5, 0xd9, 0xa8, 0xe7, 0xa0, 0x1a, 0x3a, 0x20, 0x07, 0xd5, 0x3f, 0xb5, 0x60, + 0xb8, 0x16, 0xba, 0xc7, 0xe0, 0x50, 0x5c, 0x31, 0x1d, 0x8a, 0x4f, 0xe4, 0x4a, 0xde, 0x1e, 0x3e, + 0xc4, 0xef, 0x96, 0x61, 0x9c, 0xb6, 0x38, 0xdc, 0x94, 0xdf, 0xcb, 0x18, 0x1b, 0xab, 0xc0, 0xd8, + 0x50, 0x95, 0x30, 0xf4, 0xfd, 0xf0, 0x7e, 0xf6, 0xdb, 0xad, 0x30, 0x28, 0x16, 0x58, 0x74, 0x01, + 0x46, 0x5a, 0x11, 0xd9, 0xf6, 0xc2, 0x76, 0x9c, 0xbd, 0x26, 0x57, 0x13, 0x70, 0xac, 0x28, 0xd0, + 0x8b, 0x30, 0x16, 0x7b, 0x41, 0x83, 0xc8, 0xd0, 0x83, 0x01, 0x16, 0x7a, 0xc0, 0xd3, 0xfd, 0x69, + 0x70, 0x6c, 0x50, 0xa1, 0xbb, 0x50, 0x61, 0xff, 0xd9, 0x0a, 0xea, 0x3f, 0x37, 0x3c, 0xcf, 0x71, + 0x25, 0x19, 0xe0, 0x94, 0x17, 0xba, 0x04, 0x90, 0xc8, 0x20, 0x89, 0x58, 0x64, 0xea, 0x50, 0x7a, + 0xa9, 0x0a, 0x9f, 0x88, 0xb1, 0x46, 0x85, 0x9e, 0x83, 0x4a, 0xe2, 0x78, 0xfe, 0x75, 0x2f, 0x20, + 0xb1, 0x08, 0x32, 0x11, 0xa9, 0x7b, 0x05, 0x10, 0xa7, 0x78, 0xba, 0xdf, 0xb3, 0x4b, 0xba, 0xfc, + 0xdd, 0x89, 0x11, 0x46, 0xcd, 0xf6, 0xfb, 0xeb, 0x0a, 0x8a, 0x35, 0x0a, 0xfb, 0x32, 0x9c, 0xae, + 0x85, 0x6e, 0x2d, 0x8c, 0x92, 0x95, 0x30, 0xba, 0xef, 0x44, 0xae, 0xfc, 0x7e, 0xb3, 0x32, 0x63, + 0x2c, 0xdd, 0x93, 0x07, 0xb9, 0x8f, 0xcd, 0xc8, 0x00, 0xfb, 0x02, 0xdb, 0xf1, 0xfb, 0x8c, 0xf1, + 0xff, 0x49, 0x09, 0x50, 0x8d, 0x85, 0x71, 0x18, 0xcf, 0x94, 0x6c, 0xc1, 0x44, 0x4c, 0xae, 0x7b, + 0x41, 0xfb, 0x81, 0x60, 0x55, 0xec, 0x52, 0x45, 0x7d, 0x59, 0x2f, 0xc3, 0x6f, 0xb4, 0x9a, 0x30, + 0x9c, 0xe1, 0x4b, 0x07, 0x33, 0x6a, 0x07, 0x0b, 0xf1, 0xed, 0x98, 0x44, 0xe2, 0x59, 0x0e, 0x36, + 0x98, 0x58, 0x02, 0x71, 0x8a, 0xa7, 0x93, 0x87, 0xfd, 0xb9, 0x19, 0x06, 0x38, 0x0c, 0x13, 0x39, + 0xdd, 0x58, 0x9a, 0x76, 0x0d, 0x8e, 0x0d, 0x2a, 0xb4, 0x02, 0x28, 0x6e, 0xb7, 0x5a, 0x3e, 0x3b, + 0x19, 0x73, 0xfc, 0x2b, 0x51, 0xd8, 0x6e, 0xf1, 0x68, 0x5e, 0x91, 0xe1, 0xbc, 0xde, 0x81, 0xc5, + 0x5d, 0x4a, 0x50, 0x61, 0xb1, 0x11, 0xb3, 0xdf, 0xe2, 0xc6, 0x2e, 0xf7, 0xcf, 0xd5, 0x19, 0x08, + 0x4b, 0x9c, 0xfd, 0x25, 0xb6, 0xc1, 0xb1, 0xf7, 0x12, 0x92, 0x76, 0x44, 0x50, 0x13, 0xc6, 0x5b, + 0x6c, 0x13, 0x4b, 0xa2, 0xd0, 0xf7, 0x89, 0xd4, 0x2f, 0x0f, 0x17, 0x48, 0xc2, 0x33, 0xa4, 0xeb, + 0xec, 0xb0, 0xc9, 0xdd, 0xfe, 0xc3, 0x51, 0x26, 0xab, 0xc4, 0xe1, 0xe4, 0xb0, 0x08, 0x19, 0x15, + 0x9a, 0xdc, 0x87, 0x8a, 0xbc, 0x7c, 0x94, 0xee, 0x03, 0x22, 0x00, 0x15, 0x4b, 0x2e, 0xe8, 0x73, + 0x2c, 0x20, 0x9a, 0x0b, 0x88, 0xe2, 0x0f, 0x97, 0x71, 0x7a, 0x23, 0x18, 0x5a, 0xb0, 0xc0, 0x1a, + 0x3b, 0x74, 0x1d, 0xc6, 0x45, 0x7a, 0x7d, 0xe1, 0x60, 0x28, 0x1b, 0x26, 0xf6, 0x38, 0xd6, 0x91, + 0xfb, 0x59, 0x00, 0x36, 0x0b, 0xa3, 0x4d, 0x78, 0x5c, 0x7b, 0x3e, 0xa6, 0x4b, 0xd0, 0x13, 0x97, + 0x3c, 0x4f, 0xec, 0xed, 0xce, 0x3e, 0xbe, 0x76, 0x10, 0x21, 0x3e, 0x98, 0x0f, 0xba, 0x05, 0xa7, + 0x9d, 0x46, 0xe2, 0x6d, 0x93, 0x2a, 0x71, 0x5c, 0xdf, 0x0b, 0x88, 0x79, 0xad, 0xfb, 0xd1, 0xbd, + 0xdd, 0xd9, 0xd3, 0x0b, 0xdd, 0x08, 0x70, 0xf7, 0x72, 0xe8, 0x13, 0x50, 0x71, 0x83, 0x58, 0x8c, + 0xc1, 0x90, 0xf1, 0x5a, 0x52, 0xa5, 0x7a, 0xb3, 0xae, 0xfa, 0x9f, 0xfe, 0xc1, 0x69, 0x01, 0xf4, + 0x0e, 0x7f, 0xf6, 0x5a, 0x59, 0x33, 0xfc, 0x95, 0xae, 0x97, 0x0b, 0xd9, 0xcf, 0xc6, 0x65, 0x0b, + 0xee, 0x7b, 0x53, 0xc1, 0x85, 0xc6, 0x3d, 0x0c, 0xa3, 0x0a, 0xf4, 0x69, 0x40, 0x31, 0x89, 0xb6, + 0xbd, 0x06, 0x59, 0x68, 0xb0, 0x1c, 0x99, 0xec, 0x90, 0x6f, 0xc4, 0x88, 0xb2, 0x47, 0xf5, 0x0e, + 0x0a, 0xdc, 0xa5, 0x14, 0xba, 0x4a, 0x25, 0x8f, 0x0e, 0x15, 0xb1, 0xa0, 0x52, 0x31, 0x9c, 0xae, + 0x92, 0x56, 0x44, 0x1a, 0x4e, 0x42, 0x5c, 0x93, 0x23, 0xce, 0x94, 0xa3, 0xfb, 0x92, 0x4a, 0x83, + 0x0e, 0x66, 0x04, 0x63, 0x67, 0x2a, 0x74, 0x6a, 0x67, 0x6d, 0x85, 0x71, 0x72, 0x93, 0x24, 0xf7, + 0xc3, 0xe8, 0x1e, 0xf3, 0xd9, 0x8f, 0x68, 0x09, 0xc7, 0x52, 0x14, 0xd6, 0xe9, 0xa8, 0x0e, 0xc5, + 0x0e, 0x8b, 0x56, 0xab, 0xcc, 0x13, 0x3f, 0x92, 0xae, 0x9d, 0xab, 0x1c, 0x8c, 0x25, 0x5e, 0x92, + 0xae, 0xd6, 0x96, 0x98, 0x57, 0x3d, 0x43, 0xba, 0x5a, 0x5b, 0xc2, 0x12, 0x8f, 0xc2, 0xce, 0x37, + 0xa9, 0x26, 0x8a, 0x9c, 0x70, 0x74, 0x4a, 0xf2, 0x82, 0xcf, 0x52, 0x3d, 0x80, 0x29, 0xf5, 0x2e, + 0x16, 0xcf, 0x05, 0x19, 0x4f, 0x4f, 0x16, 0x79, 0x74, 0xbb, 0x6b, 0x4a, 0x49, 0x15, 0xfc, 0xbb, + 0x9a, 0xe1, 0x89, 0x3b, 0x6a, 0x31, 0xd2, 0x13, 0x4c, 0xe5, 0xa6, 0xb6, 0x9f, 0x87, 0x4a, 0xdc, + 0x5e, 0x77, 0xc3, 0xa6, 0xe3, 0x05, 0xcc, 0xf5, 0xad, 0x3f, 0x21, 0x2d, 0x11, 0x38, 0xa5, 0x41, + 0x35, 0x18, 0x71, 0xe4, 0xeb, 0xe9, 0xa8, 0xc8, 0xf5, 0x65, 0xf5, 0x6c, 0x3a, 0xf3, 0x8b, 0xaa, + 0xf7, 0xd2, 0x15, 0x17, 0xf4, 0x0a, 0x8c, 0x8b, 0xdb, 0x37, 0x24, 0x62, 0xad, 0x3e, 0x69, 0x86, + 0x7d, 0xd7, 0x25, 0x92, 0x4d, 0x30, 0x93, 0x76, 0xe6, 0x93, 0x70, 0xa2, 0x63, 0x89, 0xf5, 0x15, + 0x3c, 0xf7, 0xef, 0x06, 0xa0, 0xa2, 0x3c, 0x54, 0x68, 0xde, 0x74, 0x46, 0x3e, 0x9a, 0x75, 0x46, + 0x8e, 0x50, 0x85, 0x40, 0xf7, 0x3f, 0x7e, 0xbe, 0xcb, 0x13, 0xb6, 0xcf, 0xe6, 0xce, 0xa9, 0xe2, + 0xf7, 0x59, 0xfa, 0x78, 0xe8, 0x37, 0xb5, 0x52, 0x06, 0x0e, 0xb4, 0x52, 0x0a, 0xbe, 0x56, 0x45, + 0xed, 0x91, 0x56, 0xe8, 0xae, 0xd6, 0xb2, 0x8f, 0xb1, 0xd4, 0x28, 0x10, 0x73, 0x1c, 0xd3, 0x23, + 0xe9, 0x1e, 0xc1, 0xf4, 0xc8, 0xe1, 0x43, 0xea, 0x91, 0x92, 0x01, 0x4e, 0x79, 0xa1, 0x6d, 0x38, + 0xd1, 0x30, 0xdf, 0xd6, 0x51, 0xb7, 0x54, 0x9e, 0xef, 0xe3, 0x6d, 0x9b, 0xb6, 0xf6, 0x8e, 0xc0, + 0x52, 0x96, 0x1f, 0xee, 0xac, 0x02, 0xbd, 0x02, 0x23, 0xef, 0x84, 0xf1, 0x92, 0xef, 0xc4, 0xb1, + 0x10, 0x94, 0xf2, 0x36, 0xc0, 0xc8, 0x6b, 0xb7, 0xea, 0x0c, 0xbe, 0xbf, 0x3b, 0x3b, 0x5a, 0x0b, + 0x5d, 0xf9, 0x17, 0xab, 0x02, 0xf6, 0x6f, 0x73, 0x6f, 0x98, 0xb0, 0x8f, 0x49, 0xdc, 0xf6, 0x8f, + 0x23, 0x9d, 0xf6, 0x2d, 0xc3, 0x74, 0x7f, 0x08, 0xfe, 0xd8, 0x7f, 0x6f, 0x31, 0x7f, 0xec, 0x1a, + 0x69, 0xb6, 0x7c, 0x27, 0x39, 0x8e, 0xb0, 0xc6, 0xcf, 0xc1, 0x48, 0x22, 0x6a, 0x2b, 0x96, 0x0b, + 0x5c, 0x6b, 0x1e, 0xf3, 0x53, 0x2b, 0x19, 0x27, 0xa1, 0x58, 0x31, 0xb4, 0xff, 0x15, 0xff, 0x2a, + 0x12, 0x73, 0x0c, 0x46, 0xe7, 0x4d, 0xd3, 0xe8, 0x7c, 0xa6, 0x70, 0x5f, 0x7a, 0x18, 0x9f, 0x3f, + 0x30, 0x7b, 0xc0, 0x54, 0xd1, 0x9f, 0x9f, 0x03, 0x03, 0xfb, 0x16, 0x98, 0x6f, 0x10, 0xa1, 0x57, + 0x79, 0xa0, 0x30, 0x17, 0xb2, 0x17, 0xfa, 0x0e, 0x12, 0xb6, 0x7f, 0xbd, 0x04, 0xa7, 0xb8, 0xcb, + 0x70, 0x61, 0x3b, 0xf4, 0xdc, 0x5a, 0xe8, 0x8a, 0xb0, 0x69, 0x17, 0xc6, 0x5a, 0x9a, 0xa9, 0x50, + 0x2c, 0x33, 0x84, 0x6e, 0x5c, 0xa4, 0xea, 0x99, 0x0e, 0xc5, 0x06, 0x57, 0x5a, 0x0b, 0xd9, 0xf6, + 0x1a, 0xca, 0x03, 0x55, 0xea, 0x5b, 0xee, 0xa9, 0x5a, 0x96, 0x35, 0x3e, 0xd8, 0xe0, 0x7a, 0x04, + 0x69, 0xeb, 0xed, 0x7f, 0x60, 0xc1, 0x23, 0x3d, 0xb2, 0x47, 0xd0, 0xea, 0xee, 0x33, 0x37, 0xad, + 0x78, 0xe4, 0x4a, 0x55, 0xc7, 0x9d, 0xb7, 0x58, 0x60, 0xd1, 0x3a, 0x00, 0x77, 0xbe, 0xb2, 0x27, + 0x8f, 0x4b, 0x45, 0xa2, 0x25, 0x3a, 0xee, 0x68, 0x6b, 0xd7, 0x77, 0xd5, 0x23, 0xc7, 0x1a, 0x57, + 0xfb, 0xdb, 0x65, 0x18, 0xe4, 0x6f, 0xa9, 0xd6, 0x60, 0x78, 0x8b, 0x67, 0xb3, 0xec, 0x2f, 0x99, + 0x66, 0xaa, 0x0a, 0x72, 0x00, 0x96, 0x6c, 0xd0, 0x0d, 0x38, 0x49, 0xf5, 0x0e, 0xcf, 0xf1, 0xab, + 0xc4, 0x77, 0x76, 0xa4, 0x6d, 0xc1, 0x73, 0x99, 0xcb, 0xa4, 0xbb, 0x27, 0x57, 0x3b, 0x49, 0x70, + 0xb7, 0x72, 0xe8, 0xd5, 0x8e, 0xe4, 0x53, 0x3c, 0x4b, 0xa8, 0xba, 0xf1, 0x75, 0x70, 0x02, 0x2a, + 0xaa, 0xfd, 0xb4, 0x3a, 0xac, 0x28, 0xed, 0xc9, 0x4a, 0xd3, 0x72, 0x32, 0x69, 0x51, 0x15, 0xa6, + 0xe2, 0x36, 0x3b, 0xbb, 0x5e, 0xdb, 0x8a, 0x48, 0xbc, 0x15, 0xfa, 0xae, 0x78, 0x6d, 0x4d, 0x69, + 0x8c, 0xf5, 0x0c, 0x1e, 0x77, 0x94, 0xa0, 0x5c, 0x36, 0x1c, 0xcf, 0x6f, 0x47, 0x24, 0xe5, 0x32, + 0x64, 0x72, 0x59, 0xc9, 0xe0, 0x71, 0x47, 0x09, 0xfb, 0x8f, 0x2d, 0x38, 0xd9, 0x25, 0xc0, 0x83, + 0x87, 0x1d, 0x6e, 0x7a, 0x71, 0xa2, 0x32, 0x56, 0x6b, 0x61, 0x87, 0x1c, 0x8e, 0x15, 0x05, 0x9d, + 0x85, 0xdc, 0x34, 0xce, 0x1e, 0x9b, 0x8a, 0x23, 0x6c, 0x81, 0xed, 0x2f, 0x95, 0x14, 0x3a, 0x07, + 0x03, 0xed, 0x98, 0x44, 0xf2, 0xf1, 0x26, 0x29, 0xa2, 0x98, 0x37, 0x84, 0x61, 0xa8, 0xb2, 0xb3, + 0xa9, 0x1c, 0x11, 0x9a, 0xb2, 0xc3, 0x5d, 0x11, 0x1c, 0x67, 0x7f, 0xa3, 0x0c, 0x93, 0x99, 0x40, + 0x2f, 0xda, 0x90, 0x66, 0x18, 0x78, 0x49, 0xa8, 0xd2, 0x17, 0xf1, 0xf7, 0x62, 0x48, 0x6b, 0xeb, + 0x86, 0x80, 0x63, 0x45, 0x81, 0x9e, 0x36, 0x1f, 0xb6, 0x4e, 0xdb, 0xbc, 0x58, 0x35, 0xde, 0xb8, + 0x2b, 0x9a, 0x45, 0xff, 0x49, 0x18, 0x68, 0x85, 0xea, 0xbd, 0x52, 0x35, 0xe9, 0xf1, 0x62, 0xb5, + 0x16, 0x86, 0x3e, 0x66, 0x48, 0xf4, 0x94, 0xe8, 0x7d, 0xc6, 0x7f, 0x8b, 0x1d, 0x37, 0x8c, 0xb5, + 0x21, 0x78, 0x06, 0x86, 0xef, 0x91, 0x9d, 0xc8, 0x0b, 0x36, 0xb3, 0xde, 0xeb, 0x6b, 0x1c, 0x8c, + 0x25, 0xde, 0xcc, 0x94, 0x3f, 0x7c, 0xc4, 0x99, 0xf2, 0x47, 0x72, 0x63, 0x55, 0xbf, 0x6b, 0xc1, + 0x24, 0xcb, 0xe9, 0x27, 0xae, 0xd3, 0x7a, 0x61, 0x70, 0x0c, 0xdb, 0xe3, 0x93, 0x30, 0x18, 0xd1, + 0x4a, 0xb3, 0xa9, 0xae, 0x59, 0x4b, 0x30, 0xc7, 0xa1, 0xc7, 0x60, 0x80, 0x35, 0x81, 0x7e, 0xc6, + 0x31, 0x9e, 0x3a, 0xb8, 0xea, 0x24, 0x0e, 0x66, 0x50, 0x76, 0x33, 0x02, 0x93, 0x96, 0xef, 0xf1, + 0x46, 0xa7, 0x4e, 0xa7, 0xf7, 0xdb, 0xcd, 0x88, 0xae, 0x8d, 0x7c, 0x58, 0x37, 0x23, 0xba, 0x33, + 0x3f, 0x58, 0x45, 0xfd, 0x9f, 0x25, 0x38, 0xdb, 0xb5, 0x5c, 0x7a, 0x0e, 0xb6, 0x62, 0x9c, 0x83, + 0x5d, 0xca, 0x9c, 0x83, 0xd9, 0x07, 0x97, 0x7e, 0x38, 0x27, 0x63, 0xdd, 0x0f, 0xac, 0xca, 0xc7, + 0x78, 0x60, 0x35, 0x50, 0x54, 0x75, 0x18, 0xcc, 0x51, 0x1d, 0x7e, 0xcf, 0x82, 0x47, 0xbb, 0x0e, + 0xd9, 0xfb, 0xee, 0x2a, 0x4a, 0xd7, 0x56, 0xf6, 0x50, 0xac, 0x7f, 0xa5, 0xdc, 0xa3, 0x57, 0x4c, + 0xc5, 0x3e, 0x4f, 0xa5, 0x10, 0x43, 0xc6, 0x42, 0x29, 0x1a, 0xe3, 0x12, 0x88, 0xc3, 0xb0, 0xc2, + 0xa2, 0x58, 0xbb, 0xca, 0xc1, 0x1b, 0xb9, 0x7c, 0xc8, 0x05, 0x35, 0x67, 0x7a, 0x0b, 0xf5, 0x3b, + 0xc2, 0x99, 0x0b, 0x1e, 0xe8, 0xae, 0x66, 0x34, 0x95, 0x0f, 0x63, 0x34, 0x8d, 0x75, 0x37, 0x98, + 0xd0, 0x02, 0x4c, 0x36, 0xbd, 0x80, 0x3d, 0xb0, 0x67, 0x6a, 0x25, 0xea, 0x3e, 0xdd, 0x0d, 0x13, + 0x8d, 0xb3, 0xf4, 0x33, 0xaf, 0xc0, 0xf8, 0xe1, 0x7d, 0x32, 0xef, 0x96, 0xe1, 0x83, 0x07, 0x08, + 0x05, 0xbe, 0x3b, 0x18, 0xdf, 0x45, 0xdb, 0x1d, 0x3a, 0xbe, 0x4d, 0x0d, 0x4e, 0x6d, 0xb4, 0x7d, + 0x7f, 0x87, 0x45, 0x91, 0x10, 0x57, 0x52, 0x08, 0x8d, 0x4f, 0x3d, 0x7d, 0xbb, 0xd2, 0x85, 0x06, + 0x77, 0x2d, 0x89, 0x3e, 0x0d, 0x28, 0x5c, 0x67, 0x59, 0x2f, 0xdd, 0xf4, 0x0e, 0x34, 0xfb, 0x04, + 0xe5, 0x74, 0xa9, 0xde, 0xea, 0xa0, 0xc0, 0x5d, 0x4a, 0x51, 0xfd, 0x8f, 0xbd, 0x9a, 0xab, 0x9a, + 0x95, 0xd1, 0xff, 0xb0, 0x8e, 0xc4, 0x26, 0x2d, 0xba, 0x02, 0x27, 0x9c, 0x6d, 0xc7, 0xe3, 0x59, + 0x6c, 0x24, 0x03, 0xae, 0x00, 0x2a, 0xaf, 0xc7, 0x42, 0x96, 0x00, 0x77, 0x96, 0x41, 0x2d, 0xc3, + 0x8d, 0xc5, 0xf3, 0x5d, 0x7f, 0xe2, 0x10, 0x33, 0xb8, 0xb0, 0x63, 0xcb, 0xfe, 0x6f, 0x16, 0xdd, + 0xfa, 0xba, 0xbc, 0xc5, 0x66, 0x3c, 0xe2, 0xae, 0x5d, 0x6e, 0xe9, 0x7c, 0xc4, 0x9d, 0xfb, 0x03, + 0x0d, 0x5a, 0x3e, 0x35, 0xe2, 0x34, 0x1c, 0xd5, 0xd0, 0x36, 0xc5, 0xad, 0x2e, 0x45, 0x81, 0x3e, + 0x03, 0xc3, 0xae, 0xb7, 0xed, 0xc5, 0x61, 0x24, 0x16, 0x50, 0x9f, 0x21, 0x8e, 0xa9, 0xbc, 0xac, + 0x72, 0x36, 0x58, 0xf2, 0xb3, 0xbf, 0x59, 0x82, 0x71, 0x59, 0xe3, 0x6b, 0xed, 0x30, 0x71, 0x8e, + 0x61, 0x4b, 0x7f, 0xcd, 0xd8, 0xd2, 0xe7, 0x8b, 0x5d, 0x72, 0x63, 0x8d, 0xeb, 0xb9, 0x95, 0x7f, + 0x26, 0xb3, 0x95, 0x5f, 0xec, 0x87, 0xe9, 0xc1, 0x5b, 0xf8, 0xbf, 0xb1, 0xe0, 0x84, 0x41, 0x7f, + 0x0c, 0x3b, 0x49, 0xcd, 0xdc, 0x49, 0x9e, 0xeb, 0xa3, 0x37, 0x3d, 0x76, 0x90, 0xef, 0x94, 0x32, + 0xbd, 0x60, 0x3b, 0xc7, 0x17, 0x61, 0x60, 0xcb, 0x89, 0xdc, 0x62, 0x29, 0xdd, 0x3a, 0x8a, 0xcf, + 0x5d, 0x75, 0x22, 0x97, 0xcb, 0xff, 0x0b, 0xea, 0xa5, 0x18, 0x27, 0x72, 0x73, 0xa3, 0xb4, 0x59, + 0xa5, 0xe8, 0x32, 0x0c, 0xc5, 0x8d, 0xb0, 0xa5, 0xa2, 0xe1, 0xce, 0xf1, 0x57, 0x64, 0x28, 0x64, + 0x7f, 0x77, 0x16, 0x99, 0xd5, 0x51, 0x30, 0x16, 0xf4, 0x33, 0x9b, 0x50, 0x51, 0x55, 0x1f, 0x69, + 0x3c, 0xf0, 0xff, 0x28, 0xc3, 0xc9, 0x2e, 0x73, 0x05, 0x7d, 0xc9, 0x18, 0xb7, 0x57, 0xfa, 0x9e, + 0x6c, 0xef, 0x71, 0xe4, 0xbe, 0xc4, 0x2c, 0x25, 0x57, 0xcc, 0x8e, 0x43, 0x54, 0x7f, 0x3b, 0x26, + 0xd9, 0xea, 0x29, 0x28, 0xbf, 0x7a, 0x5a, 0xed, 0xb1, 0x0d, 0x3f, 0xad, 0x48, 0xb5, 0xf4, 0x48, + 0xbf, 0xf3, 0x5f, 0x1e, 0x80, 0x53, 0xdd, 0x6e, 0xd3, 0xa2, 0xaf, 0x5a, 0x99, 0xbc, 0xed, 0xaf, + 0xf6, 0x7f, 0x25, 0x97, 0x27, 0x73, 0x17, 0x19, 0x28, 0xe6, 0xcc, 0x4c, 0xee, 0xb9, 0x23, 0x2e, + 0x6a, 0x67, 0xf7, 0x2b, 0x22, 0x9e, 0x83, 0x5f, 0x4a, 0x85, 0x4f, 0x1d, 0xa2, 0x29, 0x22, 0x8d, + 0x7f, 0x9c, 0xb9, 0x5f, 0x21, 0xc1, 0xf9, 0xf7, 0x2b, 0x64, 0x1b, 0x66, 0x3c, 0x18, 0xd5, 0xfa, + 0x75, 0xa4, 0xd3, 0xe0, 0x1e, 0xdd, 0xa2, 0xb4, 0x76, 0x1f, 0xe9, 0x54, 0xf8, 0x3b, 0x16, 0x64, + 0x42, 0x57, 0x94, 0x5b, 0xc6, 0xea, 0xe9, 0x96, 0x39, 0x07, 0x03, 0x51, 0xe8, 0x93, 0x6c, 0x4e, + 0x71, 0x1c, 0xfa, 0x04, 0x33, 0x8c, 0x7a, 0x3c, 0xb2, 0xdc, 0xeb, 0xf1, 0x48, 0x6a, 0xa7, 0xfb, + 0x64, 0x9b, 0x48, 0x27, 0x89, 0x12, 0xe3, 0xd7, 0x29, 0x10, 0x73, 0x9c, 0xfd, 0xbb, 0x65, 0x18, + 0xe2, 0x9e, 0x88, 0x63, 0xd8, 0xa7, 0x6b, 0xc2, 0x29, 0x50, 0xe8, 0x8e, 0x2b, 0x6f, 0xd5, 0x5c, + 0xd5, 0x49, 0x1c, 0x3e, 0xb9, 0x54, 0x1f, 0x53, 0x47, 0x02, 0x9a, 0x33, 0x46, 0x61, 0x26, 0x63, + 0xeb, 0x02, 0xe7, 0xa1, 0x8d, 0xc9, 0x16, 0x40, 0xcc, 0x1e, 0x2b, 0xa3, 0x3c, 0x44, 0x1e, 0xbe, + 0x17, 0x0b, 0xb5, 0xa3, 0xae, 0x8a, 0xf1, 0xd6, 0xa4, 0xc9, 0xbf, 0x14, 0x02, 0x6b, 0xbc, 0x67, + 0x5e, 0x86, 0x8a, 0x22, 0xce, 0x33, 0x02, 0xc6, 0xf4, 0xc9, 0xf9, 0x17, 0x60, 0x32, 0x53, 0x57, + 0x5f, 0x36, 0xc4, 0x6f, 0x59, 0x30, 0x99, 0x79, 0x67, 0x19, 0x7d, 0xc5, 0x82, 0x53, 0x7e, 0x17, + 0x47, 0x94, 0xf8, 0xcc, 0x87, 0x71, 0x61, 0x29, 0xf3, 0xa1, 0x1b, 0x16, 0x77, 0xad, 0x8d, 0x9a, + 0x95, 0xfc, 0xed, 0x45, 0xc7, 0x17, 0x91, 0x80, 0x63, 0x3c, 0x69, 0x28, 0x87, 0x61, 0x85, 0xb5, + 0x7f, 0x6a, 0xc1, 0x89, 0x8e, 0xa7, 0x7c, 0xdf, 0x2f, 0xdd, 0x10, 0xe9, 0x51, 0x4b, 0x3d, 0xd2, + 0xa3, 0xea, 0xbd, 0x2c, 0x1f, 0xd8, 0xcb, 0x5f, 0xb7, 0x40, 0xcc, 0xd0, 0x63, 0xd0, 0x00, 0x57, + 0x4d, 0x0d, 0xf0, 0x43, 0x45, 0x26, 0x7d, 0x0f, 0xd5, 0xef, 0x4f, 0x2d, 0x40, 0x9c, 0x20, 0xfb, + 0x48, 0x23, 0x77, 0x64, 0x6a, 0xc6, 0x4b, 0xba, 0x4a, 0x14, 0x06, 0x6b, 0x54, 0x7d, 0x66, 0xd9, + 0x57, 0x4f, 0x9b, 0x75, 0x6f, 0x18, 0xba, 0x08, 0xa3, 0xe2, 0x69, 0xa3, 0x1b, 0xe9, 0xb3, 0x65, + 0x93, 0xec, 0x09, 0xcd, 0x14, 0x8c, 0x75, 0x1a, 0xe3, 0x6b, 0x0d, 0x1c, 0xf8, 0xb5, 0x7e, 0xbb, + 0x0c, 0xd9, 0xf0, 0x17, 0xf4, 0x16, 0x8c, 0x35, 0x9c, 0x96, 0xb3, 0xee, 0xf9, 0x5e, 0xe2, 0x91, + 0xb8, 0xd8, 0xb1, 0xdb, 0x92, 0x56, 0x42, 0x38, 0xcd, 0x35, 0x08, 0x36, 0x38, 0xa2, 0x39, 0x80, + 0x56, 0xe4, 0x6d, 0x7b, 0x3e, 0xd9, 0x64, 0xfa, 0x19, 0x8b, 0x9f, 0xe5, 0x27, 0x48, 0x12, 0x8a, + 0x35, 0x8a, 0x2e, 0xf1, 0x96, 0xe5, 0xe3, 0x88, 0xb7, 0x1c, 0xe8, 0x33, 0xde, 0x72, 0xb0, 0x50, + 0xbc, 0x25, 0x86, 0x33, 0xd2, 0xd7, 0x4d, 0xff, 0xaf, 0x78, 0x3e, 0xe1, 0xe9, 0x15, 0x45, 0x7c, + 0xed, 0xcc, 0xde, 0xee, 0xec, 0x19, 0xdc, 0x95, 0x02, 0xf7, 0x28, 0x69, 0xb7, 0xe1, 0x64, 0x9d, + 0x44, 0x1e, 0xcb, 0x7a, 0xe5, 0xa6, 0x8b, 0xfa, 0xf3, 0x50, 0x89, 0x32, 0xf2, 0xa4, 0xcf, 0xeb, + 0x8f, 0x5a, 0x9e, 0x14, 0x29, 0x3f, 0x52, 0x96, 0xf6, 0x5f, 0x2b, 0xc1, 0xb0, 0x08, 0x33, 0x3b, + 0x86, 0x8d, 0xf6, 0x9a, 0x61, 0x10, 0x3f, 0x93, 0xb7, 0xd6, 0x59, 0xb3, 0x7a, 0x9a, 0xc2, 0xf5, + 0x8c, 0x29, 0xfc, 0x5c, 0x31, 0x76, 0x07, 0x1b, 0xc1, 0x3f, 0x2a, 0xc1, 0x84, 0x19, 0x76, 0x77, + 0x0c, 0xc3, 0xf2, 0x3a, 0x0c, 0xc7, 0x22, 0x26, 0xad, 0x54, 0x24, 0xa2, 0x26, 0xfb, 0x89, 0x95, + 0xd7, 0x43, 0x46, 0xa1, 0x49, 0x76, 0x5d, 0xc3, 0xde, 0xca, 0xc7, 0x11, 0xf6, 0x66, 0xff, 0x90, + 0x09, 0x63, 0x7d, 0x20, 0x8f, 0x61, 0x33, 0x79, 0xcd, 0x14, 0xdb, 0x17, 0x0a, 0xcd, 0x08, 0xd1, + 0xbc, 0x1e, 0x9b, 0xca, 0xf7, 0x2c, 0x18, 0x15, 0x84, 0xc7, 0xd0, 0x81, 0x4f, 0x9b, 0x1d, 0x78, + 0xaa, 0x50, 0x07, 0x7a, 0xb4, 0xfc, 0x9b, 0x25, 0xd5, 0xf2, 0x9a, 0x78, 0xf2, 0x36, 0x37, 0xfb, + 0xe6, 0x48, 0x2b, 0x0a, 0x93, 0xb0, 0x11, 0xfa, 0x42, 0x8d, 0x78, 0x2c, 0xbd, 0xe8, 0xc0, 0xe1, + 0xfb, 0xda, 0x6f, 0xac, 0xa8, 0x59, 0x1c, 0x7e, 0x18, 0x25, 0x62, 0x6b, 0xeb, 0xf6, 0xe0, 0xae, + 0x2b, 0x9f, 0x34, 0xa7, 0x30, 0x71, 0x47, 0xa8, 0xff, 0xa7, 0x7c, 0xd3, 0x9b, 0x0b, 0x8a, 0x17, + 0xd6, 0xf8, 0xca, 0x90, 0x58, 0x56, 0xc7, 0xa0, 0xe9, 0x89, 0xbe, 0x29, 0xe0, 0x58, 0x51, 0xd8, + 0x2f, 0x33, 0x99, 0xcb, 0x06, 0xa8, 0xbf, 0x4b, 0x05, 0x7f, 0x75, 0x48, 0x0d, 0x2d, 0x73, 0x2f, + 0xdd, 0xd4, 0xaf, 0x2e, 0x14, 0x15, 0x6c, 0xb4, 0x09, 0x7a, 0x14, 0x5f, 0x7a, 0xd3, 0x01, 0x91, + 0x8e, 0xe3, 0x8b, 0x97, 0x0b, 0xcb, 0xca, 0x3e, 0x0e, 0x2c, 0x58, 0xca, 0x22, 0x96, 0xa7, 0x65, + 0xb5, 0x96, 0xcd, 0x99, 0xba, 0x24, 0x11, 0x38, 0xa5, 0x41, 0xf3, 0xc2, 0xac, 0x31, 0x5f, 0x44, + 0x96, 0x66, 0x8d, 0x1c, 0x12, 0xcd, 0xae, 0xb9, 0x08, 0xa3, 0x2a, 0x73, 0x7c, 0x8d, 0x27, 0x00, + 0xaf, 0x70, 0xcd, 0x67, 0x39, 0x05, 0x63, 0x9d, 0x06, 0xad, 0xc2, 0x49, 0x57, 0x45, 0x40, 0xd7, + 0xda, 0xeb, 0xbe, 0xd7, 0xa0, 0x45, 0xf9, 0xed, 0xa5, 0x47, 0xf6, 0x76, 0x67, 0x4f, 0x56, 0x3b, + 0xd1, 0xb8, 0x5b, 0x19, 0xb4, 0x06, 0x93, 0x31, 0xcf, 0x90, 0x2f, 0xc3, 0x5c, 0x45, 0x2a, 0xc1, + 0x67, 0xe5, 0xb9, 0x49, 0xdd, 0x44, 0xef, 0x33, 0x10, 0x97, 0x0a, 0x32, 0x30, 0x36, 0xcb, 0x02, + 0xbd, 0x0a, 0x13, 0xbe, 0xfe, 0xfc, 0x57, 0x4d, 0x04, 0x82, 0xab, 0x08, 0x13, 0xe3, 0x71, 0xb0, + 0x1a, 0xce, 0x50, 0xa3, 0xd7, 0x61, 0x5a, 0x87, 0x88, 0x7c, 0x0a, 0x4e, 0xb0, 0x49, 0x62, 0x91, + 0x9a, 0xfb, 0xb1, 0xbd, 0xdd, 0xd9, 0xe9, 0xeb, 0x3d, 0x68, 0x70, 0xcf, 0xd2, 0xe8, 0x32, 0x8c, + 0xc9, 0x91, 0xd4, 0x82, 0xc2, 0xd3, 0xd8, 0x26, 0x0d, 0x87, 0x0d, 0xca, 0xf7, 0x76, 0x3c, 0xf4, + 0x45, 0x5a, 0x58, 0xdb, 0x5c, 0xd1, 0xdb, 0x30, 0xa6, 0xb7, 0x31, 0xbb, 0x6b, 0xe6, 0x3f, 0xa9, + 0x26, 0x36, 0x69, 0xd5, 0x72, 0x1d, 0x87, 0x0d, 0xde, 0xf6, 0x2d, 0x18, 0xaa, 0xef, 0xc4, 0x8d, + 0xc4, 0x7f, 0x58, 0x8f, 0x61, 0x13, 0x98, 0xcc, 0xbc, 0x1a, 0xad, 0x1e, 0x20, 0xb7, 0x1e, 0xde, + 0x03, 0xe4, 0xf6, 0x1f, 0x59, 0x30, 0xb8, 0xe6, 0x78, 0xf9, 0xcf, 0x5a, 0x14, 0x69, 0x34, 0x7a, + 0x09, 0x86, 0xc8, 0xc6, 0x06, 0x69, 0xc8, 0x07, 0xcd, 0x1f, 0x97, 0xea, 0xcd, 0x32, 0x83, 0xd2, + 0xc5, 0xc9, 0x2a, 0xe3, 0x7f, 0xb1, 0x20, 0x46, 0x9f, 0x83, 0x4a, 0xe2, 0x35, 0xc9, 0x82, 0xeb, + 0x12, 0xf7, 0x10, 0xf7, 0x36, 0x95, 0xb0, 0x58, 0x93, 0x4c, 0x70, 0xca, 0xcf, 0xfe, 0x7a, 0x09, + 0x60, 0x2d, 0xf4, 0xe5, 0xc1, 0x5a, 0x4e, 0x37, 0x17, 0x3b, 0x5e, 0xef, 0x78, 0xba, 0xcb, 0xeb, + 0x1d, 0x28, 0x65, 0xd8, 0xe5, 0xed, 0x0e, 0x35, 0x54, 0xe5, 0x42, 0x43, 0x35, 0xd0, 0xcf, 0x50, + 0x2d, 0xc1, 0x89, 0x44, 0xd5, 0x6d, 0x5e, 0x80, 0x61, 0xa9, 0xc5, 0xd6, 0xb2, 0x48, 0xdc, 0x49, + 0x6f, 0x7f, 0xdd, 0x02, 0x11, 0x38, 0x55, 0x60, 0xb6, 0xba, 0x32, 0x6d, 0xbf, 0x91, 0xcd, 0xe5, + 0xd9, 0x22, 0x17, 0x9c, 0x44, 0x0e, 0x17, 0xb5, 0x7e, 0x8c, 0xcc, 0x2d, 0x06, 0x57, 0xfb, 0x37, + 0x2c, 0x18, 0xe5, 0xe8, 0x1b, 0x4c, 0xdb, 0xcd, 0x6f, 0x57, 0x5f, 0x79, 0xeb, 0x58, 0x46, 0x7b, + 0xca, 0x58, 0xe5, 0x2f, 0xd3, 0x33, 0xda, 0x4b, 0x04, 0x4e, 0x69, 0xd0, 0x33, 0x30, 0x1c, 0xb7, + 0xd7, 0x19, 0x79, 0x26, 0x8a, 0xaa, 0xce, 0xc1, 0x58, 0xe2, 0xed, 0x5f, 0x42, 0x60, 0x74, 0xcd, + 0xc8, 0x95, 0x66, 0x3d, 0xf4, 0x5c, 0x69, 0x6f, 0xc0, 0x08, 0x69, 0xb6, 0x92, 0x9d, 0xaa, 0x17, + 0x15, 0xcb, 0x5b, 0xb9, 0x2c, 0xa8, 0x3b, 0xb9, 0x4b, 0x0c, 0x56, 0x1c, 0x7b, 0x64, 0xbe, 0x2b, + 0xbf, 0x2f, 0x32, 0xdf, 0x0d, 0xfc, 0x4c, 0x32, 0xdf, 0xbd, 0x0e, 0xc3, 0x9b, 0x5e, 0x82, 0x49, + 0x2b, 0x14, 0x37, 0x62, 0x73, 0x0e, 0x3b, 0xaf, 0x70, 0xe2, 0xce, 0x74, 0x56, 0x02, 0x81, 0x25, + 0x3b, 0xb4, 0x06, 0x43, 0xdc, 0x42, 0x12, 0xc9, 0xe4, 0x3e, 0x52, 0xc4, 0xeb, 0xd4, 0x99, 0x57, + 0x4d, 0x84, 0xca, 0x09, 0x5e, 0x32, 0xd3, 0xdd, 0xf0, 0x7b, 0xcf, 0x74, 0xa7, 0xf2, 0xd3, 0x8d, + 0x3c, 0xac, 0xfc, 0x74, 0x46, 0x9e, 0xbf, 0xca, 0x51, 0xe4, 0xf9, 0xfb, 0xba, 0x05, 0xa7, 0x5b, + 0xdd, 0xb2, 0x64, 0x8a, 0x4c, 0x73, 0x9f, 0x3c, 0x44, 0xde, 0x50, 0xa3, 0x6a, 0x76, 0xcf, 0xb0, + 0x2b, 0x19, 0xee, 0x5e, 0xb1, 0x4c, 0x18, 0x38, 0xfa, 0xde, 0x13, 0x06, 0x1e, 0x75, 0x4a, 0xba, + 0x34, 0x7d, 0xe0, 0xf8, 0x91, 0xa4, 0x0f, 0x9c, 0x78, 0x88, 0xe9, 0x03, 0xb5, 0xc4, 0x7f, 0x93, + 0x0f, 0x37, 0xf1, 0xdf, 0x16, 0x8c, 0xba, 0xe1, 0xfd, 0xe0, 0xbe, 0x13, 0xb9, 0x0b, 0xb5, 0x55, + 0x91, 0x67, 0x2e, 0x27, 0x95, 0x49, 0x35, 0x2d, 0x60, 0xd4, 0xc0, 0xdd, 0xab, 0x29, 0x12, 0xeb, + 0xac, 0x45, 0x0a, 0xc4, 0x13, 0xef, 0x31, 0x05, 0xa2, 0x91, 0x48, 0x10, 0x1d, 0x45, 0x22, 0xc1, + 0xb7, 0x58, 0x4e, 0x83, 0x0d, 0x6f, 0xf3, 0x86, 0xd3, 0x62, 0xf7, 0xf0, 0x72, 0x6b, 0x58, 0x92, + 0xe4, 0x9d, 0x35, 0x28, 0x14, 0x4e, 0x99, 0x76, 0xa6, 0x2a, 0x3c, 0x75, 0xdc, 0xa9, 0x0a, 0x4f, + 0x1f, 0x61, 0xaa, 0xc2, 0x33, 0xc7, 0x9a, 0xaa, 0xf0, 0x91, 0x9f, 0x49, 0xaa, 0xc2, 0xbf, 0x04, + 0x67, 0x0f, 0xfe, 0x1c, 0x69, 0x32, 0xec, 0x5a, 0xea, 0xd6, 0xc8, 0x24, 0xc3, 0x66, 0xaa, 0x8e, + 0x46, 0x55, 0x38, 0x5f, 0xda, 0x77, 0x2c, 0x78, 0xa4, 0x47, 0x3a, 0xa1, 0xc2, 0x57, 0x58, 0x5a, + 0x30, 0xd9, 0x32, 0x8b, 0x16, 0xbe, 0x74, 0x66, 0xa4, 0x2f, 0x52, 0xe1, 0x90, 0x19, 0x04, 0xce, + 0xb2, 0x5f, 0xfc, 0xd0, 0x8f, 0xdf, 0x3d, 0xfb, 0x81, 0x9f, 0xbc, 0x7b, 0xf6, 0x03, 0x7f, 0xf0, + 0xee, 0xd9, 0x0f, 0xfc, 0xc2, 0xde, 0x59, 0xeb, 0xc7, 0x7b, 0x67, 0xad, 0x9f, 0xec, 0x9d, 0xb5, + 0xfe, 0x78, 0xef, 0xac, 0xf5, 0xf5, 0x9f, 0x9e, 0xfd, 0xc0, 0x67, 0x4b, 0xdb, 0x17, 0xff, 0x7f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x9c, 0x74, 0x25, 0xcd, 0xbb, 0x00, 0x00, } diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index 52b422df5f429..afabdab4a8933 100644 --- a/pkg/api/v1/generated.proto +++ b/pkg/api/v1/generated.proto @@ -25,7 +25,7 @@ import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; @@ -1095,7 +1095,7 @@ message HTTPGetAction { // Name or number of the port to access on the container. // Number must be in the range 1 to 65535. // Name must be an IANA_SVC_NAME. - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 2; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString port = 2; // Host name to connect to, defaults to the pod IP. You probably want to set // "Host" in httpHeaders instead. @@ -3331,7 +3331,7 @@ message ServicePort { // omitted or set equal to the 'port' field. // More info: http://kubernetes.io/docs/user-guide/services#defining-a-service // +optional - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString targetPort = 4; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString targetPort = 4; // The port on each node on which this service is exposed when type=NodePort or LoadBalancer. // Usually assigned by the system. If specified, it will be allocated to the service @@ -3465,7 +3465,7 @@ message TCPSocketAction { // Number or name of the port to access on the container. // Number must be in the range 1 to 65535. // Name must be an IANA_SVC_NAME. - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 1; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString port = 1; } // The node this Taint is attached to has the effect "effect" on diff --git a/pkg/api/v1/pod/BUILD b/pkg/api/v1/pod/BUILD index 1903b719cb452..167fd3b9149fc 100644 --- a/pkg/api/v1/pod/BUILD +++ b/pkg/api/v1/pod/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/util/intstr:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) @@ -25,7 +25,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/util/intstr:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/api/v1/pod/util.go b/pkg/api/v1/pod/util.go index 1b2d7edb9a34e..f9713756180dd 100644 --- a/pkg/api/v1/pod/util.go +++ b/pkg/api/v1/pod/util.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) const ( diff --git a/pkg/api/v1/pod/util_test.go b/pkg/api/v1/pod/util_test.go index 842398d6fa1f5..f7e40c29a6c03 100644 --- a/pkg/api/v1/pod/util_test.go +++ b/pkg/api/v1/pod/util_test.go @@ -19,8 +19,8 @@ package pod import ( "testing" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestFindPort(t *testing.T) { diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 0af87d4a4f173..481fe7f8abca8 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -29,7 +29,7 @@ import ( pkg2_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg5_runtime "k8s.io/apimachinery/pkg/runtime" pkg1_types "k8s.io/apimachinery/pkg/types" - pkg4_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg4_intstr "k8s.io/apimachinery/pkg/util/intstr" "reflect" "runtime" time "time" diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 914c4768ba78f..be90da724b682 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" ) // The comments for the structs and fields can be used from go-restful to diff --git a/pkg/api/validation/BUILD b/pkg/api/validation/BUILD index f1bda102640ab..46dc7560b4958 100644 --- a/pkg/api/validation/BUILD +++ b/pkg/api/validation/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/capabilities:go_default_library", "//pkg/features:go_default_library", "//pkg/security/apparmor:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/exponent-io/jsonpath", "//vendor:github.com/golang/glog", @@ -42,6 +41,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", @@ -78,12 +78,12 @@ go_test( "//pkg/apis/storage/util:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/security/apparmor:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/ghodss/yaml", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/api/testing", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/yaml", diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 0316f7e6e5a55..2c9b31a00f64f 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -34,6 +34,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" @@ -47,7 +48,6 @@ import ( "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/security/apparmor" - "k8s.io/kubernetes/pkg/util/intstr" ) // TODO: delete this global variable when we enable the validation of common diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index fe9cb92aa10b8..7a9153f412fa9 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -23,6 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api" @@ -30,7 +31,6 @@ import ( storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/security/apparmor" - "k8s.io/kubernetes/pkg/util/intstr" ) const ( diff --git a/pkg/apis/apps/v1beta1/BUILD b/pkg/apis/apps/v1beta1/BUILD index 54831f1785b81..553ba1ca4bb5c 100644 --- a/pkg/apis/apps/v1beta1/BUILD +++ b/pkg/apis/apps/v1beta1/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/apimachinery/pkg/api/resource", @@ -36,6 +35,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/apps/v1beta1/generated.pb.go b/pkg/apis/apps/v1beta1/generated.pb.go index c6b7b0c089b18..d5a34a96beffb 100644 --- a/pkg/apis/apps/v1beta1/generated.pb.go +++ b/pkg/apis/apps/v1beta1/generated.pb.go @@ -1033,46 +1033,45 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 647 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0xe3, 0xa4, 0x29, 0x61, 0x53, 0xbe, 0x96, 0x0a, 0x45, 0x15, 0x72, 0xab, 0x5c, 0x08, - 0x52, 0xbb, 0x4b, 0xda, 0x02, 0x15, 0x47, 0x23, 0x81, 0x90, 0x80, 0x22, 0x07, 0x55, 0xa2, 0x80, - 0xc4, 0xda, 0x99, 0xa6, 0x4b, 0xec, 0xd8, 0xf2, 0x8e, 0x23, 0x71, 0xe3, 0xc2, 0x81, 0x1b, 0x6f, - 0xc2, 0x8d, 0x67, 0xa8, 0x38, 0xf5, 0xc8, 0xa9, 0xa2, 0xe1, 0x45, 0x90, 0x37, 0x9b, 0x0f, 0xea, - 0x94, 0x56, 0xbd, 0x65, 0xd6, 0xf3, 0xff, 0xcd, 0xcc, 0x7f, 0x26, 0xe4, 0x61, 0x77, 0x4b, 0x31, - 0x19, 0xf1, 0x6e, 0xea, 0x41, 0xd2, 0x03, 0x04, 0xc5, 0xe3, 0x6e, 0x87, 0x8b, 0x58, 0x2a, 0x2e, - 0xe2, 0x58, 0xf1, 0x7e, 0xd3, 0x03, 0x14, 0x4d, 0xde, 0x81, 0x1e, 0x24, 0x02, 0xa1, 0xcd, 0xe2, - 0x24, 0xc2, 0x88, 0xde, 0x19, 0x0a, 0xd9, 0x44, 0xc8, 0xe2, 0x6e, 0x87, 0x65, 0x42, 0x96, 0x09, - 0x99, 0x11, 0x2e, 0xad, 0x75, 0x24, 0xee, 0xa7, 0x1e, 0xf3, 0xa3, 0x90, 0x77, 0xa2, 0x4e, 0xc4, - 0xb5, 0xde, 0x4b, 0xf7, 0x74, 0xa4, 0x03, 0xfd, 0x6b, 0xc8, 0x5d, 0xda, 0x34, 0x0d, 0x89, 0x58, - 0x86, 0xc2, 0xdf, 0x97, 0x3d, 0x48, 0x3e, 0x8d, 0x5a, 0xe2, 0x09, 0xa8, 0x28, 0x4d, 0x7c, 0x38, - 0xd9, 0xcd, 0x7f, 0x55, 0x8a, 0x87, 0x80, 0x82, 0xf7, 0x73, 0x33, 0x2c, 0xf1, 0xd3, 0x54, 0x49, - 0xda, 0x43, 0x19, 0xe6, 0xcb, 0x3c, 0x38, 0x4b, 0xa0, 0xfc, 0x7d, 0x08, 0x45, 0x4e, 0xb7, 0x7a, - 0xaa, 0xcb, 0xb3, 0xda, 0x6a, 0xce, 0xce, 0x4e, 0x51, 0x06, 0x5c, 0xf6, 0x50, 0x61, 0x72, 0x52, - 0x52, 0xff, 0x5e, 0x24, 0xd5, 0x16, 0x0a, 0x84, 0xbd, 0x34, 0x68, 0x01, 0xd2, 0x0f, 0xa4, 0x92, - 0x0d, 0xdd, 0x16, 0x28, 0x6a, 0xd6, 0x8a, 0xd5, 0xa8, 0xae, 0xdf, 0x63, 0x66, 0x61, 0xd3, 0xbd, - 0x4f, 0x56, 0x96, 0x65, 0xb3, 0x7e, 0x93, 0x6d, 0x7b, 0x1f, 0xc1, 0xc7, 0x17, 0x80, 0xc2, 0xa1, - 0x07, 0x47, 0xcb, 0x85, 0xc1, 0xd1, 0x32, 0x99, 0xbc, 0xb9, 0x63, 0x2a, 0xdd, 0x25, 0x73, 0x2a, - 0x06, 0xbf, 0x56, 0xd4, 0xf4, 0x2d, 0x76, 0xce, 0x73, 0x60, 0x53, 0x5d, 0xb6, 0x62, 0xf0, 0x9d, - 0x05, 0x53, 0x65, 0x2e, 0x8b, 0x5c, 0xcd, 0xa4, 0x1e, 0x99, 0x57, 0x28, 0x30, 0x55, 0xb5, 0x92, - 0xa6, 0x3f, 0xba, 0x10, 0x5d, 0x13, 0x9c, 0xab, 0x86, 0x3f, 0x3f, 0x8c, 0x5d, 0x43, 0xae, 0xff, - 0xb4, 0xc8, 0xb5, 0xa9, 0xec, 0xe7, 0x52, 0x21, 0x7d, 0x97, 0x73, 0x8d, 0x9d, 0xcf, 0xb5, 0x4c, - 0xad, 0x3d, 0xbb, 0x6e, 0xaa, 0x55, 0x46, 0x2f, 0x53, 0x8e, 0xbd, 0x21, 0x65, 0x89, 0x10, 0xaa, - 0x5a, 0x71, 0xa5, 0xd4, 0xa8, 0xae, 0x6f, 0x5e, 0x64, 0x28, 0xe7, 0x8a, 0x29, 0x50, 0x7e, 0x96, - 0xa1, 0xdc, 0x21, 0xb1, 0xfe, 0xa3, 0xf4, 0xcf, 0x30, 0x99, 0x95, 0xb4, 0x41, 0x2a, 0x09, 0xc4, - 0x81, 0xf4, 0x85, 0xd2, 0xc3, 0x94, 0x9d, 0x85, 0xac, 0x31, 0xd7, 0xbc, 0xb9, 0xe3, 0xaf, 0xf4, - 0x3d, 0xa9, 0x28, 0x08, 0xc0, 0xc7, 0x28, 0x31, 0xeb, 0xdc, 0x38, 0xe7, 0xd8, 0xc2, 0x83, 0xa0, - 0x65, 0xa4, 0x43, 0xfc, 0x28, 0x72, 0xc7, 0x48, 0xfa, 0x96, 0x54, 0x10, 0xc2, 0x38, 0x10, 0x08, - 0x66, 0x9f, 0x6b, 0xa7, 0x8f, 0x9e, 0x61, 0x5f, 0x45, 0xed, 0xd7, 0x46, 0xa0, 0x4f, 0x64, 0x6c, - 0xea, 0xe8, 0xd5, 0x1d, 0x03, 0xe9, 0x17, 0x8b, 0x2c, 0xf6, 0xa3, 0x20, 0x0d, 0xe1, 0x71, 0x20, - 0x64, 0x38, 0xca, 0x50, 0xb5, 0x39, 0x6d, 0xf2, 0xc6, 0x19, 0x95, 0x20, 0x51, 0x52, 0x21, 0xf4, - 0x70, 0x67, 0xc2, 0x70, 0x6e, 0x9b, 0x7a, 0x8b, 0x3b, 0x33, 0xc0, 0xee, 0xcc, 0x72, 0xf4, 0x3e, - 0xa9, 0x2a, 0x48, 0xfa, 0xd2, 0x87, 0x97, 0x22, 0x84, 0x5a, 0x79, 0xc5, 0x6a, 0x5c, 0x76, 0x6e, - 0x1a, 0x50, 0xb5, 0x35, 0xf9, 0xe4, 0x4e, 0xe7, 0xd5, 0xbf, 0x5a, 0xe4, 0x46, 0xee, 0x66, 0xe9, - 0x13, 0x42, 0x23, 0x2f, 0x4b, 0x83, 0xf6, 0xd3, 0xe1, 0x1f, 0x5d, 0x46, 0x3d, 0xbd, 0xc4, 0x92, - 0x73, 0x6b, 0x70, 0xb4, 0x4c, 0xb7, 0x73, 0x5f, 0xdd, 0x19, 0x0a, 0xba, 0x3a, 0x75, 0x02, 0x45, - 0x7d, 0x02, 0x63, 0x2b, 0xf3, 0x67, 0xe0, 0xdc, 0x3d, 0x38, 0xb6, 0x0b, 0x87, 0xc7, 0x76, 0xe1, - 0xd7, 0xb1, 0x5d, 0xf8, 0x3c, 0xb0, 0xad, 0x83, 0x81, 0x6d, 0x1d, 0x0e, 0x6c, 0xeb, 0xf7, 0xc0, - 0xb6, 0xbe, 0xfd, 0xb1, 0x0b, 0xbb, 0x97, 0xcc, 0x45, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x39, - 0x79, 0xea, 0x95, 0x36, 0x06, 0x00, 0x00, + // 635 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0x4d, 0x6f, 0xd3, 0x4c, + 0x10, 0xc7, 0xe3, 0xa4, 0xe9, 0x93, 0x67, 0x53, 0xde, 0x96, 0x0a, 0x45, 0x15, 0x72, 0xab, 0x5c, + 0x08, 0x52, 0xbb, 0xa6, 0x2f, 0x40, 0xc5, 0xd1, 0x48, 0x20, 0x24, 0xa0, 0xc8, 0x41, 0x95, 0x28, + 0x20, 0xb1, 0x76, 0xa6, 0xe9, 0x12, 0xbf, 0xc9, 0x3b, 0x8e, 0xc4, 0x8d, 0x0b, 0x07, 0x6e, 0x7c, + 0x13, 0x6e, 0x7c, 0x86, 0x8a, 0x53, 0x8f, 0x9c, 0x2a, 0x1a, 0xbe, 0x08, 0xf2, 0x66, 0x13, 0x1b, + 0x39, 0x51, 0xab, 0xde, 0x3c, 0xbb, 0xf3, 0xff, 0xcd, 0xcc, 0x7f, 0xc7, 0xe4, 0xe1, 0x60, 0x57, + 0x32, 0x11, 0x59, 0x83, 0xd4, 0x85, 0x24, 0x04, 0x04, 0x69, 0xc5, 0x83, 0xbe, 0xc5, 0x63, 0x21, + 0x2d, 0x1e, 0xc7, 0xd2, 0x1a, 0x6e, 0xba, 0x80, 0x7c, 0xd3, 0xea, 0x43, 0x08, 0x09, 0x47, 0xe8, + 0xb1, 0x38, 0x89, 0x30, 0xa2, 0x77, 0xc6, 0x42, 0x96, 0x0b, 0x59, 0x3c, 0xe8, 0xb3, 0x4c, 0xc8, + 0x32, 0x21, 0xd3, 0xc2, 0x95, 0x8d, 0xbe, 0xc0, 0xa3, 0xd4, 0x65, 0x5e, 0x14, 0x58, 0xfd, 0xa8, + 0x1f, 0x59, 0x4a, 0xef, 0xa6, 0x87, 0x2a, 0x52, 0x81, 0xfa, 0x1a, 0x73, 0x57, 0x76, 0x74, 0x43, + 0x3c, 0x16, 0x01, 0xf7, 0x8e, 0x44, 0x08, 0xc9, 0xa7, 0xbc, 0xa5, 0x00, 0x90, 0x5b, 0xc3, 0x52, + 0x37, 0x2b, 0xd6, 0x3c, 0x55, 0x92, 0x86, 0x28, 0x02, 0x28, 0x09, 0x1e, 0x9c, 0x27, 0x90, 0xde, + 0x11, 0x04, 0xbc, 0xa4, 0xdb, 0x9e, 0xa7, 0x4b, 0x51, 0xf8, 0x96, 0x08, 0x51, 0x62, 0x52, 0x12, + 0xad, 0xcf, 0x35, 0x79, 0xc6, 0x2c, 0xed, 0xef, 0x55, 0xd2, 0xec, 0x22, 0x47, 0x38, 0x4c, 0xfd, + 0x2e, 0x20, 0xfd, 0x40, 0x1a, 0xd9, 0xd8, 0x3d, 0x8e, 0xbc, 0x65, 0xac, 0x19, 0x9d, 0xe6, 0xd6, + 0x3d, 0xa6, 0xcd, 0x2f, 0x76, 0x91, 0xdb, 0x9f, 0x65, 0xb3, 0xe1, 0x26, 0xdb, 0x73, 0x3f, 0x82, + 0x87, 0x2f, 0x00, 0xb9, 0x4d, 0x8f, 0x4f, 0x57, 0x2b, 0xa3, 0xd3, 0x55, 0x92, 0x9f, 0x39, 0x53, + 0x2a, 0x3d, 0x20, 0x0b, 0x32, 0x06, 0xaf, 0x55, 0x55, 0xf4, 0x5d, 0x76, 0xc1, 0xa7, 0x65, 0x85, + 0x2e, 0xbb, 0x31, 0x78, 0xf6, 0x92, 0xae, 0xb2, 0x90, 0x45, 0x8e, 0x62, 0x52, 0x97, 0x2c, 0x4a, + 0xe4, 0x98, 0xca, 0x56, 0x4d, 0xd1, 0x1f, 0x5d, 0x8a, 0xae, 0x08, 0xf6, 0x55, 0xcd, 0x5f, 0x1c, + 0xc7, 0x8e, 0x26, 0xb7, 0x7f, 0x1a, 0xe4, 0x5a, 0x21, 0xfb, 0xb9, 0x90, 0x48, 0xdf, 0x95, 0x5c, + 0x63, 0x17, 0x73, 0x2d, 0x53, 0x2b, 0xcf, 0xae, 0xeb, 0x6a, 0x8d, 0xc9, 0x49, 0xc1, 0xb1, 0x37, + 0xa4, 0x2e, 0x10, 0x02, 0xd9, 0xaa, 0xae, 0xd5, 0x3a, 0xcd, 0xad, 0x9d, 0xcb, 0x0c, 0x65, 0x5f, + 0xd1, 0x05, 0xea, 0xcf, 0x32, 0x94, 0x33, 0x26, 0xb6, 0x7f, 0xd4, 0xfe, 0x19, 0x26, 0xb3, 0x92, + 0x76, 0x48, 0x23, 0x81, 0xd8, 0x17, 0x1e, 0x97, 0x6a, 0x98, 0xba, 0xbd, 0x94, 0x35, 0xe6, 0xe8, + 0x33, 0x67, 0x7a, 0x4b, 0xdf, 0x93, 0x86, 0x04, 0x1f, 0x3c, 0x8c, 0x12, 0xfd, 0x9c, 0xdb, 0x17, + 0x1c, 0x9b, 0xbb, 0xe0, 0x77, 0xb5, 0x74, 0x8c, 0x9f, 0x44, 0xce, 0x14, 0x49, 0xdf, 0x92, 0x06, + 0x42, 0x10, 0xfb, 0x1c, 0x41, 0xbf, 0xe7, 0xc6, 0xfc, 0xd1, 0x33, 0xec, 0xab, 0xa8, 0xf7, 0x5a, + 0x0b, 0xd4, 0x8a, 0x4c, 0x4d, 0x9d, 0x9c, 0x3a, 0x53, 0x20, 0xfd, 0x62, 0x90, 0xe5, 0x61, 0xe4, + 0xa7, 0x01, 0x3c, 0xf6, 0xb9, 0x08, 0x26, 0x19, 0xb2, 0xb5, 0xa0, 0x4c, 0xde, 0x3e, 0xa7, 0x12, + 0x24, 0x52, 0x48, 0x84, 0x10, 0xf7, 0x73, 0x86, 0x7d, 0x5b, 0xd7, 0x5b, 0xde, 0x9f, 0x01, 0x76, + 0x66, 0x96, 0xa3, 0xf7, 0x49, 0x53, 0x42, 0x32, 0x14, 0x1e, 0xbc, 0xe4, 0x01, 0xb4, 0xea, 0x6b, + 0x46, 0xe7, 0x7f, 0xfb, 0xa6, 0x06, 0x35, 0xbb, 0xf9, 0x95, 0x53, 0xcc, 0x6b, 0x7f, 0x35, 0xc8, + 0x8d, 0xd2, 0xce, 0xd2, 0x27, 0x84, 0x46, 0x6e, 0x96, 0x06, 0xbd, 0xa7, 0xe3, 0x1f, 0x5d, 0x44, + 0xa1, 0x7a, 0xc4, 0x9a, 0x7d, 0x6b, 0x74, 0xba, 0x4a, 0xf7, 0x4a, 0xb7, 0xce, 0x0c, 0x05, 0x5d, + 0x2f, 0xac, 0x40, 0x55, 0xad, 0xc0, 0xd4, 0xca, 0xf2, 0x1a, 0xd8, 0x77, 0x8f, 0xcf, 0xcc, 0xca, + 0xc9, 0x99, 0x59, 0xf9, 0x75, 0x66, 0x56, 0x3e, 0x8f, 0x4c, 0xe3, 0x78, 0x64, 0x1a, 0x27, 0x23, + 0xd3, 0xf8, 0x3d, 0x32, 0x8d, 0x6f, 0x7f, 0xcc, 0xca, 0xc1, 0x7f, 0x7a, 0x23, 0xff, 0x06, 0x00, + 0x00, 0xff, 0xff, 0x85, 0x17, 0x32, 0x0e, 0x02, 0x06, 0x00, 0x00, } diff --git a/pkg/apis/apps/v1beta1/generated.proto b/pkg/apis/apps/v1beta1/generated.proto index b900a4b612216..f8c679d97cfa7 100644 --- a/pkg/apis/apps/v1beta1/generated.proto +++ b/pkg/apis/apps/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.apps.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/apps/v1beta1/types.generated.go b/pkg/apis/apps/v1beta1/types.generated.go index b6198c676f89c..4ede2a727af4c 100644 --- a/pkg/apis/apps/v1beta1/types.generated.go +++ b/pkg/apis/apps/v1beta1/types.generated.go @@ -28,8 +28,8 @@ import ( pkg4_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" + pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" - pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -68,8 +68,8 @@ func init() { var v0 pkg4_resource.Quantity var v1 pkg1_v1.TypeMeta var v2 pkg2_types.UID - var v3 pkg3_v1.PodTemplateSpec - var v4 pkg5_intstr.IntOrString + var v3 pkg5_intstr.IntOrString + var v4 pkg3_v1.PodTemplateSpec var v5 time.Time _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } diff --git a/pkg/apis/authentication/v1beta1/generated.pb.go b/pkg/apis/authentication/v1beta1/generated.pb.go index cd983f2bb0cb4..bfc706e54413d 100644 --- a/pkg/apis/authentication/v1beta1/generated.pb.go +++ b/pkg/apis/authentication/v1beta1/generated.pb.go @@ -1236,47 +1236,46 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 662 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xb5, 0xf3, 0x51, 0x92, 0x0d, 0x85, 0xb2, 0x12, 0x52, 0x14, 0x09, 0x27, 0x0a, 0x97, 0x22, - 0x95, 0x35, 0xa9, 0x50, 0xa9, 0x5a, 0x71, 0xa8, 0xd5, 0x82, 0x7a, 0x40, 0x48, 0x5b, 0xca, 0x01, - 0x09, 0x89, 0x8d, 0x33, 0x75, 0x8c, 0xeb, 0x0f, 0xad, 0xd7, 0x29, 0xbd, 0xf5, 0x27, 0x70, 0xe4, - 0xc8, 0x7f, 0xe1, 0xd2, 0x63, 0x0f, 0x1c, 0x38, 0xa0, 0x8a, 0x84, 0x3f, 0x82, 0x76, 0xbd, 0x6d, - 0xd2, 0xa4, 0x05, 0xd1, 0xde, 0xbc, 0x6f, 0x66, 0xde, 0x7b, 0x33, 0xe3, 0x41, 0x1b, 0xc1, 0x6a, - 0x4a, 0xfc, 0xd8, 0x0e, 0xb2, 0x2e, 0xf0, 0x08, 0x04, 0xa4, 0x76, 0x12, 0x78, 0x36, 0x4b, 0xfc, - 0xd4, 0x66, 0x99, 0xe8, 0x43, 0x24, 0x7c, 0x97, 0x09, 0x3f, 0x8e, 0xec, 0x41, 0xa7, 0x0b, 0x82, - 0x75, 0x6c, 0x0f, 0x22, 0xe0, 0x4c, 0x40, 0x8f, 0x24, 0x3c, 0x16, 0x31, 0xee, 0xe4, 0x14, 0x64, - 0x4c, 0x41, 0x92, 0xc0, 0x23, 0x92, 0x82, 0x5c, 0xa4, 0x20, 0x9a, 0xa2, 0xf1, 0xd8, 0xf3, 0x45, - 0x3f, 0xeb, 0x12, 0x37, 0x0e, 0x6d, 0x2f, 0xf6, 0x62, 0x5b, 0x31, 0x75, 0xb3, 0x3d, 0xf5, 0x52, - 0x0f, 0xf5, 0x95, 0x2b, 0x34, 0x9e, 0x6a, 0x93, 0x2c, 0xf1, 0x43, 0xe6, 0xf6, 0xfd, 0x08, 0xf8, - 0xe1, 0x99, 0x4d, 0x9b, 0x43, 0x1a, 0x67, 0xdc, 0x85, 0x69, 0x5f, 0x7f, 0xad, 0x4a, 0xed, 0x10, - 0x04, 0xb3, 0x07, 0x33, 0xdd, 0x34, 0xec, 0xab, 0xaa, 0x78, 0x16, 0x09, 0x3f, 0x9c, 0x95, 0x59, - 0xf9, 0x57, 0x41, 0xea, 0xf6, 0x21, 0x64, 0x33, 0x75, 0x4b, 0x57, 0x4e, 0xfe, 0x32, 0x5b, 0x9d, - 0xcb, 0xb3, 0x33, 0xe1, 0xef, 0xdb, 0x7e, 0x24, 0x52, 0xc1, 0xa7, 0x4b, 0xda, 0xcf, 0x10, 0xda, - 0xfa, 0x24, 0x38, 0x7b, 0xcb, 0xf6, 0x33, 0xc0, 0x4d, 0x54, 0xf6, 0x05, 0x84, 0x69, 0xdd, 0x6c, - 0x15, 0x17, 0xab, 0x4e, 0x75, 0x74, 0xda, 0x2c, 0x6f, 0x4b, 0x80, 0xe6, 0xf8, 0x5a, 0xe5, 0xcb, - 0xd7, 0xa6, 0x71, 0xf4, 0xb3, 0x65, 0xb4, 0xbf, 0x15, 0x50, 0xed, 0x4d, 0x1c, 0x40, 0x44, 0x61, - 0xe0, 0xc3, 0x01, 0xfe, 0x80, 0x2a, 0x72, 0x5a, 0x3d, 0x26, 0x58, 0xdd, 0x6c, 0x99, 0x8b, 0xb5, - 0xe5, 0x27, 0x44, 0xef, 0x7c, 0xb2, 0xe9, 0xf1, 0xd6, 0x65, 0x36, 0x19, 0x74, 0xc8, 0xeb, 0xee, - 0x47, 0x70, 0xc5, 0x2b, 0x10, 0xcc, 0xc1, 0xc7, 0xa7, 0x4d, 0x63, 0x74, 0xda, 0x44, 0x63, 0x8c, - 0x9e, 0xb3, 0xe2, 0x1e, 0x2a, 0xa5, 0x09, 0xb8, 0xf5, 0x82, 0x62, 0x77, 0xc8, 0x7f, 0xff, 0x51, - 0x64, 0xc2, 0xef, 0x4e, 0x02, 0xae, 0x73, 0x5b, 0xeb, 0x95, 0xe4, 0x8b, 0x2a, 0x76, 0xbc, 0x8f, - 0xe6, 0x52, 0xc1, 0x44, 0x96, 0xd6, 0x8b, 0x4a, 0x67, 0xf3, 0x86, 0x3a, 0x8a, 0xcb, 0xb9, 0xa3, - 0x95, 0xe6, 0xf2, 0x37, 0xd5, 0x1a, 0xed, 0x15, 0x74, 0x77, 0xca, 0x14, 0x7e, 0x88, 0xca, 0x42, - 0x42, 0x6a, 0x8a, 0x55, 0x67, 0x5e, 0x57, 0x96, 0xf3, 0xbc, 0x3c, 0xd6, 0xfe, 0x6e, 0xa2, 0x7b, - 0x33, 0x2a, 0x78, 0x1d, 0xcd, 0x4f, 0x38, 0x82, 0x9e, 0xa2, 0xa8, 0x38, 0xf7, 0x35, 0xc5, 0xfc, - 0xc6, 0x64, 0x90, 0x5e, 0xcc, 0xc5, 0xef, 0x51, 0x29, 0x4b, 0x81, 0xeb, 0xf1, 0xae, 0x5f, 0xa3, - 0xed, 0xdd, 0x14, 0xf8, 0x76, 0xb4, 0x17, 0x8f, 0xe7, 0x2a, 0x11, 0xaa, 0x68, 0x65, 0x5b, 0xc0, - 0x79, 0xcc, 0xd5, 0x58, 0x27, 0xda, 0xda, 0x92, 0x20, 0xcd, 0x63, 0xed, 0x61, 0x01, 0x55, 0xce, - 0x58, 0xf0, 0x12, 0xaa, 0xc8, 0xca, 0x88, 0x85, 0xa0, 0x67, 0xb1, 0xa0, 0x8b, 0x54, 0x8e, 0xc4, - 0xe9, 0x79, 0x06, 0x7e, 0x80, 0x8a, 0x99, 0xdf, 0x53, 0xee, 0xab, 0x4e, 0x4d, 0x27, 0x16, 0x77, - 0xb7, 0x37, 0xa9, 0xc4, 0x71, 0x1b, 0xcd, 0x79, 0x3c, 0xce, 0x12, 0xb9, 0x56, 0xf9, 0x6b, 0x23, - 0xb9, 0x8c, 0x97, 0x0a, 0xa1, 0x3a, 0x82, 0x03, 0x54, 0x06, 0x79, 0x0b, 0xf5, 0x52, 0xab, 0xb8, - 0x58, 0x5b, 0x7e, 0x71, 0x83, 0x11, 0x10, 0x75, 0x54, 0x5b, 0x91, 0xe0, 0x87, 0x13, 0xad, 0x4a, - 0x8c, 0xe6, 0x1a, 0x8d, 0x03, 0x7d, 0x78, 0x2a, 0x07, 0x2f, 0xa0, 0x62, 0x00, 0x87, 0x79, 0x9b, - 0x54, 0x7e, 0xe2, 0x1d, 0x54, 0x1e, 0xc8, 0x9b, 0xd4, 0xfb, 0x78, 0x7e, 0x0d, 0x33, 0xe3, 0xc3, - 0xa6, 0x39, 0xd7, 0x5a, 0x61, 0xd5, 0x74, 0x1e, 0x1d, 0x0f, 0x2d, 0xe3, 0x64, 0x68, 0x19, 0x3f, - 0x86, 0x96, 0x71, 0x34, 0xb2, 0xcc, 0xe3, 0x91, 0x65, 0x9e, 0x8c, 0x2c, 0xf3, 0xd7, 0xc8, 0x32, - 0x3f, 0xff, 0xb6, 0x8c, 0x77, 0xb7, 0x34, 0xc1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x37, - 0x33, 0x68, 0xf8, 0x05, 0x00, 0x00, + // 653 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0xd3, 0x4a, + 0x14, 0xb5, 0xf3, 0xd1, 0x97, 0x4c, 0x5e, 0xdf, 0xeb, 0x1b, 0xe9, 0x49, 0x51, 0x24, 0x9c, 0x28, + 0x6c, 0x8a, 0x54, 0xc6, 0xa4, 0xa0, 0x52, 0xb5, 0x62, 0x51, 0xab, 0x05, 0x75, 0x81, 0x90, 0xa6, + 0x94, 0x05, 0x12, 0x12, 0x13, 0xe7, 0xd6, 0x19, 0x5c, 0x7f, 0x68, 0x3c, 0x4e, 0xe9, 0xae, 0x3f, + 0x81, 0x25, 0x4b, 0xfe, 0x0b, 0x9b, 0x2e, 0xbb, 0x60, 0xc1, 0x02, 0x55, 0x24, 0xfc, 0x11, 0x34, + 0xe3, 0xa1, 0x49, 0x09, 0x15, 0xa2, 0xdd, 0x79, 0xce, 0xbd, 0xe7, 0xdc, 0x73, 0xef, 0xf5, 0x45, + 0x5b, 0xe1, 0x7a, 0x46, 0x78, 0xe2, 0x86, 0x79, 0x1f, 0x44, 0x0c, 0x12, 0x32, 0x37, 0x0d, 0x03, + 0x97, 0xa5, 0x3c, 0x73, 0x59, 0x2e, 0x87, 0x10, 0x4b, 0xee, 0x33, 0xc9, 0x93, 0xd8, 0x1d, 0xf5, + 0xfa, 0x20, 0x59, 0xcf, 0x0d, 0x20, 0x06, 0xc1, 0x24, 0x0c, 0x48, 0x2a, 0x12, 0x99, 0xe0, 0x5e, + 0x21, 0x41, 0xa6, 0x12, 0x24, 0x0d, 0x03, 0xa2, 0x24, 0xc8, 0x65, 0x09, 0x62, 0x24, 0x5a, 0x77, + 0x03, 0x2e, 0x87, 0x79, 0x9f, 0xf8, 0x49, 0xe4, 0x06, 0x49, 0x90, 0xb8, 0x5a, 0xa9, 0x9f, 0x1f, + 0xe8, 0x97, 0x7e, 0xe8, 0xaf, 0xa2, 0x42, 0xeb, 0x81, 0x31, 0xc9, 0x52, 0x1e, 0x31, 0x7f, 0xc8, + 0x63, 0x10, 0xc7, 0x53, 0x9b, 0x11, 0x48, 0xe6, 0x8e, 0xe6, 0x7c, 0xb5, 0xdc, 0xab, 0x58, 0x22, + 0x8f, 0x25, 0x8f, 0x60, 0x8e, 0xb0, 0xf6, 0x3b, 0x42, 0xe6, 0x0f, 0x21, 0x62, 0x73, 0xbc, 0xfb, + 0x57, 0xf1, 0x72, 0xc9, 0x0f, 0x5d, 0x1e, 0xcb, 0x4c, 0x8a, 0x39, 0xd2, 0xca, 0x95, 0x83, 0xff, + 0x45, 0x2f, 0xdd, 0x87, 0x08, 0xed, 0xbc, 0x95, 0x82, 0xbd, 0x60, 0x87, 0x39, 0xe0, 0x36, 0xaa, + 0x72, 0x09, 0x51, 0xd6, 0xb4, 0x3b, 0xe5, 0xe5, 0xba, 0x57, 0x9f, 0x9c, 0xb7, 0xab, 0xbb, 0x0a, + 0xa0, 0x05, 0xbe, 0x51, 0x7b, 0xff, 0xa1, 0x6d, 0x9d, 0x7c, 0xe9, 0x58, 0xdd, 0x8f, 0x25, 0xd4, + 0x78, 0x9e, 0x84, 0x10, 0x53, 0x18, 0x71, 0x38, 0xc2, 0xaf, 0x51, 0x4d, 0xcd, 0x6b, 0xc0, 0x24, + 0x6b, 0xda, 0x1d, 0x7b, 0xb9, 0xb1, 0x7a, 0x8f, 0x98, 0xfd, 0xcd, 0xda, 0x9f, 0x6e, 0x50, 0x65, + 0x93, 0x51, 0x8f, 0x3c, 0xeb, 0xbf, 0x01, 0x5f, 0x3e, 0x05, 0xc9, 0x3c, 0x7c, 0x7a, 0xde, 0xb6, + 0x26, 0xe7, 0x6d, 0x34, 0xc5, 0xe8, 0x85, 0x2a, 0x1e, 0xa0, 0x4a, 0x96, 0x82, 0xdf, 0x2c, 0x69, + 0x75, 0x8f, 0xfc, 0xf1, 0xdf, 0x41, 0x66, 0xfc, 0xee, 0xa5, 0xe0, 0x7b, 0x7f, 0x9b, 0x7a, 0x15, + 0xf5, 0xa2, 0x5a, 0x1d, 0x1f, 0xa2, 0x85, 0x4c, 0x32, 0x99, 0x67, 0xcd, 0xb2, 0xae, 0xb3, 0x7d, + 0xc3, 0x3a, 0x5a, 0xcb, 0xfb, 0xc7, 0x54, 0x5a, 0x28, 0xde, 0xd4, 0xd4, 0xe8, 0xae, 0xa1, 0x7f, + 0x7f, 0x32, 0x85, 0x6f, 0xa3, 0xaa, 0x54, 0x90, 0x9e, 0x62, 0xdd, 0x5b, 0x34, 0xcc, 0x6a, 0x91, + 0x57, 0xc4, 0xba, 0x9f, 0x6c, 0xf4, 0xdf, 0x5c, 0x15, 0xbc, 0x89, 0x16, 0x67, 0x1c, 0xc1, 0x40, + 0x4b, 0xd4, 0xbc, 0xff, 0x8d, 0xc4, 0xe2, 0xd6, 0x6c, 0x90, 0x5e, 0xce, 0xc5, 0xaf, 0x50, 0x25, + 0xcf, 0x40, 0x98, 0xf1, 0x6e, 0x5e, 0xa3, 0xed, 0xfd, 0x0c, 0xc4, 0x6e, 0x7c, 0x90, 0x4c, 0xe7, + 0xaa, 0x10, 0xaa, 0x65, 0x55, 0x5b, 0x20, 0x44, 0x22, 0xf4, 0x58, 0x67, 0xda, 0xda, 0x51, 0x20, + 0x2d, 0x62, 0xdd, 0x71, 0x09, 0xd5, 0x7e, 0xa8, 0xe0, 0x15, 0x54, 0x53, 0xcc, 0x98, 0x45, 0x60, + 0x66, 0xb1, 0x64, 0x48, 0x3a, 0x47, 0xe1, 0xf4, 0x22, 0x03, 0xdf, 0x42, 0xe5, 0x9c, 0x0f, 0xb4, + 0xfb, 0xba, 0xd7, 0x30, 0x89, 0xe5, 0xfd, 0xdd, 0x6d, 0xaa, 0x70, 0xdc, 0x45, 0x0b, 0x81, 0x48, + 0xf2, 0x54, 0xad, 0x55, 0xfd, 0xda, 0x48, 0x2d, 0xe3, 0x89, 0x46, 0xa8, 0x89, 0xe0, 0x10, 0x55, + 0x41, 0xdd, 0x42, 0xb3, 0xd2, 0x29, 0x2f, 0x37, 0x56, 0x1f, 0xdf, 0x60, 0x04, 0x44, 0x1f, 0xd5, + 0x4e, 0x2c, 0xc5, 0xf1, 0x4c, 0xab, 0x0a, 0xa3, 0x45, 0x8d, 0xd6, 0x91, 0x39, 0x3c, 0x9d, 0x83, + 0x97, 0x50, 0x39, 0x84, 0xe3, 0xa2, 0x4d, 0xaa, 0x3e, 0xf1, 0x1e, 0xaa, 0x8e, 0xd4, 0x4d, 0x9a, + 0x7d, 0x3c, 0xba, 0x86, 0x99, 0xe9, 0x61, 0xd3, 0x42, 0x6b, 0xa3, 0xb4, 0x6e, 0x7b, 0x77, 0x4e, + 0xc7, 0x8e, 0x75, 0x36, 0x76, 0xac, 0xcf, 0x63, 0xc7, 0x3a, 0x99, 0x38, 0xf6, 0xe9, 0xc4, 0xb1, + 0xcf, 0x26, 0x8e, 0xfd, 0x75, 0xe2, 0xd8, 0xef, 0xbe, 0x39, 0xd6, 0xcb, 0xbf, 0x8c, 0xc0, 0xf7, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x13, 0x16, 0x33, 0x53, 0xc4, 0x05, 0x00, 0x00, } diff --git a/pkg/apis/authentication/v1beta1/generated.proto b/pkg/apis/authentication/v1beta1/generated.proto index e01853e91d33b..fb9a5cdbde519 100644 --- a/pkg/apis/authentication/v1beta1/generated.proto +++ b/pkg/apis/authentication/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authentication.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/authorization/v1beta1/generated.pb.go b/pkg/apis/authorization/v1beta1/generated.pb.go index 806d83e09f02c..c3cd9026ec130 100644 --- a/pkg/apis/authorization/v1beta1/generated.pb.go +++ b/pkg/apis/authorization/v1beta1/generated.pb.go @@ -2283,62 +2283,61 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 898 bytes of a gzipped FileDescriptorProto + // 888 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0x5f, 0xef, 0x9f, 0x64, 0x77, 0x02, 0xa4, 0x4c, 0x55, 0xe2, 0x06, 0x69, 0x77, 0xb5, 0x48, - 0x28, 0x95, 0x8a, 0xdd, 0x54, 0xfc, 0xa9, 0x2a, 0x0e, 0xc4, 0x22, 0xaa, 0x2a, 0x68, 0x41, 0x13, - 0xc8, 0x01, 0x2e, 0x8c, 0x9d, 0xd7, 0x5d, 0xb3, 0xbb, 0x1e, 0x6b, 0x66, 0xec, 0x12, 0x4e, 0xfd, - 0x00, 0x1c, 0x38, 0xf6, 0xc8, 0x57, 0xe0, 0x0b, 0x70, 0x25, 0xc7, 0x1e, 0x41, 0x42, 0x2b, 0x62, - 0xbe, 0x05, 0x27, 0x34, 0xe3, 0xf1, 0x3a, 0x9b, 0x75, 0x5a, 0x2d, 0x14, 0xc1, 0xa1, 0x37, 0xfb, - 0xbd, 0xdf, 0x7b, 0xef, 0x37, 0x6f, 0x7e, 0x33, 0x6f, 0xd0, 0x07, 0xe3, 0x5b, 0xc2, 0x09, 0x99, - 0x3b, 0x4e, 0x7c, 0xe0, 0x11, 0x48, 0x10, 0x6e, 0x3c, 0x1e, 0xba, 0x34, 0x0e, 0x85, 0x4b, 0x13, - 0x39, 0x62, 0x3c, 0xfc, 0x96, 0xca, 0x90, 0x45, 0x6e, 0xba, 0xeb, 0x83, 0xa4, 0xbb, 0xee, 0x10, - 0x22, 0xe0, 0x54, 0xc2, 0x91, 0x13, 0x73, 0x26, 0x19, 0xbe, 0x91, 0x67, 0x70, 0xca, 0x0c, 0x4e, - 0x3c, 0x1e, 0x3a, 0x2a, 0x83, 0xb3, 0x90, 0xc1, 0x31, 0x19, 0xb6, 0xdf, 0x1a, 0x86, 0x72, 0x94, - 0xf8, 0x4e, 0xc0, 0xa6, 0xee, 0x90, 0x0d, 0x99, 0xab, 0x13, 0xf9, 0xc9, 0x03, 0xfd, 0xa7, 0x7f, - 0xf4, 0x57, 0x5e, 0x60, 0xfb, 0x6d, 0x43, 0x91, 0xc6, 0xe1, 0x94, 0x06, 0xa3, 0x30, 0x02, 0x7e, - 0x5c, 0x90, 0x74, 0x39, 0x08, 0x96, 0xf0, 0x00, 0xce, 0xd3, 0x7a, 0x6a, 0x94, 0x70, 0xa7, 0x20, - 0xa9, 0x9b, 0x2e, 0x2d, 0x66, 0xdb, 0xbd, 0x28, 0x8a, 0x27, 0x91, 0x0c, 0xa7, 0xcb, 0x65, 0xde, - 0x7d, 0x56, 0x80, 0x08, 0x46, 0x30, 0xa5, 0x4b, 0x71, 0xd7, 0x2f, 0xec, 0x7b, 0x15, 0xad, 0xdd, - 0x6a, 0x74, 0x22, 0xc3, 0x89, 0x1b, 0x46, 0x52, 0x48, 0x7e, 0x3e, 0x64, 0xf0, 0x1e, 0x42, 0xfb, - 0xdf, 0x48, 0x4e, 0x0f, 0xe9, 0x24, 0x01, 0xdc, 0x43, 0xad, 0x50, 0xc2, 0x54, 0xd8, 0x56, 0xbf, - 0xb1, 0xd3, 0xf1, 0x3a, 0xd9, 0xac, 0xd7, 0xba, 0xab, 0x0c, 0x24, 0xb7, 0xdf, 0x6e, 0x3f, 0xfe, - 0xa1, 0x57, 0x7b, 0xf4, 0x5b, 0xbf, 0x36, 0x98, 0xd5, 0x91, 0xfd, 0x31, 0x0b, 0xe8, 0xe4, 0x20, - 0xf1, 0xbf, 0x86, 0x40, 0xee, 0x05, 0x01, 0x08, 0x41, 0x20, 0x0d, 0xe1, 0x21, 0xfe, 0x0a, 0xb5, - 0x55, 0xeb, 0x8e, 0xa8, 0xa4, 0xb6, 0xd5, 0xb7, 0x76, 0x36, 0x6e, 0xde, 0x70, 0xcc, 0xfe, 0x9f, - 0xed, 0x40, 0xa9, 0x00, 0x85, 0x76, 0xd2, 0x5d, 0xe7, 0x13, 0x9d, 0xeb, 0x1e, 0x48, 0xea, 0xe1, - 0x93, 0x59, 0xaf, 0x96, 0xcd, 0x7a, 0xa8, 0xb4, 0x91, 0x79, 0x56, 0x3c, 0x46, 0x4d, 0x11, 0x43, - 0x60, 0xd7, 0x75, 0xf6, 0xbb, 0xce, 0xaa, 0xea, 0x72, 0x2a, 0x68, 0x1f, 0xc4, 0x10, 0x78, 0x2f, - 0x99, 0xb2, 0x4d, 0xf5, 0x47, 0x74, 0x11, 0x2c, 0xd0, 0x9a, 0x90, 0x54, 0x26, 0xc2, 0x6e, 0xe8, - 0x72, 0x1f, 0x3d, 0x9f, 0x72, 0x3a, 0xa5, 0xf7, 0x8a, 0x29, 0xb8, 0x96, 0xff, 0x13, 0x53, 0x6a, - 0xf0, 0x25, 0xba, 0x72, 0x9f, 0x45, 0xc4, 0x08, 0x77, 0x4f, 0x4a, 0x1e, 0xfa, 0x89, 0x04, 0x81, - 0xfb, 0xa8, 0x19, 0x53, 0x39, 0xd2, 0x8d, 0xed, 0x94, 0x7c, 0x3f, 0xa5, 0x72, 0x44, 0xb4, 0x47, - 0x21, 0x52, 0xe0, 0xbe, 0x6e, 0xce, 0x19, 0xc4, 0x21, 0x70, 0x9f, 0x68, 0xcf, 0xe0, 0xa7, 0x3a, - 0xc2, 0x15, 0xa9, 0x5d, 0xd4, 0x89, 0xe8, 0x14, 0x44, 0x4c, 0x03, 0x30, 0xf9, 0x5f, 0x35, 0xd1, - 0x9d, 0xfb, 0x85, 0x83, 0x94, 0x98, 0x67, 0x57, 0xc2, 0x6f, 0xa0, 0xd6, 0x90, 0xb3, 0x24, 0xd6, - 0xad, 0xeb, 0x78, 0x2f, 0x1b, 0x48, 0xeb, 0x8e, 0x32, 0x92, 0xdc, 0x87, 0xaf, 0xa1, 0xf5, 0x14, - 0xb8, 0x08, 0x59, 0x64, 0x37, 0x35, 0x6c, 0xd3, 0xc0, 0xd6, 0x0f, 0x73, 0x33, 0x29, 0xfc, 0xf8, - 0x3a, 0x6a, 0x17, 0x87, 0xd9, 0x6e, 0x69, 0xec, 0x25, 0x83, 0x6d, 0x17, 0x0b, 0x22, 0x73, 0x04, - 0x7e, 0x07, 0x6d, 0x88, 0xc4, 0x9f, 0x07, 0xac, 0xe9, 0x80, 0xcb, 0x26, 0x60, 0xe3, 0xa0, 0x74, - 0x91, 0xb3, 0x38, 0xb5, 0x2c, 0xb5, 0x46, 0x7b, 0x7d, 0x71, 0x59, 0xaa, 0x05, 0x44, 0x7b, 0x06, - 0xa7, 0x75, 0xb4, 0x75, 0x00, 0x93, 0x07, 0xff, 0x8d, 0xfa, 0xd9, 0x82, 0xfa, 0xef, 0xfd, 0x0d, - 0x39, 0x56, 0x53, 0xff, 0x7f, 0x9d, 0x80, 0x9f, 0xeb, 0xe8, 0xf5, 0xa7, 0x10, 0xc5, 0xdf, 0x59, - 0x08, 0xf3, 0x25, 0x11, 0x9b, 0x96, 0x7f, 0xb8, 0x3a, 0xc3, 0xe5, 0x03, 0xe1, 0xbd, 0x96, 0xcd, - 0x7a, 0x15, 0x07, 0x85, 0x54, 0xd4, 0xc5, 0x8f, 0x2d, 0x74, 0x25, 0xaa, 0x3a, 0xb1, 0x66, 0x9b, - 0xee, 0xac, 0xce, 0xa8, 0xf2, 0x02, 0xf0, 0xae, 0x66, 0xb3, 0x5e, 0xf5, 0xdd, 0x40, 0xaa, 0x09, - 0x0c, 0x7e, 0xad, 0xa3, 0xcb, 0x2f, 0xee, 0xe9, 0x7f, 0x47, 0xa5, 0x7f, 0x36, 0xd1, 0xd6, 0x0b, - 0x85, 0xfe, 0x43, 0x85, 0xce, 0x07, 0x49, 0x63, 0xf1, 0xc6, 0xfd, 0x5c, 0x00, 0x37, 0x83, 0xa4, - 0x5f, 0x0c, 0x92, 0xa6, 0x7e, 0x9b, 0x20, 0xb5, 0x15, 0x7a, 0x88, 0x88, 0x62, 0x8a, 0x1c, 0xa3, - 0x16, 0xa8, 0xb7, 0x8c, 0xdd, 0xea, 0x37, 0x76, 0x36, 0x6e, 0x7e, 0xf6, 0xdc, 0xc4, 0xe6, 0xe8, - 0x27, 0xd2, 0x7e, 0x24, 0xf9, 0x71, 0x39, 0xc0, 0xb4, 0x8d, 0xe4, 0x15, 0xb7, 0x53, 0xf3, 0x8c, - 0xd2, 0x18, 0x7c, 0x09, 0x35, 0xc6, 0x70, 0x9c, 0x0f, 0x50, 0xa2, 0x3e, 0x31, 0x41, 0xad, 0x54, - 0xbd, 0xb0, 0x4c, 0xa3, 0xdf, 0x5f, 0x9d, 0x5a, 0xf9, 0x4a, 0x23, 0x79, 0xaa, 0xdb, 0xf5, 0x5b, - 0xd6, 0xe0, 0x47, 0x0b, 0x5d, 0xbd, 0x50, 0xb2, 0x6a, 0xac, 0xd2, 0xc9, 0x84, 0x3d, 0x84, 0x23, - 0xcd, 0xa5, 0x5d, 0x8e, 0xd5, 0xbd, 0xdc, 0x4c, 0x0a, 0x3f, 0x7e, 0x13, 0xad, 0x71, 0xa0, 0x82, - 0x45, 0x66, 0x94, 0xcf, 0xd5, 0x4e, 0xb4, 0x95, 0x18, 0x2f, 0xde, 0x43, 0x9b, 0xa0, 0xca, 0x6b, - 0x72, 0xfb, 0x9c, 0x33, 0x6e, 0xb6, 0x6c, 0xcb, 0x04, 0x6c, 0xee, 0x2f, 0xba, 0xc9, 0x79, 0xbc, - 0x77, 0xed, 0xe4, 0xb4, 0x5b, 0x7b, 0x72, 0xda, 0xad, 0xfd, 0x72, 0xda, 0xad, 0x3d, 0xca, 0xba, - 0xd6, 0x49, 0xd6, 0xb5, 0x9e, 0x64, 0x5d, 0xeb, 0xf7, 0xac, 0x6b, 0x7d, 0xff, 0x47, 0xb7, 0xf6, - 0xc5, 0xba, 0x59, 0xf4, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x11, 0xdb, 0xa5, 0xac, 0x77, 0x0c, - 0x00, 0x00, + 0x14, 0x5f, 0xef, 0x9f, 0x64, 0x77, 0x02, 0xa4, 0x4c, 0x55, 0xe2, 0x06, 0xc9, 0xbb, 0x5a, 0x24, + 0x94, 0x4a, 0xc5, 0x6e, 0xca, 0xbf, 0xaa, 0xe2, 0x40, 0x2c, 0xa2, 0xaa, 0x82, 0x16, 0x34, 0x81, + 0x1c, 0xe0, 0xc2, 0xd8, 0x79, 0xdd, 0x35, 0xbb, 0xeb, 0xb1, 0x66, 0xc6, 0x2e, 0xe1, 0xd4, 0x0f, + 0xc0, 0x81, 0x63, 0x8f, 0x7c, 0x05, 0xbe, 0x00, 0x57, 0x72, 0xec, 0x11, 0x24, 0xb4, 0x22, 0xe6, + 0x5b, 0x70, 0x42, 0x33, 0x9e, 0x5d, 0x67, 0x59, 0x87, 0x6a, 0xa1, 0x88, 0x1e, 0x72, 0xb3, 0xdf, + 0xfb, 0xbd, 0xdf, 0xfb, 0xcd, 0x9b, 0x37, 0xf3, 0x06, 0xbd, 0x3f, 0xba, 0x25, 0xdc, 0x88, 0x79, + 0xa3, 0x34, 0x00, 0x1e, 0x83, 0x04, 0xe1, 0x25, 0xa3, 0x81, 0x47, 0x93, 0x48, 0x78, 0x34, 0x95, + 0x43, 0xc6, 0xa3, 0x6f, 0xa8, 0x8c, 0x58, 0xec, 0x65, 0xbb, 0x01, 0x48, 0xba, 0xeb, 0x0d, 0x20, + 0x06, 0x4e, 0x25, 0x1c, 0xb9, 0x09, 0x67, 0x92, 0xe1, 0x1b, 0x05, 0x83, 0x5b, 0x32, 0xb8, 0xc9, + 0x68, 0xe0, 0x2a, 0x06, 0x77, 0x81, 0xc1, 0x35, 0x0c, 0xdb, 0x6f, 0x0c, 0x22, 0x39, 0x4c, 0x03, + 0x37, 0x64, 0x13, 0x6f, 0xc0, 0x06, 0xcc, 0xd3, 0x44, 0x41, 0xfa, 0x40, 0xff, 0xe9, 0x1f, 0xfd, + 0x55, 0x24, 0xd8, 0x7e, 0xcb, 0x48, 0xa4, 0x49, 0x34, 0xa1, 0xe1, 0x30, 0x8a, 0x81, 0x1f, 0x97, + 0x22, 0x27, 0x20, 0xa9, 0x97, 0x2d, 0xc9, 0xda, 0xf6, 0xce, 0x8b, 0xe2, 0x69, 0x2c, 0xa3, 0x09, + 0x2c, 0x05, 0xbc, 0xf3, 0xb4, 0x00, 0x11, 0x0e, 0x61, 0x42, 0x97, 0xe2, 0xde, 0x3c, 0x2f, 0x2e, + 0x95, 0xd1, 0xd8, 0x8b, 0x62, 0x29, 0x24, 0x5f, 0x0a, 0xba, 0x7e, 0x6e, 0xd9, 0x2b, 0xd6, 0xd2, + 0x7f, 0x17, 0xa1, 0xfd, 0xaf, 0x25, 0xa7, 0x87, 0x74, 0x9c, 0x02, 0xee, 0xa2, 0x56, 0x24, 0x61, + 0x22, 0x6c, 0xab, 0xd7, 0xd8, 0xe9, 0xf8, 0x9d, 0x7c, 0xda, 0x6d, 0xdd, 0x55, 0x06, 0x52, 0xd8, + 0x6f, 0xb7, 0x1f, 0x7f, 0xdf, 0xad, 0x3d, 0xfa, 0xb5, 0x57, 0xeb, 0x4f, 0xeb, 0xc8, 0xfe, 0x88, + 0x85, 0x74, 0x7c, 0x90, 0x06, 0x5f, 0x41, 0x28, 0xf7, 0xc2, 0x10, 0x84, 0x20, 0x90, 0x45, 0xf0, + 0x10, 0x7f, 0x89, 0xda, 0xaa, 0x78, 0x47, 0x54, 0x52, 0xdb, 0xea, 0x59, 0x3b, 0x1b, 0x37, 0x6f, + 0xb8, 0x66, 0x2f, 0xcf, 0xae, 0xa5, 0xdc, 0x4d, 0x85, 0x76, 0xb3, 0x5d, 0xf7, 0x63, 0xcd, 0x75, + 0x0f, 0x24, 0xf5, 0xf1, 0xc9, 0xb4, 0x5b, 0xcb, 0xa7, 0x5d, 0x54, 0xda, 0xc8, 0x9c, 0x15, 0x8f, + 0x50, 0x53, 0x24, 0x10, 0xda, 0x75, 0xcd, 0x7e, 0xd7, 0x5d, 0xb5, 0x53, 0xdc, 0x0a, 0xd9, 0x07, + 0x09, 0x84, 0xfe, 0x0b, 0x26, 0x6d, 0x53, 0xfd, 0x11, 0x9d, 0x04, 0x0b, 0xb4, 0x26, 0x24, 0x95, + 0xa9, 0xb0, 0x1b, 0x3a, 0xdd, 0x87, 0xcf, 0x26, 0x9d, 0xa6, 0xf4, 0x5f, 0x32, 0x09, 0xd7, 0x8a, + 0x7f, 0x62, 0x52, 0xf5, 0xbf, 0x40, 0x57, 0xee, 0xb3, 0x98, 0x80, 0x60, 0x29, 0x0f, 0x61, 0x4f, + 0x4a, 0x1e, 0x05, 0xa9, 0x04, 0x81, 0x7b, 0xa8, 0x99, 0x50, 0x39, 0xd4, 0x85, 0xed, 0x94, 0x7a, + 0x3f, 0xa1, 0x72, 0x48, 0xb4, 0x47, 0x21, 0x32, 0xe0, 0x81, 0x2e, 0xce, 0x19, 0xc4, 0x21, 0xf0, + 0x80, 0x68, 0x4f, 0xff, 0xc7, 0x3a, 0xc2, 0x15, 0xd4, 0x1e, 0xea, 0xc4, 0x74, 0x02, 0x22, 0xa1, + 0x21, 0x18, 0xfe, 0x97, 0x4d, 0x74, 0xe7, 0xfe, 0xcc, 0x41, 0x4a, 0xcc, 0xd3, 0x33, 0xe1, 0xd7, + 0x50, 0x6b, 0xc0, 0x59, 0x9a, 0xe8, 0xd2, 0x75, 0xfc, 0x17, 0x0d, 0xa4, 0x75, 0x47, 0x19, 0x49, + 0xe1, 0xc3, 0xd7, 0xd0, 0x7a, 0x06, 0x5c, 0x44, 0x2c, 0xb6, 0x9b, 0x1a, 0xb6, 0x69, 0x60, 0xeb, + 0x87, 0x85, 0x99, 0xcc, 0xfc, 0xf8, 0x3a, 0x6a, 0x73, 0x23, 0xdc, 0x6e, 0x69, 0xec, 0x25, 0x83, + 0x6d, 0xcf, 0x16, 0x44, 0xe6, 0x08, 0xfc, 0x36, 0xda, 0x10, 0x69, 0x30, 0x0f, 0x58, 0xd3, 0x01, + 0x97, 0x4d, 0xc0, 0xc6, 0x41, 0xe9, 0x22, 0x67, 0x71, 0x6a, 0x59, 0x6a, 0x8d, 0xf6, 0xfa, 0xe2, + 0xb2, 0x54, 0x09, 0x88, 0xf6, 0xf4, 0x4f, 0xeb, 0x68, 0xeb, 0x00, 0xc6, 0x0f, 0xfe, 0x9f, 0xee, + 0x67, 0x0b, 0xdd, 0x7f, 0xef, 0x1f, 0xb4, 0x63, 0xb5, 0xf4, 0xe7, 0xeb, 0x04, 0xfc, 0x54, 0x47, + 0xaf, 0xfe, 0x8d, 0x50, 0xfc, 0xad, 0x85, 0x30, 0x5f, 0x6a, 0x62, 0x53, 0xf2, 0x0f, 0x56, 0x57, + 0xb8, 0x7c, 0x20, 0xfc, 0x57, 0xf2, 0x69, 0xb7, 0xe2, 0xa0, 0x90, 0x8a, 0xbc, 0xf8, 0xb1, 0x85, + 0xae, 0xc4, 0x55, 0x27, 0xd6, 0x6c, 0xd3, 0x9d, 0xd5, 0x15, 0x55, 0x5e, 0x00, 0xfe, 0xd5, 0x7c, + 0xda, 0xad, 0xbe, 0x1b, 0x48, 0xb5, 0x80, 0xfe, 0x2f, 0x75, 0x74, 0xf9, 0xe2, 0x9e, 0xfe, 0x6f, + 0xba, 0xf4, 0x8f, 0x26, 0xda, 0xba, 0xe8, 0xd0, 0x7f, 0xd9, 0xa1, 0xf3, 0x41, 0xd2, 0x58, 0xbc, + 0x71, 0x3f, 0x13, 0xc0, 0xcd, 0x20, 0xe9, 0xcd, 0x06, 0x49, 0x53, 0xbf, 0x4d, 0x90, 0xda, 0x0a, + 0x3d, 0x44, 0xc4, 0x6c, 0x8a, 0x1c, 0xa3, 0x16, 0xa8, 0xb7, 0x8c, 0xdd, 0xea, 0x35, 0x76, 0x36, + 0x6e, 0x7e, 0xfa, 0xcc, 0x9a, 0xcd, 0xd5, 0x4f, 0xa4, 0xfd, 0x58, 0xf2, 0xe3, 0x72, 0x80, 0x69, + 0x1b, 0x29, 0x32, 0x6e, 0x67, 0xe6, 0x19, 0xa5, 0x31, 0xf8, 0x12, 0x6a, 0x8c, 0xe0, 0xb8, 0x18, + 0xa0, 0x44, 0x7d, 0x62, 0x82, 0x5a, 0x99, 0x7a, 0x61, 0x99, 0x42, 0xbf, 0xb7, 0xba, 0xb4, 0xf2, + 0x95, 0x46, 0x0a, 0xaa, 0xdb, 0xf5, 0x5b, 0x56, 0xff, 0x07, 0x0b, 0x5d, 0x3d, 0xb7, 0x65, 0xd5, + 0x58, 0xa5, 0xe3, 0x31, 0x7b, 0x08, 0x47, 0x5a, 0x4b, 0xbb, 0x1c, 0xab, 0x7b, 0x85, 0x99, 0xcc, + 0xfc, 0xf8, 0x75, 0xb4, 0xc6, 0x81, 0x0a, 0x16, 0x9b, 0x51, 0x3e, 0xef, 0x76, 0xa2, 0xad, 0xc4, + 0x78, 0xf1, 0x1e, 0xda, 0x04, 0x95, 0x5e, 0x8b, 0xdb, 0xe7, 0x9c, 0x71, 0xb3, 0x65, 0x5b, 0x26, + 0x60, 0x73, 0x7f, 0xd1, 0x4d, 0xfe, 0x8a, 0xf7, 0xaf, 0x9d, 0x9c, 0x3a, 0xb5, 0x27, 0xa7, 0x4e, + 0xed, 0xe7, 0x53, 0xa7, 0xf6, 0x28, 0x77, 0xac, 0x93, 0xdc, 0xb1, 0x9e, 0xe4, 0x8e, 0xf5, 0x5b, + 0xee, 0x58, 0xdf, 0xfd, 0xee, 0xd4, 0x3e, 0x5f, 0x37, 0x8b, 0xfe, 0x33, 0x00, 0x00, 0xff, 0xff, + 0xb8, 0x9c, 0x70, 0x59, 0x43, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/authorization/v1beta1/generated.proto b/pkg/apis/authorization/v1beta1/generated.proto index 2dc9bba5c1ac5..8d02f4bd37367 100644 --- a/pkg/apis/authorization/v1beta1/generated.proto +++ b/pkg/apis/authorization/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authorization.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/autoscaling/v1/generated.pb.go b/pkg/apis/autoscaling/v1/generated.pb.go index cac6fc364fd6b..fe5fe465ed03c 100644 --- a/pkg/apis/autoscaling/v1/generated.pb.go +++ b/pkg/apis/autoscaling/v1/generated.pb.go @@ -1730,59 +1730,58 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 856 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xfa, 0x4f, 0x95, 0xce, 0x92, 0x04, 0x06, 0xa9, 0xb5, 0x52, 0xb1, 0x1b, 0x19, 0x0e, - 0x05, 0x95, 0x5d, 0x6c, 0x95, 0x8a, 0x1e, 0xb3, 0x41, 0xa5, 0x15, 0x0d, 0x8d, 0x26, 0x6d, 0x0f, - 0x08, 0x21, 0xc6, 0xeb, 0xd7, 0xcd, 0xd4, 0xde, 0x9d, 0xd5, 0xcc, 0xac, 0x05, 0x3d, 0x71, 0xe2, - 0xcc, 0x85, 0x0f, 0xc0, 0x47, 0xe1, 0x96, 0x63, 0x6f, 0x70, 0xb2, 0xc8, 0xc2, 0xc7, 0xe0, 0x80, - 0x76, 0x3c, 0x59, 0xaf, 0x9d, 0xd8, 0x89, 0x05, 0xea, 0xcd, 0x33, 0xef, 0xf7, 0xe7, 0xcd, 0x7b, - 0x6f, 0x9f, 0xd1, 0xfd, 0xe1, 0x67, 0xd2, 0x63, 0xdc, 0x1f, 0x66, 0x7d, 0x10, 0x09, 0x28, 0x90, - 0x7e, 0x3a, 0x8c, 0x7c, 0x9a, 0x32, 0xe9, 0xd3, 0x4c, 0x71, 0x19, 0xd2, 0x11, 0x4b, 0x22, 0x7f, - 0xdc, 0xf5, 0x23, 0x48, 0x40, 0x50, 0x05, 0x03, 0x2f, 0x15, 0x5c, 0x71, 0xfc, 0xe1, 0x94, 0xea, - 0xcd, 0xa8, 0x5e, 0x3a, 0x8c, 0xbc, 0x82, 0xea, 0x55, 0xa8, 0xde, 0xb8, 0xbb, 0xf3, 0x71, 0xc4, - 0xd4, 0x71, 0xd6, 0xf7, 0x42, 0x1e, 0xfb, 0x11, 0x8f, 0xb8, 0xaf, 0x15, 0xfa, 0xd9, 0x0b, 0x7d, - 0xd2, 0x07, 0xfd, 0x6b, 0xaa, 0xbc, 0x73, 0xd7, 0x24, 0x45, 0x53, 0x16, 0xd3, 0xf0, 0x98, 0x25, - 0x20, 0x7e, 0x38, 0x4b, 0xcb, 0x17, 0x20, 0x79, 0x26, 0x42, 0x58, 0xcc, 0x67, 0x25, 0x4b, 0xfa, - 0x31, 0x28, 0x7a, 0xc1, 0x2b, 0x76, 0xfc, 0x65, 0x2c, 0x91, 0x25, 0x8a, 0xc5, 0xe7, 0x6d, 0xee, - 0x5d, 0x46, 0x90, 0xe1, 0x31, 0xc4, 0xf4, 0x1c, 0xef, 0xce, 0xd2, 0x4a, 0x5f, 0x94, 0x56, 0xf7, - 0x62, 0x74, 0xa6, 0xd8, 0xc8, 0x67, 0x89, 0x92, 0x4a, 0x2c, 0x52, 0x3a, 0xbf, 0x58, 0xe8, 0xd6, - 0xbe, 0xe0, 0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0xf4, 0x5f, 0x42, 0xa8, 0x08, 0xbc, 0x00, - 0x01, 0x49, 0x08, 0x78, 0x17, 0x35, 0x87, 0x2c, 0x19, 0xb4, 0xad, 0x5d, 0xeb, 0xf6, 0xf5, 0xe0, - 0xad, 0x93, 0x89, 0x5b, 0xcb, 0x27, 0x6e, 0xf3, 0x4b, 0x96, 0x0c, 0x88, 0x8e, 0x14, 0x88, 0x84, - 0xc6, 0xd0, 0xae, 0xcf, 0x23, 0xbe, 0xa2, 0x31, 0x10, 0x1d, 0xc1, 0x3d, 0x84, 0x68, 0xca, 0x8c, - 0x41, 0xbb, 0xa1, 0x71, 0xd8, 0xe0, 0xd0, 0xde, 0xe1, 0x23, 0x13, 0x21, 0x15, 0x54, 0xe7, 0xf7, - 0x3a, 0xba, 0xf9, 0x90, 0x0b, 0xf6, 0x8a, 0x27, 0x8a, 0x8e, 0x0e, 0xf9, 0x60, 0xcf, 0x0c, 0x07, - 0x08, 0xfc, 0x1d, 0xda, 0x28, 0x1a, 0x33, 0xa0, 0x8a, 0xea, 0xbc, 0xec, 0xde, 0x27, 0x9e, 0x19, - 0xab, 0x6a, 0x7d, 0x67, 0x83, 0x55, 0xa0, 0xbd, 0x71, 0xd7, 0x9b, 0x3e, 0xee, 0x00, 0x14, 0x9d, - 0xf9, 0xcf, 0xee, 0x48, 0xa9, 0x8a, 0x8f, 0x51, 0x53, 0xa6, 0x10, 0xea, 0x37, 0xd9, 0xbd, 0x07, - 0xde, 0x95, 0x87, 0xd6, 0x5b, 0x92, 0xf3, 0x51, 0x0a, 0xe1, 0xac, 0x36, 0xc5, 0x89, 0x68, 0x07, - 0x9c, 0xa2, 0x6b, 0x52, 0x51, 0x95, 0x49, 0x5d, 0x17, 0xbb, 0xf7, 0xf0, 0x7f, 0xf0, 0xd2, 0x7a, - 0xc1, 0x96, 0x71, 0xbb, 0x36, 0x3d, 0x13, 0xe3, 0xd3, 0xf9, 0xdb, 0x42, 0xb7, 0x96, 0x30, 0x1f, - 0x33, 0xa9, 0xf0, 0x37, 0xe7, 0xaa, 0xeb, 0x5d, 0xad, 0xba, 0x05, 0x5b, 0xd7, 0xf6, 0x6d, 0xe3, - 0xbc, 0x71, 0x76, 0x53, 0xa9, 0x6c, 0x84, 0x5a, 0x4c, 0x41, 0x2c, 0xdb, 0xf5, 0xdd, 0xc6, 0x6d, - 0xbb, 0x17, 0xfc, 0xf7, 0xe7, 0x06, 0x9b, 0xc6, 0xae, 0xf5, 0xa8, 0x10, 0x26, 0x53, 0xfd, 0xce, - 0x3f, 0xf5, 0xa5, 0xcf, 0x2c, 0xca, 0x8f, 0x7f, 0xb2, 0xd0, 0x96, 0x3e, 0x3e, 0xa5, 0x22, 0x82, - 0x62, 0xe2, 0xcd, 0x6b, 0xd7, 0xe9, 0xf6, 0x8a, 0x2f, 0x27, 0xb8, 0x61, 0xd2, 0xda, 0x3a, 0x9a, - 0x73, 0x21, 0x0b, 0xae, 0xb8, 0x8b, 0xec, 0x98, 0x25, 0x04, 0xd2, 0x11, 0x0b, 0xa9, 0xd4, 0x23, - 0xd7, 0x0a, 0xb6, 0xf3, 0x89, 0x6b, 0x1f, 0xcc, 0xae, 0x49, 0x15, 0x83, 0x3f, 0x45, 0x76, 0x4c, - 0xbf, 0x2f, 0x29, 0x0d, 0x4d, 0x79, 0xd7, 0xf8, 0xd9, 0x07, 0xb3, 0x10, 0xa9, 0xe2, 0xf0, 0x4b, - 0xe4, 0x28, 0x6d, 0xbb, 0x7f, 0xf8, 0xec, 0x99, 0x62, 0x23, 0xf6, 0x8a, 0x2a, 0xc6, 0x93, 0x43, - 0x10, 0x21, 0x24, 0x8a, 0x46, 0xd0, 0x6e, 0x6a, 0xa5, 0x4e, 0x3e, 0x71, 0x9d, 0xa7, 0x2b, 0x91, - 0xe4, 0x12, 0xa5, 0xce, 0x6f, 0x0d, 0xf4, 0xde, 0xca, 0xf9, 0xc4, 0x0f, 0x10, 0xe6, 0x7d, 0x09, - 0x62, 0x0c, 0x83, 0x2f, 0xa6, 0x4b, 0xa9, 0xd8, 0x0e, 0x45, 0x0f, 0x1a, 0xc1, 0x8d, 0x7c, 0xe2, - 0xe2, 0x27, 0xe7, 0xa2, 0xe4, 0x02, 0x06, 0x0e, 0xd1, 0xe6, 0x88, 0x4a, 0x35, 0xad, 0x32, 0x33, - 0x8b, 0xc8, 0xee, 0x7d, 0x74, 0xb5, 0xa1, 0x2d, 0x18, 0xc1, 0x3b, 0xf9, 0xc4, 0xdd, 0x7c, 0x5c, - 0x15, 0x21, 0xf3, 0x9a, 0x78, 0x0f, 0x6d, 0x87, 0x99, 0x10, 0x90, 0xa8, 0x85, 0xaa, 0xdf, 0x34, - 0x55, 0xdf, 0xde, 0x9f, 0x0f, 0x93, 0x45, 0x7c, 0x21, 0x31, 0x00, 0xc9, 0x04, 0x0c, 0x4a, 0x89, - 0xe6, 0xbc, 0xc4, 0xe7, 0xf3, 0x61, 0xb2, 0x88, 0xc7, 0x31, 0x72, 0x8d, 0xea, 0xd2, 0x0e, 0xb6, - 0xb4, 0xe4, 0xfb, 0xf9, 0xc4, 0x75, 0xf7, 0x57, 0x43, 0xc9, 0x65, 0x5a, 0x9d, 0x5f, 0xeb, 0xa8, - 0xa5, 0x4b, 0xf0, 0x06, 0x36, 0xee, 0xf3, 0xb9, 0x8d, 0x7b, 0x77, 0x8d, 0x6f, 0x50, 0x67, 0xb8, - 0x74, 0xbf, 0x7e, 0xbb, 0xb0, 0x5f, 0xef, 0xad, 0xad, 0xbc, 0x7a, 0x9b, 0xde, 0x47, 0xd7, 0xcb, - 0x04, 0xf0, 0x1d, 0xb4, 0x21, 0xce, 0x7a, 0x6b, 0xe9, 0x46, 0x94, 0xab, 0xb0, 0x6c, 0x6a, 0x89, - 0xe8, 0x30, 0x64, 0x57, 0x1c, 0xd6, 0x23, 0x17, 0x68, 0x09, 0x23, 0x08, 0x15, 0x17, 0xe6, 0x9f, - 0xb7, 0x44, 0x1f, 0x99, 0x7b, 0x52, 0x22, 0x82, 0x0f, 0x4e, 0x4e, 0x9d, 0xda, 0xeb, 0x53, 0xa7, - 0xf6, 0xc7, 0xa9, 0x53, 0xfb, 0x31, 0x77, 0xac, 0x93, 0xdc, 0xb1, 0x5e, 0xe7, 0x8e, 0xf5, 0x67, - 0xee, 0x58, 0x3f, 0xff, 0xe5, 0xd4, 0xbe, 0xae, 0x8f, 0xbb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, - 0x86, 0x24, 0xe7, 0xa3, 0xd7, 0x09, 0x00, 0x00, + // 846 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x55, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0xfa, 0x47, 0x95, 0xce, 0x92, 0x04, 0x06, 0xa9, 0xb5, 0x52, 0xb1, 0x1b, 0x19, 0x0e, + 0x05, 0x95, 0x5d, 0x6c, 0x4a, 0x45, 0x8f, 0xd9, 0xa0, 0xd2, 0x8a, 0x86, 0x46, 0x93, 0xb6, 0x07, + 0x84, 0x10, 0xe3, 0xf5, 0xeb, 0x66, 0x6a, 0xef, 0xec, 0x6a, 0x66, 0x6c, 0x41, 0x4f, 0x9c, 0x38, + 0x73, 0xe1, 0x0f, 0xe0, 0x4f, 0xe1, 0x96, 0x63, 0x6f, 0x70, 0xb2, 0xc8, 0xc2, 0x9f, 0xc1, 0x01, + 0xed, 0x78, 0xb2, 0x5e, 0xdb, 0x59, 0x27, 0x11, 0x88, 0x9b, 0x67, 0xde, 0xf7, 0x7d, 0xef, 0xcd, + 0xf7, 0xde, 0x3e, 0xa3, 0xfb, 0xc3, 0x4f, 0xa5, 0xc7, 0x12, 0x7f, 0x38, 0xee, 0x83, 0xe0, 0xa0, + 0x40, 0xfa, 0xe9, 0x30, 0xf2, 0x69, 0xca, 0xa4, 0x4f, 0xc7, 0x2a, 0x91, 0x21, 0x1d, 0x31, 0x1e, + 0xf9, 0x93, 0xae, 0x1f, 0x01, 0x07, 0x41, 0x15, 0x0c, 0xbc, 0x54, 0x24, 0x2a, 0xc1, 0xef, 0xcf, + 0xa8, 0xde, 0x9c, 0xea, 0xa5, 0xc3, 0xc8, 0xcb, 0xa9, 0x5e, 0x89, 0xea, 0x4d, 0xba, 0x3b, 0x1f, + 0x46, 0x4c, 0x1d, 0x8f, 0xfb, 0x5e, 0x98, 0xc4, 0x7e, 0x94, 0x44, 0x89, 0xaf, 0x15, 0xfa, 0xe3, + 0x17, 0xfa, 0xa4, 0x0f, 0xfa, 0xd7, 0x4c, 0x79, 0xe7, 0xae, 0x29, 0x8a, 0xa6, 0x2c, 0xa6, 0xe1, + 0x31, 0xe3, 0x20, 0xbe, 0x9f, 0x97, 0x15, 0x83, 0xa2, 0xe7, 0xd4, 0xb3, 0xe3, 0x57, 0xb1, 0xc4, + 0x98, 0x2b, 0x16, 0xc3, 0x0a, 0xe1, 0xde, 0x45, 0x04, 0x19, 0x1e, 0x43, 0x4c, 0x57, 0x78, 0x1f, + 0x57, 0xf1, 0xc6, 0x8a, 0x8d, 0x7c, 0xc6, 0x95, 0x54, 0x62, 0x85, 0x74, 0xa7, 0xd2, 0xe8, 0x73, + 0xde, 0xd2, 0xf9, 0xd9, 0x42, 0xb7, 0xf6, 0x45, 0x22, 0xe5, 0x73, 0x10, 0x92, 0x25, 0xfc, 0x49, + 0xff, 0x25, 0x84, 0x8a, 0xc0, 0x0b, 0x10, 0xc0, 0x43, 0xc0, 0xbb, 0xa8, 0x39, 0x64, 0x7c, 0xd0, + 0xb6, 0x76, 0xad, 0xdb, 0xd7, 0x83, 0x37, 0x4e, 0xa6, 0x6e, 0x2d, 0x9b, 0xba, 0xcd, 0x2f, 0x18, + 0x1f, 0x10, 0x1d, 0xc9, 0x11, 0x9c, 0xc6, 0xd0, 0xae, 0x2f, 0x22, 0xbe, 0xa4, 0x31, 0x10, 0x1d, + 0xc1, 0x3d, 0x84, 0x68, 0xca, 0x4c, 0x82, 0x76, 0x43, 0xe3, 0xb0, 0xc1, 0xa1, 0xbd, 0xc3, 0x47, + 0x26, 0x42, 0x4a, 0xa8, 0xce, 0x6f, 0x75, 0x74, 0xf3, 0x61, 0x22, 0xd8, 0xab, 0x84, 0x2b, 0x3a, + 0x3a, 0x4c, 0x06, 0x7b, 0xa6, 0xd1, 0x20, 0xf0, 0xb7, 0x68, 0x23, 0x6f, 0xcd, 0x80, 0x2a, 0xaa, + 0xeb, 0xb2, 0x7b, 0x1f, 0x79, 0x66, 0x44, 0xca, 0x4e, 0xcd, 0x87, 0x24, 0x47, 0x7b, 0x93, 0xae, + 0x37, 0x7b, 0xdc, 0x01, 0x28, 0x3a, 0xcf, 0x3f, 0xbf, 0x23, 0x85, 0x2a, 0x3e, 0x46, 0x4d, 0x99, + 0x42, 0xa8, 0xdf, 0x64, 0xf7, 0x1e, 0x78, 0x97, 0x1e, 0x40, 0xaf, 0xa2, 0xe6, 0xa3, 0x14, 0xc2, + 0xb9, 0x37, 0xf9, 0x89, 0xe8, 0x0c, 0x38, 0x45, 0xd7, 0xa4, 0xa2, 0x6a, 0x2c, 0xb5, 0x2f, 0x76, + 0xef, 0xe1, 0x7f, 0x90, 0x4b, 0xeb, 0x05, 0x5b, 0x26, 0xdb, 0xb5, 0xd9, 0x99, 0x98, 0x3c, 0x9d, + 0xbf, 0x2c, 0x74, 0xab, 0x82, 0xf9, 0x98, 0x49, 0x85, 0xbf, 0x5e, 0x71, 0xd7, 0xbb, 0x9c, 0xbb, + 0x39, 0x5b, 0x7b, 0xfb, 0xa6, 0xc9, 0xbc, 0x71, 0x76, 0x53, 0x72, 0x36, 0x42, 0x2d, 0xa6, 0x20, + 0x96, 0xed, 0xfa, 0x6e, 0xe3, 0xb6, 0xdd, 0x0b, 0xfe, 0xfd, 0x73, 0x83, 0x4d, 0x93, 0xae, 0xf5, + 0x28, 0x17, 0x26, 0x33, 0xfd, 0xce, 0xdf, 0xf5, 0xca, 0x67, 0xe6, 0xf6, 0xe3, 0x1f, 0x2d, 0xb4, + 0xa5, 0x8f, 0x4f, 0xa9, 0x88, 0x20, 0x9f, 0x78, 0xf3, 0xda, 0xab, 0x74, 0x7b, 0xcd, 0x97, 0x13, + 0xdc, 0x30, 0x65, 0x6d, 0x1d, 0x2d, 0x64, 0x21, 0x4b, 0x59, 0x71, 0x17, 0xd9, 0x31, 0xe3, 0x04, + 0xd2, 0x11, 0x0b, 0xa9, 0xd4, 0x23, 0xd7, 0x0a, 0xb6, 0xb3, 0xa9, 0x6b, 0x1f, 0xcc, 0xaf, 0x49, + 0x19, 0x83, 0x3f, 0x41, 0x76, 0x4c, 0xbf, 0x2b, 0x28, 0x0d, 0x4d, 0x79, 0xdb, 0xe4, 0xb3, 0x0f, + 0xe6, 0x21, 0x52, 0xc6, 0xe1, 0x97, 0xc8, 0x51, 0x3a, 0xed, 0xfe, 0xe1, 0xb3, 0x67, 0x8a, 0x8d, + 0xd8, 0x2b, 0xaa, 0x58, 0xc2, 0x0f, 0x41, 0x84, 0xc0, 0x15, 0x8d, 0xa0, 0xdd, 0xd4, 0x4a, 0x9d, + 0x6c, 0xea, 0x3a, 0x4f, 0xd7, 0x22, 0xc9, 0x05, 0x4a, 0x9d, 0x5f, 0x1b, 0xe8, 0x9d, 0xb5, 0xf3, + 0x89, 0x1f, 0x20, 0x9c, 0xf4, 0x25, 0x88, 0x09, 0x0c, 0x3e, 0x9f, 0x2d, 0xa5, 0x7c, 0x3b, 0xe4, + 0x3d, 0x68, 0x04, 0x37, 0xb2, 0xa9, 0x8b, 0x9f, 0xac, 0x44, 0xc9, 0x39, 0x0c, 0x1c, 0xa2, 0xcd, + 0x11, 0x95, 0x6a, 0xe6, 0x32, 0x33, 0x8b, 0xc8, 0xee, 0x7d, 0x70, 0xb9, 0xa1, 0xcd, 0x19, 0xc1, + 0x5b, 0xd9, 0xd4, 0xdd, 0x7c, 0x5c, 0x16, 0x21, 0x8b, 0x9a, 0x78, 0x0f, 0x6d, 0x87, 0x63, 0x21, + 0x80, 0xab, 0x25, 0xd7, 0x6f, 0x1a, 0xd7, 0xb7, 0xf7, 0x17, 0xc3, 0x64, 0x19, 0x9f, 0x4b, 0x0c, + 0x40, 0x32, 0x01, 0x83, 0x42, 0xa2, 0xb9, 0x28, 0xf1, 0xd9, 0x62, 0x98, 0x2c, 0xe3, 0x71, 0x8c, + 0x5c, 0xa3, 0x5a, 0xd9, 0xc1, 0x96, 0x96, 0x7c, 0x37, 0x9b, 0xba, 0xee, 0xfe, 0x7a, 0x28, 0xb9, + 0x48, 0xab, 0xf3, 0x4b, 0x1d, 0xb5, 0xb4, 0x05, 0xff, 0xc3, 0xc6, 0x7d, 0xbe, 0xb0, 0x71, 0xef, + 0x5e, 0xe1, 0x1b, 0xd4, 0x15, 0x56, 0xee, 0xd7, 0x6f, 0x96, 0xf6, 0xeb, 0xbd, 0x2b, 0x2b, 0xaf, + 0xdf, 0xa6, 0xf7, 0xd1, 0xf5, 0xa2, 0x00, 0x7c, 0x07, 0x6d, 0x88, 0xb3, 0xde, 0x5a, 0xba, 0x11, + 0xc5, 0x2a, 0x2c, 0x9a, 0x5a, 0x20, 0x3a, 0x0c, 0xd9, 0xa5, 0x0c, 0x57, 0x23, 0xe7, 0x68, 0x09, + 0x23, 0x08, 0x55, 0x22, 0xcc, 0x3f, 0x6f, 0x81, 0x3e, 0x32, 0xf7, 0xa4, 0x40, 0x04, 0xef, 0x9d, + 0x9c, 0x3a, 0xb5, 0xd7, 0xa7, 0x4e, 0xed, 0xf7, 0x53, 0xa7, 0xf6, 0x43, 0xe6, 0x58, 0x27, 0x99, + 0x63, 0xbd, 0xce, 0x1c, 0xeb, 0x8f, 0xcc, 0xb1, 0x7e, 0xfa, 0xd3, 0xa9, 0x7d, 0x55, 0x9f, 0x74, + 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x22, 0xc2, 0xa0, 0xa7, 0xa3, 0x09, 0x00, 0x00, } diff --git a/pkg/apis/autoscaling/v1/generated.proto b/pkg/apis/autoscaling/v1/generated.proto index 6a6bbf6fdf520..f625e3db135f9 100644 --- a/pkg/apis/autoscaling/v1/generated.proto +++ b/pkg/apis/autoscaling/v1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.autoscaling.v1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/pkg/apis/batch/v1/BUILD b/pkg/apis/batch/v1/BUILD index 1f6292605e1bd..5637d0c3797d5 100644 --- a/pkg/apis/batch/v1/BUILD +++ b/pkg/apis/batch/v1/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/apimachinery/pkg/api/resource", @@ -37,6 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/batch/v1/generated.pb.go b/pkg/apis/batch/v1/generated.pb.go index de8dba8e90565..7f98902b9d7c3 100644 --- a/pkg/apis/batch/v1/generated.pb.go +++ b/pkg/apis/batch/v1/generated.pb.go @@ -1520,61 +1520,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 882 bytes of a gzipped FileDescriptorProto + // 870 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xe3, 0x44, - 0x18, 0x6d, 0x92, 0xa6, 0x4d, 0x26, 0x6d, 0x77, 0x19, 0xa9, 0x52, 0xe8, 0x45, 0xb2, 0x0a, 0x08, - 0x15, 0xb4, 0x6b, 0x93, 0xee, 0x0a, 0x21, 0x2e, 0x90, 0x70, 0x11, 0x12, 0x55, 0xcb, 0x56, 0x93, - 0x0a, 0x24, 0x7e, 0x24, 0xc6, 0xf6, 0xd7, 0x74, 0xa8, 0xed, 0xb1, 0x3c, 0xe3, 0x48, 0xbd, 0xe3, - 0x0d, 0xe0, 0x61, 0x10, 0xe2, 0x11, 0x7a, 0xd9, 0x4b, 0xae, 0x22, 0x6a, 0xde, 0x62, 0xaf, 0xd0, - 0x8c, 0xc7, 0x3f, 0x69, 0xd3, 0x25, 0xbb, 0x77, 0x9e, 0x6f, 0xce, 0x39, 0xdf, 0xf1, 0x7c, 0x67, - 0x06, 0x3d, 0xbf, 0xfc, 0x54, 0x58, 0x8c, 0xdb, 0x97, 0xa9, 0x0b, 0x49, 0x04, 0x12, 0x84, 0x1d, - 0x5f, 0x4e, 0x6d, 0x1a, 0x33, 0x61, 0xbb, 0x54, 0x7a, 0x17, 0xf6, 0x6c, 0x6c, 0x4f, 0x21, 0x82, - 0x84, 0x4a, 0xf0, 0xad, 0x38, 0xe1, 0x92, 0xe3, 0xf7, 0x72, 0x92, 0x55, 0x91, 0xac, 0xf8, 0x72, - 0x6a, 0x29, 0x92, 0xa5, 0x49, 0xd6, 0x6c, 0xbc, 0xf7, 0x6c, 0xca, 0xe4, 0x45, 0xea, 0x5a, 0x1e, - 0x0f, 0xed, 0x29, 0x9f, 0x72, 0x5b, 0x73, 0xdd, 0xf4, 0x5c, 0xaf, 0xf4, 0x42, 0x7f, 0xe5, 0x9a, - 0x7b, 0x2f, 0x8c, 0x11, 0x1a, 0xb3, 0x90, 0x7a, 0x17, 0x2c, 0x82, 0xe4, 0xaa, 0xb0, 0x62, 0x27, - 0x20, 0x78, 0x9a, 0x78, 0x70, 0xd7, 0xc9, 0x6b, 0x59, 0xc2, 0x0e, 0x41, 0xd2, 0x25, 0xfe, 0xf7, - 0xec, 0x87, 0x58, 0x49, 0x1a, 0x49, 0x16, 0xde, 0x6f, 0xf3, 0xc9, 0xff, 0x11, 0x84, 0x77, 0x01, - 0x21, 0xbd, 0xc7, 0x7b, 0xfa, 0xe0, 0xe9, 0x2e, 0xb3, 0x35, 0x5e, 0x8e, 0x4e, 0x25, 0x0b, 0x6c, - 0x16, 0x49, 0x21, 0x93, 0xbb, 0x94, 0xd1, 0x6f, 0x4d, 0xd4, 0x3a, 0xe2, 0x2e, 0xfe, 0x19, 0x75, - 0xd4, 0xcf, 0xfa, 0x54, 0xd2, 0x7e, 0xe3, 0x49, 0x63, 0xbf, 0x77, 0xf0, 0xb1, 0x65, 0x86, 0x54, - 0xf7, 0x5c, 0x8d, 0x49, 0xa1, 0xad, 0xd9, 0xd8, 0x7a, 0xe9, 0xfe, 0x02, 0x9e, 0x3c, 0x01, 0x49, - 0x1d, 0x7c, 0x3d, 0x1f, 0xae, 0x65, 0xf3, 0x21, 0xaa, 0x6a, 0xa4, 0x54, 0xc5, 0xdf, 0xa0, 0x75, - 0x11, 0x83, 0xd7, 0x6f, 0x6a, 0xf5, 0xa7, 0xd6, 0x0a, 0x11, 0xb0, 0x8e, 0xb8, 0x3b, 0x89, 0xc1, - 0x73, 0xb6, 0x8c, 0xf2, 0xba, 0x5a, 0x11, 0xad, 0x83, 0xbf, 0x45, 0x1b, 0x42, 0x52, 0x99, 0x8a, - 0x7e, 0x4b, 0x2b, 0x5a, 0x2b, 0x2b, 0x6a, 0x96, 0xb3, 0x63, 0x34, 0x37, 0xf2, 0x35, 0x31, 0x6a, - 0xa3, 0x9b, 0x16, 0xda, 0x3a, 0xe2, 0xee, 0x21, 0x8f, 0x7c, 0x26, 0x19, 0x8f, 0xf0, 0x0b, 0xb4, - 0x2e, 0xaf, 0x62, 0xd0, 0xc7, 0xd2, 0x75, 0x9e, 0x14, 0x56, 0xce, 0xae, 0x62, 0x78, 0x35, 0x1f, - 0x3e, 0xae, 0x63, 0x55, 0x8d, 0x68, 0x74, 0xcd, 0x5e, 0x53, 0xf3, 0x3e, 0x5f, 0x6c, 0xf7, 0x6a, - 0x3e, 0x7c, 0xed, 0x6c, 0xad, 0x52, 0x73, 0xd1, 0x1e, 0x9e, 0xa2, 0xed, 0x80, 0x0a, 0x79, 0x9a, - 0x70, 0x17, 0xce, 0x58, 0x08, 0xe6, 0xef, 0x3f, 0x5a, 0x6d, 0x5a, 0x8a, 0xe1, 0xec, 0x1a, 0x2b, - 0xdb, 0xc7, 0x75, 0x21, 0xb2, 0xa8, 0x8b, 0x67, 0x08, 0xab, 0xc2, 0x59, 0x42, 0x23, 0x91, 0xff, - 0x9c, 0xea, 0xb6, 0xfe, 0xc6, 0xdd, 0xf6, 0x4c, 0x37, 0x7c, 0x7c, 0x4f, 0x8d, 0x2c, 0xe9, 0x80, - 0x3f, 0x40, 0x1b, 0x09, 0x50, 0xc1, 0xa3, 0x7e, 0x5b, 0x1f, 0x5c, 0x39, 0x27, 0xa2, 0xab, 0xc4, - 0xec, 0xe2, 0x0f, 0xd1, 0x66, 0x08, 0x42, 0xd0, 0x29, 0xf4, 0x37, 0x34, 0xf0, 0x91, 0x01, 0x6e, - 0x9e, 0xe4, 0x65, 0x52, 0xec, 0x8f, 0xfe, 0x6c, 0xa0, 0xcd, 0x23, 0xee, 0x1e, 0x33, 0x21, 0xf1, - 0x8f, 0xf7, 0x82, 0x6e, 0xad, 0xf6, 0x33, 0x8a, 0xad, 0x63, 0xfe, 0xd8, 0xf4, 0xe9, 0x14, 0x95, - 0x5a, 0xc8, 0x4f, 0x50, 0x9b, 0x49, 0x08, 0xd5, 0xd0, 0x5b, 0xfb, 0xbd, 0x83, 0xfd, 0x55, 0x33, - 0xe9, 0x6c, 0x1b, 0xd1, 0xf6, 0xd7, 0x8a, 0x4e, 0x72, 0x95, 0xd1, 0x5f, 0x2d, 0x6d, 0x5c, 0xa5, - 0x1e, 0x8f, 0x51, 0x2f, 0xa6, 0x09, 0x0d, 0x02, 0x08, 0x98, 0x08, 0xb5, 0xf7, 0xb6, 0xf3, 0x28, - 0x9b, 0x0f, 0x7b, 0xa7, 0x55, 0x99, 0xd4, 0x31, 0x8a, 0xe2, 0xf1, 0x30, 0x0e, 0x40, 0x1d, 0x6e, - 0x1e, 0x44, 0x43, 0x39, 0xac, 0xca, 0xa4, 0x8e, 0xc1, 0x2f, 0xd1, 0x2e, 0xf5, 0x24, 0x9b, 0xc1, - 0x97, 0x40, 0xfd, 0x80, 0x45, 0x30, 0x01, 0x8f, 0x47, 0x7e, 0x7e, 0xc9, 0x5a, 0xce, 0xbb, 0xd9, - 0x7c, 0xb8, 0xfb, 0xc5, 0x32, 0x00, 0x59, 0xce, 0xc3, 0x3f, 0xa1, 0x8e, 0x80, 0x00, 0x3c, 0xc9, - 0x13, 0x13, 0x9e, 0xe7, 0x2b, 0x9e, 0x37, 0x75, 0x21, 0x98, 0x18, 0xaa, 0xb3, 0xa5, 0x0e, 0xbc, - 0x58, 0x91, 0x52, 0x12, 0x7f, 0x86, 0x76, 0x42, 0x1a, 0xa5, 0xb4, 0x44, 0xea, 0xd4, 0x74, 0x1c, - 0x9c, 0xcd, 0x87, 0x3b, 0x27, 0x0b, 0x3b, 0xe4, 0x0e, 0x12, 0xff, 0x80, 0x3a, 0x12, 0xc2, 0x38, - 0xa0, 0x32, 0x8f, 0x50, 0xef, 0xe0, 0xd9, 0xc3, 0xf3, 0x52, 0x96, 0x4e, 0xb9, 0x7f, 0x66, 0x08, - 0xfa, 0x59, 0x2a, 0x93, 0x50, 0x54, 0x49, 0x29, 0x38, 0xfa, 0xa3, 0x85, 0xba, 0xe5, 0x63, 0x83, - 0x01, 0x21, 0xaf, 0xb8, 0xd0, 0xa2, 0xdf, 0xd0, 0xe1, 0x18, 0xaf, 0x1a, 0x8e, 0xf2, 0x29, 0xa8, - 0x5e, 0xd8, 0xb2, 0x24, 0x48, 0x4d, 0x18, 0x7f, 0x87, 0xba, 0x42, 0xd2, 0x44, 0xea, 0xab, 0xda, - 0x7c, 0xe3, 0xab, 0xba, 0x9d, 0xcd, 0x87, 0xdd, 0x49, 0x21, 0x40, 0x2a, 0x2d, 0x7c, 0x8e, 0x76, - 0xaa, 0x94, 0xbc, 0xe5, 0xb3, 0xa3, 0x47, 0x72, 0xb8, 0xa0, 0x42, 0xee, 0xa8, 0xaa, 0xcb, 0x9f, - 0xc7, 0x48, 0x67, 0xa5, 0x5d, 0x5d, 0xfe, 0x3c, 0x73, 0xc4, 0xec, 0x62, 0x1b, 0x75, 0x45, 0xea, - 0x79, 0x00, 0x3e, 0xf8, 0x7a, 0xe2, 0x6d, 0xe7, 0x1d, 0x03, 0xed, 0x4e, 0x8a, 0x0d, 0x52, 0x61, - 0x94, 0xf0, 0x39, 0x65, 0x01, 0xf8, 0x7a, 0xd2, 0x35, 0xe1, 0xaf, 0x74, 0x95, 0x98, 0x5d, 0xe7, - 0xfd, 0xeb, 0xdb, 0xc1, 0xda, 0xcd, 0xed, 0x60, 0xed, 0xef, 0xdb, 0xc1, 0xda, 0xaf, 0xd9, 0xa0, - 0x71, 0x9d, 0x0d, 0x1a, 0x37, 0xd9, 0xa0, 0xf1, 0x4f, 0x36, 0x68, 0xfc, 0xfe, 0xef, 0x60, 0xed, - 0xfb, 0xe6, 0x6c, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x6d, 0xf1, 0x7d, 0xf5, 0x08, - 0x00, 0x00, + 0x14, 0xce, 0x4f, 0xd3, 0x26, 0x93, 0xb6, 0xbb, 0x8c, 0x54, 0x29, 0xf4, 0x22, 0x59, 0x05, 0x84, + 0x0a, 0xda, 0xb5, 0x49, 0xbb, 0x42, 0x88, 0x0b, 0x24, 0x5c, 0x84, 0x44, 0xd5, 0xb2, 0xd5, 0xa4, + 0x02, 0x89, 0x1f, 0x89, 0xb1, 0x7d, 0x9a, 0x0e, 0xb5, 0x3d, 0x96, 0x67, 0x12, 0xa9, 0x77, 0xbc, + 0x01, 0x3c, 0x0c, 0x42, 0x3c, 0x42, 0x2f, 0x7b, 0xc9, 0x55, 0x44, 0xcd, 0x5b, 0xec, 0x15, 0x9a, + 0xf1, 0xf8, 0x27, 0x9b, 0x14, 0x52, 0xee, 0xec, 0x33, 0xdf, 0xf7, 0x9d, 0x33, 0xe7, 0x7c, 0x67, + 0xd0, 0xd1, 0xf5, 0xc7, 0xc2, 0x62, 0xdc, 0xbe, 0x9e, 0xba, 0x90, 0x44, 0x20, 0x41, 0xd8, 0xf1, + 0xf5, 0xc4, 0xa6, 0x31, 0x13, 0xb6, 0x4b, 0xa5, 0x77, 0x65, 0xcf, 0x46, 0xf6, 0x04, 0x22, 0x48, + 0xa8, 0x04, 0xdf, 0x8a, 0x13, 0x2e, 0x39, 0x7e, 0x27, 0x23, 0x59, 0x25, 0xc9, 0x8a, 0xaf, 0x27, + 0x96, 0x22, 0x59, 0x9a, 0x64, 0xcd, 0x46, 0xfb, 0x2f, 0x26, 0x4c, 0x5e, 0x4d, 0x5d, 0xcb, 0xe3, + 0xa1, 0x3d, 0xe1, 0x13, 0x6e, 0x6b, 0xae, 0x3b, 0xbd, 0xd4, 0x7f, 0xfa, 0x47, 0x7f, 0x65, 0x9a, + 0xfb, 0x2f, 0x4d, 0x21, 0x34, 0x66, 0x21, 0xf5, 0xae, 0x58, 0x04, 0xc9, 0x4d, 0x59, 0x4a, 0x08, + 0x92, 0xae, 0xa8, 0x64, 0xdf, 0x7e, 0x88, 0x95, 0x4c, 0x23, 0xc9, 0x42, 0x58, 0x22, 0x7c, 0xf4, + 0x5f, 0x04, 0xe1, 0x5d, 0x41, 0x48, 0x97, 0x78, 0x47, 0x0f, 0xf1, 0xa6, 0x92, 0x05, 0x36, 0x8b, + 0xa4, 0x90, 0xc9, 0x12, 0xe9, 0xf9, 0x83, 0xcd, 0x5d, 0x71, 0x97, 0xe1, 0x2f, 0x0d, 0xd4, 0x3c, + 0xe1, 0x2e, 0xfe, 0x11, 0xb5, 0xd5, 0x75, 0x7d, 0x2a, 0x69, 0xaf, 0xfe, 0xac, 0x7e, 0xd0, 0x3d, + 0xfc, 0xd0, 0x32, 0x0d, 0xaf, 0x66, 0x2f, 0x5b, 0xae, 0xd0, 0xd6, 0x6c, 0x64, 0xbd, 0x72, 0x7f, + 0x02, 0x4f, 0x9e, 0x81, 0xa4, 0x0e, 0xbe, 0x9d, 0x0f, 0x6a, 0xe9, 0x7c, 0x80, 0xca, 0x18, 0x29, + 0x54, 0xf1, 0x57, 0x68, 0x43, 0xc4, 0xe0, 0xf5, 0x1a, 0x5a, 0xfd, 0xb9, 0xb5, 0xc6, 0x38, 0xad, + 0x13, 0xee, 0x8e, 0x63, 0xf0, 0x9c, 0x6d, 0xa3, 0xbc, 0xa1, 0xfe, 0x88, 0xd6, 0xc1, 0x5f, 0xa3, + 0x4d, 0x21, 0xa9, 0x9c, 0x8a, 0x5e, 0x53, 0x2b, 0x5a, 0x6b, 0x2b, 0x6a, 0x96, 0xb3, 0x6b, 0x34, + 0x37, 0xb3, 0x7f, 0x62, 0xd4, 0x86, 0x77, 0x4d, 0xb4, 0x7d, 0xc2, 0xdd, 0x63, 0x1e, 0xf9, 0x4c, + 0x32, 0x1e, 0xe1, 0x97, 0x68, 0x43, 0xde, 0xc4, 0xa0, 0xdb, 0xd2, 0x71, 0x9e, 0xe5, 0xa5, 0x5c, + 0xdc, 0xc4, 0xf0, 0x7a, 0x3e, 0x78, 0x5a, 0xc5, 0xaa, 0x18, 0xd1, 0xe8, 0x4a, 0x79, 0x0d, 0xcd, + 0xfb, 0x74, 0x31, 0xdd, 0xeb, 0xf9, 0xe0, 0x5f, 0x07, 0x65, 0x15, 0x9a, 0x8b, 0xe5, 0xe1, 0x09, + 0xda, 0x09, 0xa8, 0x90, 0xe7, 0x09, 0x77, 0xe1, 0x82, 0x85, 0x60, 0x6e, 0xff, 0xc1, 0x7a, 0xd3, + 0x52, 0x0c, 0x67, 0xcf, 0x94, 0xb2, 0x73, 0x5a, 0x15, 0x22, 0x8b, 0xba, 0x78, 0x86, 0xb0, 0x0a, + 0x5c, 0x24, 0x34, 0x12, 0xd9, 0xe5, 0x54, 0xb6, 0x8d, 0x47, 0x67, 0xdb, 0x37, 0xd9, 0xf0, 0xe9, + 0x92, 0x1a, 0x59, 0x91, 0x01, 0xbf, 0x87, 0x36, 0x13, 0xa0, 0x82, 0x47, 0xbd, 0x96, 0x6e, 0x5c, + 0x31, 0x27, 0xa2, 0xa3, 0xc4, 0x9c, 0xe2, 0xf7, 0xd1, 0x56, 0x08, 0x42, 0xd0, 0x09, 0xf4, 0x36, + 0x35, 0xf0, 0x89, 0x01, 0x6e, 0x9d, 0x65, 0x61, 0x92, 0x9f, 0x0f, 0x7f, 0xaf, 0xa3, 0xad, 0x13, + 0xee, 0x9e, 0x32, 0x21, 0xf1, 0xf7, 0x4b, 0x46, 0xb7, 0xd6, 0xbb, 0x8c, 0x62, 0x6b, 0x9b, 0x3f, + 0x35, 0x79, 0xda, 0x79, 0xa4, 0x62, 0xf2, 0x33, 0xd4, 0x62, 0x12, 0x42, 0x35, 0xf4, 0xe6, 0x41, + 0xf7, 0xf0, 0x60, 0x5d, 0x4f, 0x3a, 0x3b, 0x46, 0xb4, 0xf5, 0xa5, 0xa2, 0x93, 0x4c, 0x65, 0xf8, + 0x47, 0x53, 0x17, 0xae, 0x5c, 0x8f, 0x47, 0xa8, 0x1b, 0xd3, 0x84, 0x06, 0x01, 0x04, 0x4c, 0x84, + 0xba, 0xf6, 0x96, 0xf3, 0x24, 0x9d, 0x0f, 0xba, 0xe7, 0x65, 0x98, 0x54, 0x31, 0x8a, 0xe2, 0xf1, + 0x30, 0x0e, 0x40, 0x35, 0x37, 0x33, 0xa2, 0xa1, 0x1c, 0x97, 0x61, 0x52, 0xc5, 0xe0, 0x57, 0x68, + 0x8f, 0x7a, 0x92, 0xcd, 0xe0, 0x73, 0xa0, 0x7e, 0xc0, 0x22, 0x18, 0x83, 0xc7, 0x23, 0x3f, 0x5b, + 0xb2, 0xa6, 0xf3, 0x76, 0x3a, 0x1f, 0xec, 0x7d, 0xb6, 0x0a, 0x40, 0x56, 0xf3, 0xf0, 0x0f, 0xa8, + 0x2d, 0x20, 0x00, 0x4f, 0xf2, 0xc4, 0x98, 0xe7, 0x68, 0xcd, 0x7e, 0x53, 0x17, 0x82, 0xb1, 0xa1, + 0x3a, 0xdb, 0xaa, 0xe1, 0xf9, 0x1f, 0x29, 0x24, 0xf1, 0x27, 0x68, 0x37, 0xa4, 0xd1, 0x94, 0x16, + 0x48, 0xed, 0x9a, 0xb6, 0x83, 0xd3, 0xf9, 0x60, 0xf7, 0x6c, 0xe1, 0x84, 0xbc, 0x81, 0xc4, 0xdf, + 0xa1, 0xb6, 0x84, 0x30, 0x0e, 0xa8, 0xcc, 0x2c, 0xd4, 0x3d, 0x7c, 0xf1, 0xf0, 0xbc, 0x54, 0x49, + 0xe7, 0xdc, 0xbf, 0x30, 0x04, 0xfd, 0x2c, 0x15, 0x4e, 0xc8, 0xa3, 0xa4, 0x10, 0x1c, 0xfe, 0xd6, + 0x44, 0x9d, 0xe2, 0xb1, 0xc1, 0x80, 0x90, 0x97, 0x2f, 0xb4, 0xe8, 0xd5, 0xb5, 0x39, 0x46, 0xeb, + 0x9a, 0xa3, 0x78, 0x0a, 0xca, 0x17, 0xb6, 0x08, 0x09, 0x52, 0x11, 0xc6, 0xdf, 0xa0, 0x8e, 0x90, + 0x34, 0x91, 0x7a, 0x55, 0x1b, 0x8f, 0x5e, 0xd5, 0x9d, 0x74, 0x3e, 0xe8, 0x8c, 0x73, 0x01, 0x52, + 0x6a, 0xe1, 0x4b, 0xb4, 0x5b, 0xba, 0xe4, 0x7f, 0x3e, 0x3b, 0x7a, 0x24, 0xc7, 0x0b, 0x2a, 0xe4, + 0x0d, 0x55, 0xb5, 0xfc, 0x99, 0x8d, 0xb4, 0x57, 0x5a, 0xe5, 0xf2, 0x67, 0x9e, 0x23, 0xe6, 0x14, + 0xdb, 0xa8, 0x23, 0xa6, 0x9e, 0x07, 0xe0, 0x83, 0xaf, 0x27, 0xde, 0x72, 0xde, 0x32, 0xd0, 0xce, + 0x38, 0x3f, 0x20, 0x25, 0x46, 0x09, 0x5f, 0x52, 0x16, 0x80, 0xaf, 0x27, 0x5d, 0x11, 0xfe, 0x42, + 0x47, 0x89, 0x39, 0x75, 0xde, 0xbd, 0xbd, 0xef, 0xd7, 0xee, 0xee, 0xfb, 0xb5, 0x3f, 0xef, 0xfb, + 0xb5, 0x9f, 0xd3, 0x7e, 0xfd, 0x36, 0xed, 0xd7, 0xef, 0xd2, 0x7e, 0xfd, 0xaf, 0xb4, 0x5f, 0xff, + 0xf5, 0xef, 0x7e, 0xed, 0xdb, 0xc6, 0x6c, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xa8, + 0x29, 0x00, 0xc1, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/batch/v1/generated.proto b/pkg/apis/batch/v1/generated.proto index 81a0df78644a3..c54224c71e2fe 100644 --- a/pkg/apis/batch/v1/generated.proto +++ b/pkg/apis/batch/v1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index 8eb0b41962d92..ac4d89a31ffbb 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -28,8 +28,8 @@ import ( pkg4_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" + pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" - pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -68,8 +68,8 @@ func init() { var v0 pkg4_resource.Quantity var v1 pkg1_v1.TypeMeta var v2 pkg2_types.UID - var v3 pkg3_v1.PodTemplateSpec - var v4 pkg5_intstr.IntOrString + var v3 pkg5_intstr.IntOrString + var v4 pkg3_v1.PodTemplateSpec var v5 time.Time _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } diff --git a/pkg/apis/batch/v2alpha1/BUILD b/pkg/apis/batch/v2alpha1/BUILD index 3ba9ca519f36e..5b0ab22c64e18 100644 --- a/pkg/apis/batch/v2alpha1/BUILD +++ b/pkg/apis/batch/v2alpha1/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/apimachinery/pkg/api/resource", @@ -37,6 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/batch/v2alpha1/generated.pb.go b/pkg/apis/batch/v2alpha1/generated.pb.go index 2e7eeeadf9464..da8c9d015633f 100644 --- a/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/pkg/apis/batch/v2alpha1/generated.pb.go @@ -2707,78 +2707,77 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1158 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x6f, 0xe3, 0x44, - 0x14, 0xaf, 0x93, 0x36, 0x1f, 0x93, 0x7e, 0x0e, 0x54, 0x1b, 0x8a, 0x94, 0x54, 0x91, 0x40, 0xdd, - 0xd5, 0xae, 0x4d, 0x43, 0xb5, 0x2c, 0x7b, 0x40, 0x5a, 0x17, 0x21, 0x51, 0xb5, 0xda, 0x6a, 0xd2, - 0x65, 0x11, 0x14, 0x69, 0x27, 0xf6, 0x34, 0xf1, 0xd6, 0xf6, 0x18, 0xcf, 0xb8, 0x52, 0x6e, 0x9c, - 0x39, 0x71, 0xe7, 0x0f, 0xe0, 0x5f, 0x40, 0x88, 0x23, 0x87, 0x72, 0xeb, 0x81, 0x03, 0x5c, 0x22, - 0x6a, 0xfe, 0x8b, 0x9e, 0x90, 0x27, 0xe3, 0x8f, 0x7c, 0x75, 0x9b, 0x22, 0x55, 0xe2, 0xe6, 0x79, - 0xf3, 0x7e, 0xbf, 0x79, 0xf3, 0xde, 0x6f, 0xde, 0x33, 0xf8, 0xf8, 0xf4, 0x09, 0x53, 0x2d, 0xaa, - 0x9d, 0x06, 0x6d, 0xe2, 0xbb, 0x84, 0x13, 0xa6, 0x79, 0xa7, 0x1d, 0x0d, 0x7b, 0x16, 0xd3, 0xda, - 0x98, 0x1b, 0x5d, 0xed, 0xac, 0x89, 0x6d, 0xaf, 0x8b, 0xb7, 0xb5, 0x0e, 0x71, 0x89, 0x8f, 0x39, - 0x31, 0x55, 0xcf, 0xa7, 0x9c, 0xc2, 0xfb, 0x03, 0xa8, 0x9a, 0x42, 0x55, 0xef, 0xb4, 0xa3, 0x46, - 0x50, 0x55, 0x40, 0xd5, 0x18, 0xba, 0xf1, 0xa8, 0x63, 0xf1, 0x6e, 0xd0, 0x56, 0x0d, 0xea, 0x68, - 0x1d, 0xda, 0xa1, 0x9a, 0x60, 0x68, 0x07, 0x27, 0x62, 0x25, 0x16, 0xe2, 0x6b, 0xc0, 0xbc, 0xb1, - 0x23, 0x83, 0xc2, 0x9e, 0xe5, 0x60, 0xa3, 0x6b, 0xb9, 0xc4, 0xef, 0xc5, 0x61, 0x69, 0x3e, 0x61, - 0x34, 0xf0, 0x0d, 0x32, 0x1a, 0xcf, 0xb5, 0x28, 0xa6, 0x39, 0x84, 0x63, 0xed, 0x6c, 0xec, 0x16, - 0x1b, 0xda, 0x34, 0x94, 0x1f, 0xb8, 0xdc, 0x72, 0xc6, 0x8f, 0x79, 0xfc, 0x26, 0x00, 0x33, 0xba, - 0xc4, 0xc1, 0x63, 0xb8, 0x87, 0x53, 0x33, 0x3d, 0x29, 0xac, 0xed, 0xc9, 0xde, 0x01, 0xb7, 0x6c, - 0xcd, 0x72, 0x39, 0xe3, 0xfe, 0x28, 0xa4, 0xf1, 0x53, 0x0e, 0x14, 0x77, 0x7d, 0xea, 0xee, 0xd1, - 0x36, 0x7c, 0x05, 0x4a, 0xd1, 0x85, 0x4d, 0xcc, 0x71, 0x55, 0xd9, 0x54, 0xb6, 0x2a, 0xcd, 0x0f, - 0x54, 0x59, 0xae, 0x6c, 0xdc, 0x69, 0xc1, 0x22, 0x6f, 0xf5, 0x6c, 0x5b, 0x7d, 0xde, 0x7e, 0x4d, - 0x0c, 0x7e, 0x40, 0x38, 0xd6, 0xe1, 0x79, 0xbf, 0x3e, 0x17, 0xf6, 0xeb, 0x20, 0xb5, 0xa1, 0x84, - 0x15, 0x7e, 0x09, 0xe6, 0x99, 0x47, 0x8c, 0x6a, 0x4e, 0xb0, 0x3f, 0x56, 0x6f, 0x2c, 0x06, 0x55, - 0xc6, 0xd8, 0xf2, 0x88, 0xa1, 0x2f, 0xca, 0x33, 0xe6, 0xa3, 0x15, 0x12, 0x8c, 0xf0, 0x15, 0x28, - 0x30, 0x8e, 0x79, 0xc0, 0xaa, 0x79, 0xc1, 0xfd, 0xe4, 0x16, 0xdc, 0x02, 0xaf, 0x2f, 0x4b, 0xf6, - 0xc2, 0x60, 0x8d, 0x24, 0x6f, 0xe3, 0x37, 0x05, 0x54, 0xa4, 0xe7, 0xbe, 0xc5, 0x38, 0x3c, 0x1e, - 0xcb, 0x96, 0x7a, 0xb3, 0x6c, 0x45, 0x68, 0x91, 0xab, 0x55, 0x79, 0x52, 0x29, 0xb6, 0x64, 0x32, - 0xf5, 0x12, 0x2c, 0x58, 0x9c, 0x38, 0xac, 0x9a, 0xdb, 0xcc, 0x6f, 0x55, 0x9a, 0xcd, 0xd9, 0xaf, - 0xa3, 0x2f, 0x49, 0xfa, 0x85, 0xcf, 0x23, 0x22, 0x34, 0xe0, 0x6b, 0x7c, 0x9f, 0x4f, 0xae, 0x11, - 0xa5, 0x0f, 0x3e, 0x04, 0xa5, 0x48, 0x7b, 0x66, 0x60, 0x13, 0x71, 0x8d, 0x72, 0x1a, 0x56, 0x4b, - 0xda, 0x51, 0xe2, 0x01, 0x5f, 0x80, 0x7b, 0x8c, 0x63, 0x9f, 0x5b, 0x6e, 0xe7, 0x53, 0x82, 0x4d, - 0xdb, 0x72, 0x49, 0x8b, 0x18, 0xd4, 0x35, 0x99, 0xa8, 0x69, 0x5e, 0x7f, 0x37, 0xec, 0xd7, 0xef, - 0xb5, 0x26, 0xbb, 0xa0, 0x69, 0x58, 0x78, 0x0c, 0xd6, 0x0c, 0xea, 0x1a, 0x81, 0xef, 0x13, 0xd7, - 0xe8, 0x1d, 0x52, 0xdb, 0x32, 0x7a, 0xa2, 0x90, 0x65, 0x5d, 0x95, 0xd1, 0xac, 0xed, 0x8e, 0x3a, - 0x5c, 0x4d, 0x32, 0xa2, 0x71, 0x22, 0xf8, 0x1e, 0x28, 0xb2, 0x80, 0x79, 0xc4, 0x35, 0xab, 0xf3, - 0x9b, 0xca, 0x56, 0x49, 0xaf, 0x84, 0xfd, 0x7a, 0xb1, 0x35, 0x30, 0xa1, 0x78, 0x0f, 0x7e, 0x0b, - 0x2a, 0xaf, 0x69, 0xfb, 0x88, 0x38, 0x9e, 0x8d, 0x39, 0xa9, 0x2e, 0x88, 0x9a, 0x3e, 0x9d, 0x21, - 0xf1, 0x7b, 0x29, 0x5a, 0xe8, 0xf4, 0x2d, 0x19, 0x7a, 0x25, 0xb3, 0x81, 0xb2, 0x67, 0x34, 0xfe, - 0x50, 0xc0, 0xd2, 0x90, 0xfa, 0xe0, 0x0b, 0x50, 0xc0, 0x06, 0xb7, 0xce, 0xa2, 0x62, 0x44, 0x85, - 0x7f, 0x34, 0xfd, 0xfc, 0xf4, 0xe5, 0x21, 0x72, 0x42, 0xa2, 0x0b, 0x93, 0x54, 0xbc, 0xcf, 0x04, - 0x09, 0x92, 0x64, 0xd0, 0x06, 0xab, 0x36, 0x66, 0x3c, 0xae, 0xe8, 0x91, 0xe5, 0x10, 0x91, 0x8b, - 0x4a, 0xf3, 0xc1, 0xcd, 0x44, 0x1b, 0x21, 0xf4, 0xb7, 0xc3, 0x7e, 0x7d, 0x75, 0x7f, 0x84, 0x07, - 0x8d, 0x31, 0x37, 0x7e, 0xcc, 0x81, 0xfc, 0xdd, 0x34, 0x94, 0xa3, 0xa1, 0x86, 0xd2, 0x9c, 0xad, - 0x58, 0x53, 0x9b, 0xc9, 0xf1, 0x48, 0x33, 0xd9, 0x99, 0x91, 0xf7, 0xfa, 0x46, 0x72, 0x91, 0x07, - 0x8b, 0x7b, 0xb4, 0xbd, 0x4b, 0x5d, 0xd3, 0xe2, 0x16, 0x75, 0xe1, 0x0e, 0x98, 0xe7, 0x3d, 0x2f, - 0x7e, 0x7e, 0x9b, 0x71, 0x40, 0x47, 0x3d, 0x8f, 0x5c, 0xf5, 0xeb, 0xab, 0x59, 0xdf, 0xc8, 0x86, - 0x84, 0x37, 0xfc, 0x22, 0x09, 0x32, 0x27, 0x70, 0x9f, 0x0c, 0x1f, 0x77, 0xd5, 0xaf, 0x5f, 0x3b, - 0x3c, 0xd4, 0x84, 0x73, 0x38, 0x3c, 0xd8, 0x01, 0x4b, 0x51, 0x41, 0x0f, 0x7d, 0xda, 0x1e, 0xe8, - 0x24, 0x3f, 0xb3, 0x4e, 0xd6, 0x65, 0x28, 0x4b, 0xfb, 0x59, 0x22, 0x34, 0xcc, 0x0b, 0xcf, 0x00, - 0x8c, 0x0c, 0x47, 0x3e, 0x76, 0xd9, 0xe0, 0x72, 0xb7, 0x53, 0xe5, 0x86, 0x3c, 0x0d, 0xee, 0x8f, - 0xb1, 0xa1, 0x09, 0x27, 0xc0, 0xf7, 0x41, 0xc1, 0x27, 0x98, 0x51, 0x57, 0x3c, 0xf1, 0x72, 0x5a, - 0x27, 0x24, 0xac, 0x48, 0xee, 0xc2, 0xfb, 0xa0, 0xe8, 0x10, 0xc6, 0x70, 0x87, 0x54, 0x0b, 0xc2, - 0x71, 0x45, 0x3a, 0x16, 0x0f, 0x06, 0x66, 0x14, 0xef, 0x37, 0x7e, 0x55, 0x40, 0xf1, 0x6e, 0xe6, - 0x42, 0x6b, 0x78, 0x2e, 0xa8, 0xb3, 0x29, 0x73, 0xca, 0x4c, 0xf8, 0x39, 0x2f, 0xc2, 0x17, 0xf3, - 0x60, 0x1b, 0x54, 0x3c, 0xec, 0x63, 0xdb, 0x26, 0xb6, 0xc5, 0x1c, 0x71, 0x83, 0x05, 0x7d, 0x25, - 0xea, 0x62, 0x87, 0xa9, 0x19, 0x65, 0x7d, 0x22, 0x88, 0x41, 0x1d, 0xcf, 0x26, 0x51, 0x8a, 0x07, - 0x72, 0x94, 0x90, 0xdd, 0xd4, 0x8c, 0xb2, 0x3e, 0xf0, 0x39, 0x58, 0x1f, 0x74, 0xa6, 0xd1, 0x29, - 0x92, 0x17, 0x53, 0xe4, 0x9d, 0xb0, 0x5f, 0x5f, 0x7f, 0x36, 0xc9, 0x01, 0x4d, 0xc6, 0xc1, 0x6f, - 0x40, 0x89, 0x11, 0x9b, 0x18, 0x9c, 0xfa, 0x52, 0x42, 0x1f, 0xde, 0x30, 0xeb, 0xb8, 0x4d, 0xec, - 0x96, 0x84, 0xea, 0x8b, 0x62, 0xee, 0xc9, 0x15, 0x4a, 0x28, 0xe1, 0x53, 0xb0, 0xec, 0x60, 0x37, - 0xc0, 0x89, 0xa7, 0xd0, 0x4e, 0x49, 0x87, 0x61, 0xbf, 0xbe, 0x7c, 0x30, 0xb4, 0x83, 0x46, 0x3c, - 0xe1, 0xd7, 0xa0, 0xc4, 0xe3, 0xa1, 0x52, 0x10, 0xa1, 0xbd, 0xa1, 0xa9, 0x1f, 0x52, 0x73, 0x68, - 0x8e, 0x24, 0x7a, 0x48, 0x86, 0x48, 0x42, 0xd8, 0xf8, 0x25, 0x0f, 0xca, 0xe9, 0xf4, 0x38, 0x05, - 0xc0, 0x88, 0x9f, 0x35, 0x93, 0x13, 0xe4, 0xa3, 0xd9, 0x24, 0x92, 0xb4, 0x85, 0xb4, 0xf3, 0x26, - 0x26, 0x86, 0x32, 0xf4, 0xf0, 0x25, 0x28, 0x8b, 0x79, 0x2e, 0x9e, 0x6d, 0x6e, 0xe6, 0x67, 0xbb, - 0x14, 0xf6, 0xeb, 0xe5, 0x56, 0x4c, 0x80, 0x52, 0x2e, 0x78, 0x02, 0x96, 0x53, 0xad, 0xdc, 0xb2, - 0x05, 0x89, 0xc2, 0xec, 0x0e, 0xb1, 0xa0, 0x11, 0xd6, 0xa8, 0x11, 0xc8, 0x59, 0x3b, 0x2f, 0x24, - 0x3b, 0x6d, 0x78, 0x6a, 0xa0, 0xcc, 0x02, 0xc3, 0x20, 0xc4, 0x24, 0xa6, 0xa8, 0xfb, 0x82, 0xbe, - 0x26, 0x5d, 0xcb, 0xad, 0x78, 0x03, 0xa5, 0x3e, 0x11, 0xf1, 0x09, 0xb6, 0x6c, 0x62, 0x8a, 0x7a, - 0x67, 0x88, 0x3f, 0x13, 0x56, 0x24, 0x77, 0x1b, 0x7f, 0x29, 0x20, 0xfb, 0x6f, 0x70, 0x07, 0xf3, - 0xb2, 0x9b, 0xd1, 0x62, 0xee, 0x3f, 0xff, 0xe0, 0x5c, 0x27, 0xcc, 0xdf, 0x15, 0xb0, 0x32, 0xe2, - 0xff, 0x7f, 0xfd, 0x1f, 0xd0, 0x1f, 0x9c, 0x5f, 0xd6, 0xe6, 0x2e, 0x2e, 0x6b, 0x73, 0x7f, 0x5e, - 0xd6, 0xe6, 0xbe, 0x0b, 0x6b, 0xca, 0x79, 0x58, 0x53, 0x2e, 0xc2, 0x9a, 0xf2, 0x77, 0x58, 0x53, - 0x7e, 0xf8, 0xa7, 0x36, 0xf7, 0x55, 0x29, 0xe6, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x0c, - 0xf3, 0xb4, 0x1c, 0x0f, 0x00, 0x00, + // 1148 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0xcb, 0x6e, 0x23, 0x45, + 0x17, 0x4e, 0xdb, 0x89, 0x2f, 0xe5, 0x5c, 0xeb, 0xff, 0xa3, 0x31, 0x41, 0xb2, 0x23, 0x4b, 0xa0, + 0xcc, 0x68, 0xa6, 0x9b, 0x78, 0xa2, 0x61, 0x98, 0x05, 0xd2, 0x74, 0x10, 0x12, 0x51, 0xa2, 0x89, + 0xca, 0x19, 0x06, 0x41, 0x90, 0xa6, 0xdc, 0x5d, 0xb1, 0x7b, 0xd2, 0x37, 0xba, 0xaa, 0x23, 0x79, + 0xc7, 0x9a, 0x15, 0x7b, 0x1e, 0x80, 0x57, 0x40, 0x88, 0x25, 0x8b, 0xb0, 0xcb, 0x82, 0x05, 0x6c, + 0x2c, 0xd2, 0xbc, 0x45, 0x56, 0xa8, 0xca, 0xd5, 0x17, 0xdf, 0x32, 0x71, 0x90, 0x22, 0xb1, 0xeb, + 0x3a, 0x75, 0xbe, 0xaf, 0x4e, 0x9d, 0xf3, 0xd5, 0x39, 0x0d, 0x3e, 0x3a, 0x7d, 0x4a, 0x55, 0xcb, + 0xd3, 0x4e, 0xc3, 0x36, 0x09, 0x5c, 0xc2, 0x08, 0xd5, 0xfc, 0xd3, 0x8e, 0x86, 0x7d, 0x8b, 0x6a, + 0x6d, 0xcc, 0x8c, 0xae, 0x76, 0xd6, 0xc4, 0xb6, 0xdf, 0xc5, 0xdb, 0x5a, 0x87, 0xb8, 0x24, 0xc0, + 0x8c, 0x98, 0xaa, 0x1f, 0x78, 0xcc, 0x83, 0xf7, 0x07, 0x50, 0x35, 0x85, 0xaa, 0xfe, 0x69, 0x47, + 0xe5, 0x50, 0x55, 0x40, 0xd5, 0x18, 0xba, 0xf1, 0xa8, 0x63, 0xb1, 0x6e, 0xd8, 0x56, 0x0d, 0xcf, + 0xd1, 0x3a, 0x5e, 0xc7, 0xd3, 0x04, 0x43, 0x3b, 0x3c, 0x11, 0x2b, 0xb1, 0x10, 0x5f, 0x03, 0xe6, + 0x8d, 0x1d, 0x19, 0x14, 0xf6, 0x2d, 0x07, 0x1b, 0x5d, 0xcb, 0x25, 0x41, 0x2f, 0x0d, 0xcb, 0x21, + 0x0c, 0x6b, 0x67, 0x63, 0xf1, 0x6c, 0x68, 0xd3, 0x50, 0x41, 0xe8, 0x32, 0xcb, 0x21, 0x63, 0x80, + 0x27, 0x6f, 0x03, 0x50, 0xa3, 0x4b, 0x1c, 0x3c, 0x86, 0x7b, 0x3c, 0x0d, 0x17, 0x32, 0xcb, 0xd6, + 0x2c, 0x97, 0x51, 0x16, 0x8c, 0x81, 0x1e, 0x4e, 0x4d, 0xf4, 0x84, 0xbb, 0x34, 0x7e, 0xcc, 0x81, + 0xe2, 0x6e, 0xe0, 0xb9, 0x7b, 0x5e, 0x1b, 0xbe, 0x06, 0x25, 0x7e, 0x65, 0x13, 0x33, 0x5c, 0x55, + 0x36, 0x95, 0xad, 0x4a, 0xf3, 0x03, 0x55, 0xa6, 0x3e, 0x1b, 0x41, 0x9a, 0x7c, 0xee, 0xad, 0x9e, + 0x6d, 0xab, 0x2f, 0xda, 0x6f, 0x88, 0xc1, 0x0e, 0x08, 0xc3, 0x3a, 0x3c, 0xef, 0xd7, 0xe7, 0xa2, + 0x7e, 0x1d, 0xa4, 0x36, 0x94, 0xb0, 0xc2, 0x2f, 0xc0, 0x3c, 0xf5, 0x89, 0x51, 0xcd, 0x09, 0xf6, + 0x27, 0xea, 0x8d, 0x0b, 0xab, 0xca, 0x18, 0x5b, 0x3e, 0x31, 0xf4, 0x45, 0x79, 0xc6, 0x3c, 0x5f, + 0x21, 0xc1, 0x08, 0x5f, 0x83, 0x02, 0x65, 0x98, 0x85, 0xb4, 0x9a, 0x17, 0xdc, 0x4f, 0x6f, 0xc1, + 0x2d, 0xf0, 0xfa, 0xb2, 0x64, 0x2f, 0x0c, 0xd6, 0x48, 0xf2, 0x36, 0x7e, 0x55, 0x40, 0x45, 0x7a, + 0xee, 0x5b, 0x94, 0xc1, 0xe3, 0xb1, 0x6c, 0xa9, 0x37, 0xcb, 0x16, 0x47, 0x8b, 0x5c, 0xad, 0xca, + 0x93, 0x4a, 0xb1, 0x25, 0x93, 0xa9, 0x57, 0x60, 0xc1, 0x62, 0xc4, 0xa1, 0xd5, 0xdc, 0x66, 0x7e, + 0xab, 0xd2, 0x6c, 0xce, 0x7e, 0x1d, 0x7d, 0x49, 0xd2, 0x2f, 0x7c, 0xc6, 0x89, 0xd0, 0x80, 0xaf, + 0xf1, 0x5d, 0x3e, 0xb9, 0x06, 0x4f, 0x1f, 0x7c, 0x08, 0x4a, 0x5c, 0x7d, 0x66, 0x68, 0x13, 0x71, + 0x8d, 0x72, 0x1a, 0x56, 0x4b, 0xda, 0x51, 0xe2, 0x01, 0x5f, 0x82, 0x7b, 0x94, 0xe1, 0x80, 0x59, + 0x6e, 0xe7, 0x13, 0x82, 0x4d, 0xdb, 0x72, 0x49, 0x8b, 0x18, 0x9e, 0x6b, 0x52, 0x51, 0xd3, 0xbc, + 0xfe, 0x6e, 0xd4, 0xaf, 0xdf, 0x6b, 0x4d, 0x76, 0x41, 0xd3, 0xb0, 0xf0, 0x18, 0xac, 0x19, 0x9e, + 0x6b, 0x84, 0x41, 0x40, 0x5c, 0xa3, 0x77, 0xe8, 0xd9, 0x96, 0xd1, 0x13, 0x85, 0x2c, 0xeb, 0xaa, + 0x8c, 0x66, 0x6d, 0x77, 0xd4, 0xe1, 0x6a, 0x92, 0x11, 0x8d, 0x13, 0xc1, 0xf7, 0x40, 0x91, 0x86, + 0xd4, 0x27, 0xae, 0x59, 0x9d, 0xdf, 0x54, 0xb6, 0x4a, 0x7a, 0x25, 0xea, 0xd7, 0x8b, 0xad, 0x81, + 0x09, 0xc5, 0x7b, 0xf0, 0x1b, 0x50, 0x79, 0xe3, 0xb5, 0x8f, 0x88, 0xe3, 0xdb, 0x98, 0x91, 0xea, + 0x82, 0xa8, 0xe9, 0xb3, 0x19, 0x12, 0xbf, 0x97, 0xa2, 0x85, 0x4e, 0xff, 0x27, 0x43, 0xaf, 0x64, + 0x36, 0x50, 0xf6, 0x8c, 0xc6, 0xef, 0x0a, 0x58, 0x1a, 0x52, 0x1f, 0x7c, 0x09, 0x0a, 0xd8, 0x60, + 0xd6, 0x19, 0x2f, 0x06, 0x2f, 0xfc, 0xa3, 0xe9, 0xe7, 0xa7, 0x2f, 0x0f, 0x91, 0x13, 0xc2, 0x2f, + 0x4c, 0x52, 0xf1, 0x3e, 0x17, 0x24, 0x48, 0x92, 0x41, 0x1b, 0xac, 0xda, 0x98, 0xb2, 0xb8, 0xa2, + 0x47, 0x96, 0x43, 0x44, 0x2e, 0x2a, 0xcd, 0x07, 0x37, 0x13, 0x2d, 0x47, 0xe8, 0xff, 0x8f, 0xfa, + 0xf5, 0xd5, 0xfd, 0x11, 0x1e, 0x34, 0xc6, 0xdc, 0xf8, 0x21, 0x07, 0xf2, 0x77, 0xd3, 0x50, 0x8e, + 0x86, 0x1a, 0x4a, 0x73, 0xb6, 0x62, 0x4d, 0x6d, 0x26, 0xc7, 0x23, 0xcd, 0x64, 0x67, 0x46, 0xde, + 0xeb, 0x1b, 0xc9, 0x45, 0x1e, 0x2c, 0xee, 0x79, 0xed, 0x5d, 0xcf, 0x35, 0x2d, 0x66, 0x79, 0x2e, + 0xdc, 0x01, 0xf3, 0xac, 0xe7, 0xc7, 0xcf, 0x6f, 0x33, 0x0e, 0xe8, 0xa8, 0xe7, 0x93, 0xab, 0x7e, + 0x7d, 0x35, 0xeb, 0xcb, 0x6d, 0x48, 0x78, 0xc3, 0xcf, 0x93, 0x20, 0x73, 0x02, 0xf7, 0xf1, 0xf0, + 0x71, 0x57, 0xfd, 0xfa, 0xb5, 0x93, 0x40, 0x4d, 0x38, 0x87, 0xc3, 0x83, 0x1d, 0xb0, 0xc4, 0x0b, + 0x7a, 0x18, 0x78, 0xed, 0x81, 0x4e, 0xf2, 0x33, 0xeb, 0x64, 0x5d, 0x86, 0xb2, 0xb4, 0x9f, 0x25, + 0x42, 0xc3, 0xbc, 0xf0, 0x0c, 0x40, 0x6e, 0x38, 0x0a, 0xb0, 0x4b, 0x07, 0x97, 0xbb, 0x9d, 0x2a, + 0x37, 0xe4, 0x69, 0x70, 0x7f, 0x8c, 0x0d, 0x4d, 0x38, 0x01, 0xbe, 0x0f, 0x0a, 0x01, 0xc1, 0xd4, + 0x73, 0xc5, 0x13, 0x2f, 0xa7, 0x75, 0x42, 0xc2, 0x8a, 0xe4, 0x2e, 0xbc, 0x0f, 0x8a, 0x0e, 0xa1, + 0x14, 0x77, 0x48, 0xb5, 0x20, 0x1c, 0x57, 0xa4, 0x63, 0xf1, 0x60, 0x60, 0x46, 0xf1, 0x7e, 0xe3, + 0x17, 0x05, 0x14, 0xef, 0x66, 0x2e, 0xb4, 0x86, 0xe7, 0x82, 0x3a, 0x9b, 0x32, 0xa7, 0xcc, 0x84, + 0x9f, 0xf2, 0x22, 0x7c, 0x31, 0x0f, 0xb6, 0x41, 0xc5, 0xc7, 0x01, 0xb6, 0x6d, 0x62, 0x5b, 0xd4, + 0x11, 0x37, 0x58, 0xd0, 0x57, 0x78, 0x17, 0x3b, 0x4c, 0xcd, 0x28, 0xeb, 0xc3, 0x21, 0x86, 0xe7, + 0xf8, 0x36, 0xe1, 0x29, 0x1e, 0xc8, 0x51, 0x42, 0x76, 0x53, 0x33, 0xca, 0xfa, 0xc0, 0x17, 0x60, + 0x7d, 0xd0, 0x99, 0x46, 0xa7, 0x48, 0x5e, 0x4c, 0x91, 0x77, 0xa2, 0x7e, 0x7d, 0xfd, 0xf9, 0x24, + 0x07, 0x34, 0x19, 0x07, 0xbf, 0x06, 0x25, 0x4a, 0x6c, 0x62, 0x30, 0x2f, 0x90, 0x12, 0x7a, 0x7c, + 0xc3, 0xac, 0xe3, 0x36, 0xb1, 0x5b, 0x12, 0xaa, 0x2f, 0x8a, 0xb9, 0x27, 0x57, 0x28, 0xa1, 0x84, + 0xcf, 0xc0, 0xb2, 0x83, 0xdd, 0x10, 0x27, 0x9e, 0x42, 0x3b, 0x25, 0x1d, 0x46, 0xfd, 0xfa, 0xf2, + 0xc1, 0xd0, 0x0e, 0x1a, 0xf1, 0x84, 0x5f, 0x81, 0x12, 0x8b, 0x87, 0x4a, 0x41, 0x84, 0xf6, 0x96, + 0xa6, 0x7e, 0xe8, 0x99, 0x43, 0x73, 0x24, 0xd1, 0x43, 0x32, 0x44, 0x12, 0xc2, 0xc6, 0xcf, 0x79, + 0x50, 0x4e, 0xa7, 0xc7, 0x29, 0x00, 0x46, 0xfc, 0xac, 0xa9, 0x9c, 0x20, 0x1f, 0xce, 0x26, 0x91, + 0xa4, 0x2d, 0xa4, 0x9d, 0x37, 0x31, 0x51, 0x94, 0xa1, 0x87, 0xaf, 0x40, 0x59, 0xcc, 0x73, 0xf1, + 0x6c, 0x73, 0x33, 0x3f, 0xdb, 0xa5, 0xa8, 0x5f, 0x2f, 0xb7, 0x62, 0x02, 0x94, 0x72, 0xc1, 0x13, + 0xb0, 0x9c, 0x6a, 0xe5, 0x96, 0x2d, 0x48, 0x14, 0x66, 0x77, 0x88, 0x05, 0x8d, 0xb0, 0xf2, 0x46, + 0x20, 0x67, 0xed, 0xbc, 0x90, 0xec, 0xb4, 0xe1, 0xa9, 0x81, 0x32, 0x0d, 0x0d, 0x83, 0x10, 0x93, + 0x98, 0xa2, 0xee, 0x0b, 0xfa, 0x9a, 0x74, 0x2d, 0xb7, 0xe2, 0x0d, 0x94, 0xfa, 0x70, 0xe2, 0x13, + 0x6c, 0xd9, 0xc4, 0x14, 0xf5, 0xce, 0x10, 0x7f, 0x2a, 0xac, 0x48, 0xee, 0x36, 0xfe, 0x54, 0x40, + 0xf6, 0xdf, 0xe0, 0x0e, 0xe6, 0x65, 0x37, 0xa3, 0xc5, 0xdc, 0xbf, 0xfe, 0xc1, 0xb9, 0x4e, 0x98, + 0xbf, 0x29, 0x60, 0x65, 0xc4, 0xff, 0xbf, 0xfa, 0x3f, 0xa0, 0x3f, 0x38, 0xbf, 0xac, 0xcd, 0x5d, + 0x5c, 0xd6, 0xe6, 0xfe, 0xb8, 0xac, 0xcd, 0x7d, 0x1b, 0xd5, 0x94, 0xf3, 0xa8, 0xa6, 0x5c, 0x44, + 0x35, 0xe5, 0xaf, 0xa8, 0xa6, 0x7c, 0xff, 0x77, 0x6d, 0xee, 0xcb, 0x52, 0xcc, 0xf3, 0x4f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x92, 0x82, 0xe8, 0xe4, 0xe8, 0x0e, 0x00, 0x00, } diff --git a/pkg/apis/batch/v2alpha1/generated.proto b/pkg/apis/batch/v2alpha1/generated.proto index 654639685d562..b657608094c10 100644 --- a/pkg/apis/batch/v2alpha1/generated.proto +++ b/pkg/apis/batch/v2alpha1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v2alpha1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v2alpha1"; diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 1b504cc636f42..d0424f4e38841 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -28,8 +28,8 @@ import ( pkg4_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" + pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" - pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -68,8 +68,8 @@ func init() { var v0 pkg4_resource.Quantity var v1 pkg1_v1.TypeMeta var v2 pkg2_types.UID - var v3 pkg3_v1.PodTemplateSpec - var v4 pkg5_intstr.IntOrString + var v3 pkg5_intstr.IntOrString + var v4 pkg3_v1.PodTemplateSpec var v5 time.Time _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } diff --git a/pkg/apis/certificates/v1beta1/generated.pb.go b/pkg/apis/certificates/v1beta1/generated.pb.go index d6bf8bfc36751..ff077913b7bcb 100644 --- a/pkg/apis/certificates/v1beta1/generated.pb.go +++ b/pkg/apis/certificates/v1beta1/generated.pb.go @@ -1328,51 +1328,50 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 728 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x4f, 0x13, 0x41, - 0x18, 0xee, 0xb6, 0xa5, 0x1f, 0x53, 0x04, 0x33, 0x31, 0xa4, 0x92, 0xb0, 0x25, 0x8d, 0x1a, 0x30, - 0xb8, 0x6b, 0x89, 0x31, 0xdc, 0x4c, 0x16, 0x13, 0x83, 0x82, 0x9a, 0x81, 0x5e, 0x8c, 0x07, 0xa7, - 0xdb, 0x97, 0x65, 0x28, 0xfb, 0xe1, 0xce, 0x2c, 0xb1, 0x37, 0x6f, 0x5e, 0xfd, 0x03, 0xfe, 0x1f, - 0x8e, 0x1c, 0x3d, 0x35, 0x52, 0x4f, 0xc6, 0xc4, 0x1f, 0xc0, 0xc9, 0xcc, 0x74, 0xfa, 0x61, 0x4b, - 0x01, 0x13, 0x6e, 0x9d, 0xe7, 0x7d, 0xde, 0xe7, 0x79, 0xbf, 0xb6, 0xe8, 0x59, 0x6b, 0x83, 0x5b, - 0x2c, 0xb4, 0x5b, 0x49, 0x03, 0xe2, 0x00, 0x04, 0x70, 0x3b, 0x6a, 0x79, 0x36, 0x8d, 0x18, 0xb7, - 0x5d, 0x88, 0x05, 0xdb, 0x67, 0x2e, 0x95, 0xe8, 0x71, 0xad, 0x01, 0x82, 0xd6, 0x6c, 0x0f, 0x02, - 0x88, 0xa9, 0x80, 0xa6, 0x15, 0xc5, 0xa1, 0x08, 0xb1, 0xdd, 0x13, 0xb0, 0x86, 0x02, 0x56, 0xd4, - 0xf2, 0x2c, 0x29, 0x60, 0x8d, 0x0a, 0x58, 0x5a, 0x60, 0xf1, 0x91, 0xc7, 0xc4, 0x41, 0xd2, 0xb0, - 0xdc, 0xd0, 0xb7, 0xbd, 0xd0, 0x0b, 0x6d, 0xa5, 0xd3, 0x48, 0xf6, 0xd5, 0x4b, 0x3d, 0xd4, 0xaf, - 0x9e, 0xfe, 0xe2, 0x13, 0x5d, 0x20, 0x8d, 0x98, 0x4f, 0xdd, 0x03, 0x16, 0x40, 0xdc, 0xee, 0x97, - 0x68, 0xc7, 0xc0, 0xc3, 0x24, 0x76, 0x61, 0xbc, 0xaa, 0x4b, 0xb3, 0xb8, 0xed, 0x83, 0xa0, 0xf6, - 0xf1, 0x44, 0x2f, 0x8b, 0xf6, 0xb4, 0xac, 0x38, 0x09, 0x04, 0xf3, 0x27, 0x6d, 0x9e, 0x5e, 0x95, - 0xc0, 0xdd, 0x03, 0xf0, 0xe9, 0x44, 0xde, 0xda, 0xd4, 0xa9, 0x5f, 0x54, 0x56, 0xed, 0x62, 0x76, - 0x22, 0xd8, 0x91, 0xcd, 0x02, 0xc1, 0x45, 0x3c, 0x9e, 0x52, 0xfd, 0x95, 0x46, 0x77, 0x37, 0x87, - 0xd3, 0xdf, 0x65, 0x5e, 0xc0, 0x02, 0x8f, 0xc0, 0xc7, 0x04, 0xb8, 0xc0, 0x1f, 0x50, 0x41, 0x8e, - 0xa0, 0x49, 0x05, 0x2d, 0x1b, 0xcb, 0xc6, 0x4a, 0x69, 0xfd, 0xb1, 0xa5, 0xd7, 0x38, 0xda, 0xc9, - 0x70, 0x91, 0x92, 0x6d, 0x1d, 0xd7, 0xac, 0x37, 0x8d, 0x43, 0x70, 0xc5, 0x0e, 0x08, 0xea, 0xe0, - 0x93, 0x4e, 0x25, 0xd5, 0xed, 0x54, 0xd0, 0x10, 0x23, 0x03, 0x55, 0x1c, 0xa1, 0x2c, 0x8f, 0xc0, - 0x2d, 0xa7, 0x95, 0xfa, 0x6b, 0xeb, 0x3f, 0x8f, 0xc4, 0x9a, 0x5a, 0xfb, 0x6e, 0x04, 0xae, 0x33, - 0xab, 0xbd, 0xb3, 0xf2, 0x45, 0x94, 0x13, 0xfe, 0x84, 0x72, 0x5c, 0x50, 0x91, 0xf0, 0x72, 0x46, - 0x79, 0xbe, 0xbd, 0x41, 0x4f, 0xa5, 0xeb, 0xcc, 0x69, 0xd7, 0x5c, 0xef, 0x4d, 0xb4, 0x5f, 0xf5, - 0x5b, 0x1a, 0x55, 0xa7, 0xe6, 0x6e, 0x86, 0x41, 0x93, 0x09, 0x16, 0x06, 0x78, 0x03, 0x65, 0x45, - 0x3b, 0x02, 0x35, 0xf0, 0xa2, 0x73, 0xaf, 0xdf, 0xc2, 0x5e, 0x3b, 0x82, 0xf3, 0x4e, 0xe5, 0xce, - 0x38, 0x5f, 0xe2, 0x44, 0x65, 0xe0, 0x07, 0x28, 0x17, 0x03, 0xe5, 0x61, 0xa0, 0xc6, 0x59, 0x1c, - 0x16, 0x42, 0x14, 0x4a, 0x74, 0x14, 0xaf, 0xa2, 0xbc, 0x0f, 0x9c, 0x53, 0x0f, 0xd4, 0x0c, 0x8a, - 0xce, 0xbc, 0x26, 0xe6, 0x77, 0x7a, 0x30, 0xe9, 0xc7, 0xf1, 0x21, 0x9a, 0x3b, 0xa2, 0x5c, 0xd4, - 0xa3, 0x26, 0x15, 0xb0, 0xc7, 0x7c, 0x28, 0x67, 0xd5, 0xd4, 0x1e, 0x5e, 0xef, 0x0e, 0x64, 0x86, - 0xb3, 0xa0, 0xd5, 0xe7, 0xb6, 0xff, 0x51, 0x22, 0x63, 0xca, 0xd5, 0x3f, 0x06, 0x5a, 0x9a, 0x3a, - 0x9f, 0x6d, 0xc6, 0x05, 0x7e, 0x3f, 0x71, 0x8f, 0xd6, 0xf5, 0xea, 0x90, 0xd9, 0xea, 0x1a, 0x6f, - 0xeb, 0x5a, 0x0a, 0x7d, 0x64, 0xe4, 0x16, 0x43, 0x34, 0xc3, 0x04, 0xf8, 0xbc, 0x9c, 0x5e, 0xce, - 0xac, 0x94, 0xd6, 0x5f, 0xde, 0xdc, 0x61, 0x38, 0xb7, 0xb4, 0xed, 0xcc, 0x96, 0x34, 0x20, 0x3d, - 0x9f, 0xea, 0xef, 0xcb, 0x1a, 0x96, 0x27, 0x8b, 0xef, 0xa3, 0x7c, 0xdc, 0x7b, 0xaa, 0x7e, 0x67, - 0x9d, 0x92, 0xdc, 0x92, 0x66, 0x90, 0x7e, 0x0c, 0xaf, 0xa1, 0x42, 0xc2, 0x21, 0x0e, 0xa8, 0x0f, - 0x7a, 0xf5, 0x83, 0x3e, 0xeb, 0x1a, 0x27, 0x03, 0x06, 0x5e, 0x42, 0x99, 0x84, 0x35, 0xf5, 0xea, - 0x4b, 0x9a, 0x98, 0xa9, 0x6f, 0x3d, 0x27, 0x12, 0xc7, 0x55, 0x94, 0xf3, 0xe2, 0x30, 0x89, 0x78, - 0x39, 0xbb, 0x9c, 0x59, 0x29, 0x3a, 0x48, 0x5e, 0xd0, 0x0b, 0x85, 0x10, 0x1d, 0xc1, 0xeb, 0xa8, - 0xd0, 0x82, 0x76, 0x5d, 0x9d, 0xd0, 0x8c, 0x62, 0x2d, 0x48, 0x96, 0x02, 0xf8, 0x79, 0xa7, 0x52, - 0x78, 0xa5, 0xa3, 0x64, 0xc0, 0xab, 0x76, 0x0c, 0x54, 0xb9, 0xe2, 0xd3, 0xc1, 0x5f, 0x0c, 0x84, - 0xdc, 0xfe, 0x65, 0xf3, 0xb2, 0xa1, 0x16, 0xb1, 0x7b, 0x73, 0x8b, 0x18, 0x7c, 0x35, 0xc3, 0xbf, - 0xa5, 0x01, 0xc4, 0xc9, 0x88, 0x35, 0xae, 0xa1, 0xd2, 0x88, 0xb4, 0x9a, 0xea, 0xac, 0x33, 0xdf, - 0xed, 0x54, 0x4a, 0x23, 0xe2, 0x64, 0x94, 0xe3, 0xac, 0x9e, 0x9c, 0x99, 0xa9, 0xd3, 0x33, 0x33, - 0xf5, 0xfd, 0xcc, 0x4c, 0x7d, 0xee, 0x9a, 0xc6, 0x49, 0xd7, 0x34, 0x4e, 0xbb, 0xa6, 0xf1, 0xa3, - 0x6b, 0x1a, 0x5f, 0x7f, 0x9a, 0xa9, 0x77, 0x79, 0x5d, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x09, 0x98, 0xa9, 0xa0, 0x4e, 0x07, 0x00, 0x00, + // 718 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x4f, 0x13, 0x4f, + 0x18, 0xef, 0xb6, 0xa5, 0x2f, 0x53, 0xfe, 0xf0, 0xcf, 0xc4, 0x90, 0x4a, 0xc2, 0x96, 0x34, 0x6a, + 0xc0, 0xe0, 0xae, 0x45, 0x63, 0xb8, 0x99, 0x2c, 0x26, 0x06, 0x05, 0x35, 0x03, 0xbd, 0x18, 0x0f, + 0x4e, 0xb7, 0x0f, 0xcb, 0x50, 0xf6, 0xc5, 0x9d, 0x59, 0x62, 0x6f, 0xde, 0xbc, 0xfa, 0x05, 0xfc, + 0x3e, 0x1c, 0x39, 0x7a, 0x6a, 0xa4, 0x9e, 0x8c, 0x89, 0x1f, 0x80, 0x93, 0x99, 0xe9, 0xb4, 0x5d, + 0xa9, 0x15, 0x4c, 0xb8, 0x75, 0x7e, 0xf3, 0x7b, 0x79, 0xe6, 0x79, 0x9e, 0x2d, 0x7a, 0xdc, 0xd9, + 0xe0, 0x16, 0x0b, 0xed, 0x4e, 0xd2, 0x82, 0x38, 0x00, 0x01, 0xdc, 0x8e, 0x3a, 0x9e, 0x4d, 0x23, + 0xc6, 0x6d, 0x17, 0x62, 0xc1, 0xf6, 0x99, 0x4b, 0x25, 0x7a, 0xdc, 0x68, 0x81, 0xa0, 0x0d, 0xdb, + 0x83, 0x00, 0x62, 0x2a, 0xa0, 0x6d, 0x45, 0x71, 0x28, 0x42, 0x6c, 0x0f, 0x0c, 0xac, 0xb1, 0x81, + 0x15, 0x75, 0x3c, 0x4b, 0x1a, 0x58, 0x69, 0x03, 0x4b, 0x1b, 0x2c, 0xde, 0xf3, 0x98, 0x38, 0x48, + 0x5a, 0x96, 0x1b, 0xfa, 0xb6, 0x17, 0x7a, 0xa1, 0xad, 0x7c, 0x5a, 0xc9, 0xbe, 0x3a, 0xa9, 0x83, + 0xfa, 0x35, 0xf0, 0x5f, 0x7c, 0xa8, 0x0b, 0xa4, 0x11, 0xf3, 0xa9, 0x7b, 0xc0, 0x02, 0x88, 0xbb, + 0xe3, 0x12, 0x7d, 0x10, 0xd4, 0x3e, 0x9e, 0xa8, 0x6a, 0xd1, 0x9e, 0xa6, 0x8a, 0x93, 0x40, 0x30, + 0x1f, 0x26, 0x04, 0x8f, 0x2e, 0x13, 0x70, 0xf7, 0x00, 0x7c, 0x3a, 0xa1, 0x7b, 0x30, 0x4d, 0x97, + 0x08, 0x76, 0x64, 0xb3, 0x40, 0x70, 0x11, 0x4f, 0x88, 0xd6, 0xa6, 0x36, 0xfd, 0x0f, 0x6f, 0xa9, + 0x7f, 0xcf, 0xa2, 0x9b, 0x9b, 0xe3, 0x4e, 0xee, 0x32, 0x2f, 0x60, 0x81, 0x47, 0xe0, 0x5d, 0x02, + 0x5c, 0xe0, 0xb7, 0xa8, 0x24, 0x9b, 0xd0, 0xa6, 0x82, 0x56, 0x8d, 0x65, 0x63, 0xa5, 0xb2, 0x7e, + 0xdf, 0xd2, 0x23, 0x49, 0xd7, 0x34, 0x1e, 0x8a, 0x64, 0x5b, 0xc7, 0x0d, 0xeb, 0x65, 0xeb, 0x10, + 0x5c, 0xb1, 0x03, 0x82, 0x3a, 0xf8, 0xa4, 0x57, 0xcb, 0xf4, 0x7b, 0x35, 0x34, 0xc6, 0xc8, 0xc8, + 0x15, 0x47, 0x28, 0xcf, 0x23, 0x70, 0xab, 0x59, 0xe5, 0xfe, 0xc2, 0xfa, 0xc7, 0x81, 0x5b, 0x53, + 0x6b, 0xdf, 0x8d, 0xc0, 0x75, 0x66, 0x75, 0x76, 0x5e, 0x9e, 0x88, 0x4a, 0xc2, 0xef, 0x51, 0x81, + 0x0b, 0x2a, 0x12, 0x5e, 0xcd, 0xa9, 0xcc, 0x57, 0xd7, 0x98, 0xa9, 0x7c, 0x9d, 0x39, 0x9d, 0x5a, + 0x18, 0x9c, 0x89, 0xce, 0xab, 0x7f, 0xce, 0xa2, 0xfa, 0x54, 0xed, 0x66, 0x18, 0xb4, 0x99, 0x60, + 0x61, 0x80, 0x37, 0x50, 0x5e, 0x74, 0x23, 0x50, 0x0d, 0x2f, 0x3b, 0xb7, 0x86, 0x4f, 0xd8, 0xeb, + 0x46, 0x70, 0xde, 0xab, 0xdd, 0xb8, 0xc8, 0x97, 0x38, 0x51, 0x0a, 0x7c, 0x07, 0x15, 0x62, 0xa0, + 0x3c, 0x0c, 0x54, 0x3b, 0xcb, 0xe3, 0x42, 0x88, 0x42, 0x89, 0xbe, 0xc5, 0xab, 0xa8, 0xe8, 0x03, + 0xe7, 0xd4, 0x03, 0xd5, 0x83, 0xb2, 0x33, 0xaf, 0x89, 0xc5, 0x9d, 0x01, 0x4c, 0x86, 0xf7, 0xf8, + 0x10, 0xcd, 0x1d, 0x51, 0x2e, 0x9a, 0x51, 0x9b, 0x0a, 0xd8, 0x63, 0x3e, 0x54, 0xf3, 0xaa, 0x6b, + 0x77, 0xaf, 0xb6, 0x07, 0x52, 0xe1, 0x2c, 0x68, 0xf7, 0xb9, 0xed, 0xdf, 0x9c, 0xc8, 0x05, 0xe7, + 0xfa, 0x4f, 0x03, 0x2d, 0x4d, 0xed, 0xcf, 0x36, 0xe3, 0x02, 0xbf, 0x99, 0xd8, 0x47, 0xeb, 0x6a, + 0x75, 0x48, 0xb5, 0xda, 0xc6, 0xff, 0x75, 0x2d, 0xa5, 0x21, 0x92, 0xda, 0xc5, 0x10, 0xcd, 0x30, + 0x01, 0x3e, 0xaf, 0x66, 0x97, 0x73, 0x2b, 0x95, 0xf5, 0x67, 0xd7, 0xb7, 0x18, 0xce, 0x7f, 0x3a, + 0x76, 0x66, 0x4b, 0x06, 0x90, 0x41, 0x4e, 0xfd, 0xc7, 0xdf, 0x1e, 0x2c, 0x57, 0x16, 0xdf, 0x46, + 0xc5, 0x78, 0x70, 0x54, 0xef, 0x9d, 0x75, 0x2a, 0x72, 0x4a, 0x9a, 0x41, 0x86, 0x77, 0x78, 0x0d, + 0x95, 0x12, 0x0e, 0x71, 0x40, 0x7d, 0xd0, 0xa3, 0x1f, 0xbd, 0xb3, 0xa9, 0x71, 0x32, 0x62, 0xe0, + 0x25, 0x94, 0x4b, 0x58, 0x5b, 0x8f, 0xbe, 0xa2, 0x89, 0xb9, 0xe6, 0xd6, 0x13, 0x22, 0x71, 0x5c, + 0x47, 0x05, 0x2f, 0x0e, 0x93, 0x88, 0x57, 0xf3, 0xcb, 0xb9, 0x95, 0xb2, 0x83, 0xe4, 0x06, 0x3d, + 0x55, 0x08, 0xd1, 0x37, 0x78, 0x1d, 0x95, 0x3a, 0xd0, 0x6d, 0xaa, 0x15, 0x9a, 0x51, 0xac, 0x05, + 0xc9, 0x52, 0x00, 0x3f, 0xef, 0xd5, 0x4a, 0xcf, 0xf5, 0x2d, 0x19, 0xf1, 0xea, 0x3d, 0x03, 0xd5, + 0x2e, 0xf9, 0x74, 0xf0, 0x47, 0x03, 0x21, 0x77, 0xb8, 0xd9, 0xbc, 0x6a, 0xa8, 0x41, 0xec, 0x5e, + 0xdf, 0x20, 0x46, 0x5f, 0xcd, 0xf8, 0x6f, 0x69, 0x04, 0x71, 0x92, 0x8a, 0xc6, 0x0d, 0x54, 0x49, + 0x59, 0xab, 0xae, 0xce, 0x3a, 0xf3, 0xfd, 0x5e, 0xad, 0x92, 0x32, 0x27, 0x69, 0x8e, 0xb3, 0x7a, + 0x72, 0x66, 0x66, 0x4e, 0xcf, 0xcc, 0xcc, 0x97, 0x33, 0x33, 0xf3, 0xa1, 0x6f, 0x1a, 0x27, 0x7d, + 0xd3, 0x38, 0xed, 0x9b, 0xc6, 0xd7, 0xbe, 0x69, 0x7c, 0xfa, 0x66, 0x66, 0x5e, 0x17, 0x75, 0x81, + 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xfe, 0x90, 0x2c, 0x1a, 0x07, 0x00, 0x00, } diff --git a/pkg/apis/certificates/v1beta1/generated.proto b/pkg/apis/certificates/v1beta1/generated.proto index 7211cdaa42f78..e3a580cecdd93 100644 --- a/pkg/apis/certificates/v1beta1/generated.proto +++ b/pkg/apis/certificates/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.certificates.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/extensions/BUILD b/pkg/apis/extensions/BUILD index 691b3ca319235..0765b325ce41d 100644 --- a/pkg/apis/extensions/BUILD +++ b/pkg/apis/extensions/BUILD @@ -21,12 +21,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/extensions/types.go b/pkg/apis/extensions/types.go index dceb5e4031857..0c0a03d99a002 100644 --- a/pkg/apis/extensions/types.go +++ b/pkg/apis/extensions/types.go @@ -31,8 +31,8 @@ package extensions import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/intstr" ) const ( diff --git a/pkg/apis/extensions/v1beta1/BUILD b/pkg/apis/extensions/v1beta1/BUILD index af2d2b63c061d..c7ca8859b7ada 100644 --- a/pkg/apis/extensions/v1beta1/BUILD +++ b/pkg/apis/extensions/v1beta1/BUILD @@ -29,7 +29,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", @@ -39,6 +38,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) @@ -52,10 +52,10 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index 3db1027dc9bc1..81d44c3e36a1d 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/pkg/apis/extensions/v1beta1/conversion.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/util/intstr" ) func addConversionFuncs(scheme *runtime.Scheme) error { diff --git a/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index 7564dd6190b9a..e866177c1b694 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/pkg/apis/extensions/v1beta1/defaults.go @@ -19,8 +19,8 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/pkg/apis/extensions/v1beta1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go index a8409cfda5ceb..9b54d85694e11 100644 --- a/pkg/apis/extensions/v1beta1/defaults_test.go +++ b/pkg/apis/extensions/v1beta1/defaults_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" . "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestSetDefaultDaemonSet(t *testing.T) { diff --git a/pkg/apis/extensions/v1beta1/generated.pb.go b/pkg/apis/extensions/v1beta1/generated.pb.go index e2240df082ae7..61fc48de8a22a 100644 --- a/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/pkg/apis/extensions/v1beta1/generated.pb.go @@ -96,8 +96,8 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" +import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" -import k8s_io_kubernetes_pkg_util_intstr "k8s.io/kubernetes/pkg/util/intstr" import strings "strings" import reflect "reflect" @@ -4050,7 +4050,7 @@ func (this *IngressBackend) String() string { } s := strings.Join([]string{`&IngressBackend{`, `ServiceName:` + fmt.Sprintf("%v", this.ServiceName) + `,`, - `ServicePort:` + strings.Replace(strings.Replace(this.ServicePort.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `ServicePort:` + strings.Replace(strings.Replace(this.ServicePort.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -4170,7 +4170,7 @@ func (this *NetworkPolicyPort) String() string { } s := strings.Join([]string{`&NetworkPolicyPort{`, `Protocol:` + valueToStringGenerated(this.Protocol) + `,`, - `Port:` + strings.Replace(fmt.Sprintf("%v", this.Port), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1) + `,`, + `Port:` + strings.Replace(fmt.Sprintf("%v", this.Port), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, `}`, }, "") return s @@ -4320,8 +4320,8 @@ func (this *RollingUpdateDeployment) String() string { return "nil" } s := strings.Join([]string{`&RollingUpdateDeployment{`, - `MaxUnavailable:` + strings.Replace(fmt.Sprintf("%v", this.MaxUnavailable), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1) + `,`, - `MaxSurge:` + strings.Replace(fmt.Sprintf("%v", this.MaxSurge), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1) + `,`, + `MaxUnavailable:` + strings.Replace(fmt.Sprintf("%v", this.MaxUnavailable), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, + `MaxSurge:` + strings.Replace(fmt.Sprintf("%v", this.MaxSurge), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, `}`, }, "") return s @@ -9245,7 +9245,7 @@ func (m *NetworkPolicyPort) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Port == nil { - m.Port = &k8s_io_kubernetes_pkg_util_intstr.IntOrString{} + m.Port = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} } if err := m.Port.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10971,7 +10971,7 @@ func (m *RollingUpdateDeployment) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.MaxUnavailable == nil { - m.MaxUnavailable = &k8s_io_kubernetes_pkg_util_intstr.IntOrString{} + m.MaxUnavailable = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} } if err := m.MaxUnavailable.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -11004,7 +11004,7 @@ func (m *RollingUpdateDeployment) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.MaxSurge == nil { - m.MaxSurge = &k8s_io_kubernetes_pkg_util_intstr.IntOrString{} + m.MaxSurge = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} } if err := m.MaxSurge.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -12526,229 +12526,229 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 3581 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x4f, 0x6c, 0x1b, 0xc7, - 0xd5, 0xf7, 0x92, 0xa2, 0x45, 0x3d, 0x59, 0x92, 0x35, 0x52, 0x64, 0x46, 0x49, 0x44, 0x67, 0x83, - 0x2f, 0x71, 0x3e, 0x24, 0xd4, 0x67, 0xe7, 0x73, 0xbe, 0xc4, 0x49, 0x9c, 0x88, 0x92, 0x65, 0x2b, - 0x9f, 0x64, 0x33, 0x43, 0xc9, 0xc8, 0xff, 0x74, 0x45, 0x8e, 0xa8, 0xb5, 0xf6, 0x5f, 0x76, 0x67, - 0x15, 0x31, 0x41, 0x91, 0x00, 0x45, 0xaf, 0x45, 0x7a, 0x29, 0x52, 0x20, 0x3d, 0xf6, 0xd0, 0x4b, - 0xda, 0x00, 0x2d, 0xd2, 0x1e, 0x7b, 0x28, 0x6a, 0xa0, 0x45, 0x91, 0x02, 0x2d, 0xd0, 0x43, 0xaa, - 0xd4, 0x2a, 0x1a, 0xf4, 0x5e, 0xe4, 0xe2, 0x5e, 0x8a, 0x99, 0x9d, 0xfd, 0xcb, 0x5d, 0x59, 0xa4, - 0x64, 0xa2, 0x40, 0x6f, 0xe2, 0xcc, 0x7b, 0xbf, 0xf7, 0x67, 0x66, 0xdf, 0x7b, 0x33, 0xf3, 0x04, - 0xcf, 0x6d, 0x3d, 0xe5, 0x54, 0x54, 0x73, 0x76, 0xcb, 0x5d, 0x27, 0xb6, 0x41, 0x28, 0x71, 0x66, - 0xad, 0xad, 0xd6, 0xac, 0x62, 0xa9, 0xce, 0x2c, 0xd9, 0xa1, 0xc4, 0x70, 0x54, 0xd3, 0x70, 0x66, - 0xb7, 0xcf, 0xae, 0x13, 0xaa, 0x9c, 0x9d, 0x6d, 0x11, 0x83, 0xd8, 0x0a, 0x25, 0xcd, 0x8a, 0x65, - 0x9b, 0xd4, 0x44, 0x8f, 0x7b, 0xec, 0x95, 0x90, 0xbd, 0x62, 0x6d, 0xb5, 0x2a, 0x8c, 0xbd, 0x12, - 0xb2, 0x57, 0x04, 0xfb, 0xf4, 0xe3, 0x2d, 0x95, 0x6e, 0xba, 0xeb, 0x95, 0x86, 0xa9, 0xcf, 0xb6, - 0xcc, 0x96, 0x39, 0xcb, 0x51, 0xd6, 0xdd, 0x0d, 0xfe, 0x8b, 0xff, 0xe0, 0x7f, 0x79, 0xe8, 0xd3, - 0xff, 0x2b, 0x94, 0x53, 0x2c, 0x55, 0x57, 0x1a, 0x9b, 0xaa, 0x41, 0xec, 0xb6, 0xaf, 0xde, 0xac, - 0x4d, 0x1c, 0xd3, 0xb5, 0x1b, 0x24, 0xa9, 0xd3, 0xbe, 0x5c, 0xce, 0xac, 0x4e, 0xa8, 0x32, 0xbb, - 0xdd, 0x61, 0xc9, 0xf4, 0x6c, 0x16, 0x97, 0xed, 0x1a, 0x54, 0xd5, 0x3b, 0xc5, 0x3c, 0x79, 0x27, - 0x06, 0xa7, 0xb1, 0x49, 0x74, 0xa5, 0x83, 0xef, 0xb1, 0x4c, 0x8f, 0xa7, 0xa9, 0x75, 0x36, 0x9d, - 0xda, 0xa5, 0xaa, 0x36, 0xab, 0x1a, 0xd4, 0xa1, 0x76, 0x92, 0x45, 0xae, 0x00, 0xcc, 0xd5, 0x96, - 0xae, 0x13, 0x9b, 0xf9, 0x1e, 0x9d, 0x86, 0x01, 0x43, 0xd1, 0x49, 0x49, 0x3a, 0x2d, 0x9d, 0x19, - 0xaa, 0x9e, 0xb8, 0xb9, 0x5b, 0x3e, 0xb6, 0xb7, 0x5b, 0x1e, 0xb8, 0xaa, 0xe8, 0x04, 0xf3, 0x19, - 0xf9, 0x75, 0x98, 0x9c, 0xaf, 0xad, 0xad, 0x2a, 0x76, 0x8b, 0xd0, 0x35, 0xaa, 0x6a, 0xea, 0xbb, - 0x0a, 0x65, 0x9c, 0x0b, 0x70, 0x92, 0xf2, 0xc1, 0x1a, 0xb1, 0x1b, 0xc4, 0xa0, 0x4a, 0xcb, 0x43, - 0x29, 0x54, 0x4b, 0x02, 0xe5, 0xe4, 0x6a, 0x62, 0x1e, 0x77, 0x70, 0xc8, 0xdf, 0x97, 0xe0, 0xde, - 0x79, 0xd7, 0xa1, 0xa6, 0xbe, 0x42, 0xa8, 0xad, 0x36, 0xe6, 0x5d, 0xdb, 0x26, 0x06, 0xad, 0x53, - 0x85, 0xba, 0xce, 0x9d, 0xb5, 0x43, 0xaf, 0x42, 0x61, 0x5b, 0xd1, 0x5c, 0x52, 0xca, 0x9d, 0x96, - 0xce, 0x0c, 0x9f, 0xab, 0x54, 0xc4, 0x8e, 0x8b, 0xba, 0xdd, 0xdf, 0x73, 0x15, 0x7f, 0x4f, 0x54, - 0x5e, 0x72, 0x15, 0x83, 0xaa, 0xb4, 0x5d, 0x9d, 0x14, 0x90, 0x27, 0x84, 0xdc, 0xeb, 0x0c, 0x0b, - 0x7b, 0x90, 0xf2, 0x77, 0x24, 0x78, 0x20, 0x53, 0xb7, 0x65, 0xd5, 0xa1, 0x48, 0x87, 0x82, 0x4a, - 0x89, 0xee, 0x94, 0xa4, 0xd3, 0xf9, 0x33, 0xc3, 0xe7, 0xae, 0x54, 0xba, 0xda, 0xef, 0x95, 0x4c, - 0xf0, 0xea, 0x88, 0xd0, 0xab, 0xb0, 0xc4, 0xe0, 0xb1, 0x27, 0x45, 0xfe, 0xae, 0x04, 0x28, 0xca, - 0xe3, 0xf9, 0xf7, 0x00, 0x5e, 0x7a, 0xe5, 0x70, 0x5e, 0x9a, 0x10, 0x90, 0xc3, 0x9e, 0xc0, 0x98, - 0x93, 0x3e, 0x90, 0x60, 0xaa, 0x53, 0x27, 0xee, 0x9d, 0x8d, 0xb8, 0x77, 0xe6, 0x0e, 0xe1, 0x1d, - 0x0f, 0x35, 0xc3, 0x2d, 0x3f, 0xcb, 0xc1, 0xd0, 0x82, 0x42, 0x74, 0xd3, 0xa8, 0x13, 0x8a, 0xbe, - 0x01, 0x45, 0xf6, 0x11, 0x37, 0x15, 0xaa, 0x70, 0x8f, 0x0c, 0x9f, 0xfb, 0x9f, 0xfd, 0xcc, 0x75, - 0x2a, 0x8c, 0xba, 0xb2, 0x7d, 0xb6, 0x72, 0x6d, 0xfd, 0x06, 0x69, 0xd0, 0x15, 0x42, 0x95, 0x2a, - 0x12, 0x72, 0x20, 0x1c, 0xc3, 0x01, 0x2a, 0x7a, 0x13, 0x06, 0x1c, 0x8b, 0x34, 0x84, 0x33, 0x9f, - 0xed, 0xd2, 0xac, 0x40, 0xd3, 0xba, 0x45, 0x1a, 0xe1, 0x6a, 0xb1, 0x5f, 0x98, 0xe3, 0xa2, 0x0d, - 0x38, 0xee, 0xf0, 0x6d, 0x50, 0xca, 0x73, 0x09, 0x17, 0x7b, 0x96, 0xe0, 0x6d, 0xa6, 0x51, 0x21, - 0xe3, 0xb8, 0xf7, 0x1b, 0x0b, 0x74, 0xf9, 0xb7, 0x12, 0x8c, 0x04, 0xb4, 0x7c, 0xc5, 0x5e, 0xef, - 0xf0, 0x5d, 0xe5, 0x60, 0xbe, 0x63, 0xdc, 0xdc, 0x73, 0x27, 0x85, 0xac, 0xa2, 0x3f, 0x12, 0xf1, - 0xdb, 0x1b, 0xfe, 0x7e, 0xc8, 0xf1, 0xfd, 0xf0, 0x54, 0xaf, 0x66, 0x65, 0x6c, 0x83, 0xdf, 0x44, - 0xcd, 0x61, 0xee, 0x44, 0x6f, 0x40, 0xd1, 0x21, 0x1a, 0x69, 0x50, 0xd3, 0x16, 0xe6, 0x3c, 0x71, - 0x40, 0x73, 0x94, 0x75, 0xa2, 0xd5, 0x05, 0x6b, 0xf5, 0x04, 0xb3, 0xc7, 0xff, 0x85, 0x03, 0x48, - 0xf4, 0x1a, 0x14, 0x29, 0xd1, 0x2d, 0x4d, 0xa1, 0xfe, 0x87, 0xf5, 0x78, 0xb6, 0x49, 0x0c, 0xb6, - 0x66, 0x36, 0x57, 0x05, 0x03, 0x5f, 0xfc, 0xc0, 0x59, 0xfe, 0x28, 0x0e, 0x00, 0xe5, 0x0f, 0xf3, - 0x30, 0x96, 0x58, 0x48, 0x74, 0x1d, 0xa6, 0x1a, 0x5e, 0x98, 0xb8, 0xea, 0xea, 0xeb, 0xc4, 0xae, - 0x37, 0x36, 0x49, 0xd3, 0xd5, 0x48, 0x53, 0x04, 0xde, 0x19, 0x81, 0x37, 0x35, 0x9f, 0x4a, 0x85, - 0x33, 0xb8, 0xd1, 0x8b, 0x80, 0x0c, 0x3e, 0xb4, 0xa2, 0x3a, 0x4e, 0x80, 0x99, 0xe3, 0x98, 0xd3, - 0x02, 0x13, 0x5d, 0xed, 0xa0, 0xc0, 0x29, 0x5c, 0x4c, 0xc7, 0x26, 0x71, 0x54, 0x9b, 0x34, 0x93, - 0x3a, 0xe6, 0xe3, 0x3a, 0x2e, 0xa4, 0x52, 0xe1, 0x0c, 0x6e, 0x74, 0x1e, 0x86, 0x3d, 0x69, 0x98, - 0x28, 0xcd, 0x76, 0x69, 0x80, 0x83, 0x05, 0x81, 0xe9, 0x6a, 0x38, 0x85, 0xa3, 0x74, 0xcc, 0x34, - 0x73, 0xdd, 0x21, 0xf6, 0x36, 0x69, 0x5e, 0xf6, 0x12, 0xa1, 0x6a, 0x1a, 0xa5, 0xc2, 0x69, 0xe9, - 0x4c, 0x3e, 0x34, 0xed, 0x5a, 0x07, 0x05, 0x4e, 0xe1, 0x92, 0x7f, 0x9e, 0x03, 0x58, 0x20, 0x96, - 0x66, 0xb6, 0x75, 0x62, 0xf4, 0x23, 0xd0, 0xbc, 0x15, 0x0b, 0x34, 0xcf, 0x75, 0xfb, 0xbd, 0x04, - 0xaa, 0x66, 0x46, 0x9a, 0x56, 0x22, 0xd2, 0x3c, 0xdf, 0xbb, 0x88, 0xfd, 0x43, 0xcd, 0xad, 0x3c, - 0x4c, 0x84, 0xc4, 0xf3, 0xa6, 0xd1, 0x54, 0x79, 0x11, 0xf1, 0x0c, 0x0c, 0xd0, 0xb6, 0xe5, 0xa7, - 0xae, 0x47, 0x7c, 0x15, 0x57, 0xdb, 0x16, 0xb9, 0xbd, 0x5b, 0x3e, 0x95, 0xc2, 0xc2, 0xa6, 0x30, - 0x67, 0x42, 0xd7, 0x03, 0xed, 0x73, 0x9c, 0xfd, 0x62, 0x5c, 0xf8, 0xed, 0xdd, 0xf2, 0xbe, 0xc5, - 0x54, 0x25, 0xc0, 0x8c, 0x2b, 0x8b, 0x1e, 0x86, 0xe3, 0x36, 0x51, 0x1c, 0xd3, 0xe0, 0xbb, 0x6c, - 0x28, 0x34, 0x0a, 0xf3, 0x51, 0x2c, 0x66, 0xd1, 0xa3, 0x30, 0xa8, 0x13, 0xc7, 0x61, 0x85, 0x4f, - 0x81, 0x13, 0x8e, 0x09, 0xc2, 0xc1, 0x15, 0x6f, 0x18, 0xfb, 0xf3, 0xe8, 0x06, 0x8c, 0x6a, 0x8a, - 0x43, 0xd7, 0xac, 0xa6, 0x42, 0xc9, 0xaa, 0xaa, 0x93, 0xd2, 0x71, 0xee, 0xf0, 0xff, 0x3e, 0xd8, - 0x8e, 0x61, 0x1c, 0xd5, 0x29, 0x81, 0x3e, 0xba, 0x1c, 0x43, 0xc2, 0x09, 0x64, 0xb4, 0x0d, 0x88, - 0x8d, 0xac, 0xda, 0x8a, 0xe1, 0x78, 0x2e, 0x63, 0xf2, 0x06, 0xbb, 0x96, 0x17, 0x7c, 0x1e, 0xcb, - 0x1d, 0x68, 0x38, 0x45, 0x82, 0xfc, 0x3b, 0x09, 0x46, 0xc3, 0x05, 0xeb, 0x43, 0x3e, 0x79, 0x33, - 0x9e, 0x4f, 0x9e, 0xee, 0x79, 0xf3, 0x66, 0x24, 0x94, 0x8f, 0xf2, 0x80, 0x42, 0x22, 0x6c, 0x6a, - 0xda, 0xba, 0xd2, 0xd8, 0x3a, 0x40, 0xb9, 0xf5, 0x43, 0x09, 0x90, 0xcb, 0x17, 0xa4, 0x39, 0x67, - 0x18, 0x26, 0xe5, 0xe1, 0xc3, 0x57, 0xf3, 0x95, 0x9e, 0xd5, 0xf4, 0x35, 0xa8, 0xac, 0x75, 0x60, - 0x5f, 0x32, 0xa8, 0xdd, 0x0e, 0x57, 0xac, 0x93, 0x00, 0xa7, 0x28, 0x84, 0xde, 0x06, 0xb0, 0x05, - 0xe6, 0xaa, 0x29, 0x42, 0x40, 0xb7, 0x51, 0xc6, 0x57, 0x6a, 0xde, 0x34, 0x36, 0xd4, 0x56, 0x18, - 0xd0, 0x70, 0x00, 0x8c, 0x23, 0x42, 0xa6, 0x2f, 0xc1, 0xa9, 0x0c, 0xed, 0xd1, 0x49, 0xc8, 0x6f, - 0x91, 0xb6, 0xe7, 0x56, 0xcc, 0xfe, 0x44, 0x93, 0xd1, 0xb2, 0x75, 0x48, 0x54, 0x9c, 0x17, 0x72, - 0x4f, 0x49, 0xf2, 0x57, 0x85, 0xe8, 0x5e, 0xe3, 0xc9, 0xfe, 0x0c, 0x14, 0x6d, 0x62, 0x69, 0x6a, - 0x43, 0x71, 0x44, 0x3a, 0xe4, 0x79, 0x1b, 0x8b, 0x31, 0x1c, 0xcc, 0xc6, 0xca, 0x82, 0xdc, 0xdd, - 0x2d, 0x0b, 0xf2, 0x47, 0x5c, 0x16, 0x20, 0x13, 0x8a, 0x0e, 0x65, 0xc7, 0xb9, 0x96, 0x97, 0x03, - 0xbb, 0x2f, 0xab, 0xa3, 0x31, 0xdb, 0x03, 0x0a, 0x05, 0xfa, 0x23, 0x38, 0x10, 0x82, 0xe6, 0x60, - 0x4c, 0x57, 0x0d, 0x9e, 0x4c, 0xeb, 0xa4, 0x61, 0x1a, 0x4d, 0x87, 0x07, 0xbb, 0x42, 0xf5, 0x94, - 0x60, 0x1a, 0x5b, 0x89, 0x4f, 0xe3, 0x24, 0x3d, 0x5a, 0x86, 0x49, 0x9b, 0x6c, 0xab, 0x4c, 0x8d, - 0x2b, 0xaa, 0x43, 0x4d, 0xbb, 0xbd, 0xac, 0xea, 0x2a, 0xe5, 0x21, 0xb0, 0x50, 0x2d, 0xed, 0xed, - 0x96, 0x27, 0x71, 0xca, 0x3c, 0x4e, 0xe5, 0x62, 0xd1, 0xd9, 0x52, 0x5c, 0x87, 0x34, 0x79, 0x48, - 0x2b, 0x86, 0xd1, 0xb9, 0xc6, 0x47, 0xb1, 0x98, 0x45, 0x7a, 0x6c, 0x73, 0x17, 0x8f, 0x62, 0x73, - 0x8f, 0x66, 0x6f, 0x6c, 0xb4, 0x06, 0xa7, 0x2c, 0xdb, 0x6c, 0xd9, 0xc4, 0x71, 0x16, 0x88, 0xd2, - 0xd4, 0x54, 0x83, 0xf8, 0xfe, 0x1a, 0xe2, 0x76, 0xde, 0xb7, 0xb7, 0x5b, 0x3e, 0x55, 0x4b, 0x27, - 0xc1, 0x59, 0xbc, 0xf2, 0xc7, 0x03, 0x70, 0x32, 0x99, 0x65, 0x33, 0x8a, 0x1a, 0xa9, 0x97, 0xa2, - 0x06, 0x3d, 0x16, 0xf9, 0x6c, 0xbc, 0x8a, 0x2f, 0xd8, 0x0d, 0x29, 0x9f, 0xce, 0x1c, 0x8c, 0x89, - 0x38, 0xe2, 0x4f, 0x8a, 0xb2, 0x2e, 0xd8, 0x0d, 0x6b, 0xf1, 0x69, 0x9c, 0xa4, 0x47, 0x97, 0x61, - 0x5c, 0xd9, 0x56, 0x54, 0x4d, 0x59, 0xd7, 0x48, 0x00, 0xe2, 0x95, 0x73, 0xf7, 0x0a, 0x90, 0xf1, - 0xb9, 0x24, 0x01, 0xee, 0xe4, 0x41, 0x2b, 0x30, 0xe1, 0x1a, 0x9d, 0x50, 0xde, 0xee, 0xbc, 0x4f, - 0x40, 0x4d, 0xac, 0x75, 0x92, 0xe0, 0x34, 0x3e, 0xb4, 0x0d, 0xd0, 0xf0, 0x0b, 0x02, 0xa7, 0x74, - 0x9c, 0xc7, 0xea, 0x6a, 0xcf, 0xdf, 0x56, 0x50, 0x5b, 0x84, 0x11, 0x31, 0x18, 0x72, 0x70, 0x44, - 0x12, 0x7a, 0x06, 0x46, 0x6c, 0x5e, 0xb7, 0xfa, 0x06, 0x0c, 0x72, 0x03, 0xee, 0x11, 0x6c, 0x23, - 0x38, 0x3a, 0x89, 0xe3, 0xb4, 0xf2, 0xef, 0xa5, 0x68, 0x8a, 0xf2, 0x3f, 0x5f, 0x74, 0x21, 0x56, - 0x56, 0x3d, 0x9c, 0x28, 0xab, 0xa6, 0x3a, 0x39, 0x22, 0x55, 0xd5, 0xfb, 0x30, 0xc2, 0xb6, 0xb5, - 0x6a, 0xb4, 0xbc, 0xa5, 0x14, 0x21, 0x72, 0xb1, 0x87, 0x4f, 0x27, 0xc0, 0x88, 0xa4, 0xda, 0x71, - 0x6e, 0x53, 0x74, 0x12, 0xc7, 0xe5, 0xc9, 0x9f, 0x4a, 0x30, 0xb5, 0x58, 0xbf, 0x6c, 0x9b, 0xae, - 0xe5, 0xab, 0x77, 0xcd, 0xf2, 0x7c, 0xf5, 0x7f, 0x30, 0x60, 0xbb, 0x9a, 0x6f, 0xd7, 0x43, 0xbe, - 0x5d, 0xd8, 0xd5, 0x98, 0x5d, 0x13, 0x09, 0x2e, 0xcf, 0x28, 0xc6, 0x80, 0xde, 0x84, 0xe3, 0xb6, - 0x62, 0xb4, 0x88, 0x9f, 0x84, 0x9f, 0xec, 0xd2, 0x9a, 0xa5, 0x05, 0xcc, 0xd8, 0x23, 0xa5, 0x20, - 0x47, 0xc3, 0x02, 0x55, 0xfe, 0x81, 0x04, 0x63, 0x57, 0x56, 0x57, 0x6b, 0x4b, 0x06, 0xff, 0x8a, - 0x6b, 0x0a, 0xdd, 0x64, 0x75, 0x82, 0xa5, 0xd0, 0xcd, 0x64, 0x9d, 0xc0, 0xe6, 0x30, 0x9f, 0x41, - 0x9b, 0x30, 0xc8, 0xa2, 0x07, 0x31, 0x9a, 0x3d, 0x96, 0xf8, 0x42, 0x5c, 0xd5, 0x03, 0x09, 0xeb, - 0x4f, 0x31, 0x80, 0x7d, 0x78, 0xf9, 0x3d, 0x98, 0x8c, 0xa8, 0xc7, 0xfc, 0xc5, 0x2f, 0x71, 0x50, - 0x03, 0x0a, 0x4c, 0x13, 0xff, 0x8a, 0xa6, 0xdb, 0x9b, 0x86, 0x84, 0xc9, 0x61, 0x1d, 0xc5, 0x7e, - 0x39, 0xd8, 0xc3, 0x96, 0xbf, 0xcc, 0xc1, 0xa9, 0x2b, 0xa6, 0xad, 0xbe, 0x6b, 0x1a, 0x54, 0xd1, - 0x6a, 0x66, 0x73, 0xce, 0xa5, 0xa6, 0xd3, 0x50, 0x34, 0x62, 0xf7, 0xe1, 0x10, 0xa5, 0xc5, 0x0e, - 0x51, 0x2f, 0x76, 0x6b, 0x61, 0xba, 0xde, 0x99, 0x27, 0x2a, 0x9a, 0x38, 0x51, 0x2d, 0x1f, 0x91, - 0xbc, 0xfd, 0x8f, 0x57, 0x7f, 0x97, 0xe0, 0xbe, 0x0c, 0xce, 0x3e, 0xd4, 0xe1, 0x5b, 0xf1, 0x3a, - 0x7c, 0xf1, 0x68, 0x4c, 0xce, 0x28, 0xca, 0xff, 0x99, 0xcb, 0x34, 0x95, 0x97, 0x81, 0x6f, 0x43, - 0x91, 0xff, 0xc2, 0x64, 0x43, 0x98, 0x3a, 0xdf, 0xa5, 0x3e, 0x75, 0x77, 0xdd, 0xbf, 0x02, 0xc5, - 0x64, 0x83, 0xd8, 0xc4, 0x68, 0x90, 0x48, 0x89, 0x24, 0xc0, 0x71, 0x20, 0x06, 0x9d, 0x85, 0x61, - 0x5e, 0xf2, 0xc4, 0xb2, 0xe8, 0xd8, 0xde, 0x6e, 0x79, 0x78, 0x25, 0x1c, 0xc6, 0x51, 0x1a, 0x74, - 0x1e, 0x86, 0x75, 0x65, 0x27, 0x91, 0x43, 0x83, 0xdb, 0x8c, 0x95, 0x70, 0x0a, 0x47, 0xe9, 0xd0, - 0xfb, 0x30, 0xda, 0xb0, 0xdc, 0xc8, 0x2d, 0xbc, 0xa8, 0x01, 0xbb, 0x35, 0x31, 0xed, 0x42, 0xbf, - 0x8a, 0xd8, 0xd9, 0x72, 0xbe, 0xb6, 0x16, 0x19, 0xc3, 0x09, 0x71, 0xf2, 0x2f, 0xf3, 0xf0, 0xc0, - 0xbe, 0x5b, 0x14, 0x2d, 0xee, 0x53, 0x9b, 0x4c, 0x75, 0x51, 0x97, 0x34, 0x60, 0x84, 0x9d, 0x31, - 0xb9, 0xbb, 0xf9, 0x01, 0x36, 0xd7, 0xf5, 0x01, 0x96, 0xa7, 0x9a, 0xe5, 0x28, 0x08, 0x8e, 0x63, - 0xb2, 0x72, 0x46, 0x5c, 0x89, 0x65, 0x95, 0x33, 0xf3, 0xf1, 0x69, 0x9c, 0xa4, 0x67, 0x10, 0xe2, - 0xc6, 0x2a, 0x51, 0xcc, 0x04, 0x10, 0x0b, 0xf1, 0x69, 0x9c, 0xa4, 0x47, 0x3a, 0x94, 0x05, 0x6a, - 0xdc, 0xfb, 0x91, 0x87, 0x15, 0xaf, 0xa8, 0x79, 0x68, 0x6f, 0xb7, 0x5c, 0x9e, 0xdf, 0x9f, 0x14, - 0xdf, 0x09, 0x4b, 0x5e, 0x81, 0x91, 0x2b, 0xa6, 0x43, 0x6b, 0xa6, 0x4d, 0x79, 0x16, 0x43, 0x0f, - 0x40, 0x5e, 0x57, 0x0d, 0x71, 0x68, 0x1a, 0x16, 0x6a, 0xe7, 0xd9, 0xde, 0x65, 0xe3, 0x7c, 0x5a, - 0xd9, 0x11, 0xdb, 0x3a, 0x9c, 0x56, 0x76, 0x30, 0x1b, 0x97, 0x2f, 0xc3, 0xa0, 0xc8, 0x8e, 0x51, - 0xa0, 0xfc, 0xfe, 0x40, 0xf9, 0x14, 0xa0, 0x1f, 0xe7, 0x60, 0x50, 0x24, 0x93, 0x3e, 0xa4, 0x85, - 0xd7, 0x63, 0x69, 0xe1, 0x42, 0x6f, 0x89, 0x37, 0x33, 0x0d, 0x34, 0x13, 0x69, 0xe0, 0xd9, 0x1e, - 0xf1, 0xf7, 0x0f, 0xfb, 0x9f, 0x48, 0x30, 0x1a, 0x2f, 0x01, 0x58, 0x60, 0x61, 0x9f, 0x92, 0xda, - 0x20, 0x57, 0xc3, 0x3b, 0x8a, 0x20, 0xb0, 0xd4, 0xc3, 0x29, 0x1c, 0xa5, 0x43, 0x24, 0x60, 0x63, - 0xdb, 0x22, 0xf9, 0x4c, 0x94, 0x50, 0xda, 0xa5, 0xaa, 0x56, 0xf1, 0x5e, 0x17, 0x2b, 0x4b, 0x06, - 0xbd, 0x66, 0xd7, 0xa9, 0xad, 0x1a, 0xad, 0x0e, 0x31, 0x7c, 0x87, 0x45, 0x71, 0xe5, 0x9b, 0x12, - 0x0c, 0x0b, 0x85, 0xfb, 0x90, 0x97, 0x5e, 0x8b, 0xe7, 0xa5, 0x27, 0x7b, 0x2c, 0xae, 0xd2, 0xf3, - 0xd0, 0x67, 0xa1, 0x29, 0xac, 0x9c, 0x62, 0xd5, 0xde, 0xa6, 0xe9, 0xd0, 0x64, 0xb5, 0xc7, 0xbe, - 0x34, 0xcc, 0x67, 0xd0, 0xb7, 0x25, 0x38, 0xa9, 0x26, 0x0a, 0x30, 0xe1, 0xe9, 0xe7, 0x7b, 0x53, - 0x2d, 0x80, 0x09, 0x9f, 0x5c, 0x93, 0x33, 0xb8, 0x43, 0xa4, 0xec, 0x42, 0x07, 0x15, 0x52, 0x60, - 0x60, 0x93, 0x52, 0xab, 0xc7, 0x8c, 0x99, 0x56, 0x5a, 0x56, 0x8b, 0xdc, 0xfc, 0xd5, 0xd5, 0x1a, - 0xe6, 0xd0, 0xf2, 0x27, 0xb9, 0xc0, 0x61, 0x75, 0xef, 0x13, 0x09, 0x8a, 0x5f, 0xe9, 0x28, 0x8a, - 0xdf, 0xe1, 0xb4, 0xc2, 0x17, 0xbd, 0x0c, 0x79, 0xaa, 0xf5, 0x7a, 0x43, 0x28, 0x24, 0xac, 0x2e, - 0xd7, 0xc3, 0x70, 0xb5, 0xba, 0x5c, 0xc7, 0x0c, 0x12, 0xbd, 0x05, 0x05, 0x76, 0xb4, 0x60, 0x5f, - 0x78, 0xbe, 0xf7, 0x08, 0xc2, 0xfc, 0x15, 0xee, 0x30, 0xf6, 0xcb, 0xc1, 0x1e, 0xae, 0xfc, 0x1e, - 0x8c, 0xc4, 0xc2, 0x00, 0xba, 0x01, 0x27, 0x34, 0x53, 0x69, 0x56, 0x15, 0x4d, 0x31, 0x1a, 0xc4, - 0x4e, 0x06, 0xc6, 0xf4, 0xcb, 0xa5, 0xe5, 0x08, 0x87, 0x08, 0x27, 0xc1, 0xa3, 0x77, 0x74, 0x0e, - 0xc7, 0xb0, 0x65, 0x05, 0x20, 0xb4, 0x1e, 0x95, 0xa1, 0xc0, 0xb6, 0xb0, 0x77, 0x4c, 0x18, 0xaa, - 0x0e, 0x31, 0x5d, 0xd9, 0xce, 0x76, 0xb0, 0x37, 0x8e, 0xce, 0x01, 0x38, 0xa4, 0x61, 0x13, 0xca, - 0xa3, 0x8e, 0x77, 0x1d, 0x1f, 0xc4, 0xdf, 0x7a, 0x30, 0x83, 0x23, 0x54, 0xf2, 0x1f, 0x25, 0x18, - 0xb9, 0x4a, 0xe8, 0x3b, 0xa6, 0xbd, 0x55, 0x33, 0x35, 0xb5, 0xd1, 0xee, 0x43, 0xd4, 0x5f, 0x8f, - 0x45, 0xfd, 0x17, 0xba, 0x5c, 0xb3, 0x98, 0xb6, 0x59, 0xb1, 0x5f, 0xfe, 0x9b, 0x04, 0xa5, 0x18, - 0x65, 0x34, 0x4c, 0x10, 0x28, 0x58, 0xa6, 0x4d, 0xfd, 0x03, 0xd7, 0xa1, 0x34, 0x60, 0x21, 0x35, - 0x72, 0xe4, 0x62, 0xb0, 0xd8, 0x43, 0x67, 0x76, 0x6e, 0xd8, 0xa6, 0x2e, 0xf6, 0xfd, 0xe1, 0xa4, - 0x10, 0x62, 0x87, 0x76, 0x2e, 0xda, 0xa6, 0x8e, 0x39, 0xb6, 0xfc, 0x07, 0x09, 0xc6, 0x63, 0x94, - 0x7d, 0x08, 0xe9, 0x4a, 0x3c, 0xa4, 0x3f, 0x7b, 0x18, 0xc3, 0x32, 0x02, 0xfb, 0xd7, 0x49, 0xb3, - 0x98, 0x03, 0xd0, 0x06, 0x0c, 0x5b, 0x66, 0xb3, 0x7e, 0x04, 0xaf, 0xc9, 0xfc, 0x60, 0x50, 0x0b, - 0xb1, 0x70, 0x14, 0x18, 0xed, 0xc0, 0xb8, 0xa1, 0xe8, 0xc4, 0xb1, 0x94, 0x06, 0xa9, 0x1f, 0xc1, - 0x25, 0xf5, 0x3d, 0x7b, 0xbb, 0xe5, 0xf1, 0xab, 0x49, 0x44, 0xdc, 0x29, 0x44, 0xfe, 0x69, 0x87, - 0xdd, 0xa6, 0x4d, 0xd1, 0x4b, 0x50, 0xe4, 0x6d, 0x43, 0x0d, 0x53, 0x13, 0xa9, 0xed, 0x3c, 0x5b, - 0x9a, 0x9a, 0x18, 0xbb, 0xbd, 0x5b, 0xfe, 0xaf, 0x7d, 0xdf, 0xd8, 0x7c, 0x42, 0x1c, 0xc0, 0xa0, - 0x65, 0x18, 0xb0, 0x7a, 0x2f, 0x32, 0x78, 0x5a, 0xe1, 0x95, 0x05, 0x47, 0x91, 0xff, 0x91, 0x54, - 0x9b, 0x27, 0x97, 0x1b, 0x47, 0xb6, 0x5c, 0x41, 0x51, 0x93, 0xb9, 0x64, 0x36, 0x0c, 0x8a, 0x1c, - 0x2b, 0x76, 0xe5, 0xe5, 0xc3, 0xec, 0xca, 0x68, 0x5e, 0x08, 0xee, 0x73, 0xfc, 0x41, 0x5f, 0x90, - 0xfc, 0x67, 0x09, 0xc6, 0xb9, 0x42, 0x0d, 0xd7, 0x56, 0x69, 0xbb, 0x6f, 0xf1, 0x73, 0x23, 0x16, - 0x3f, 0x17, 0xba, 0x34, 0xb4, 0x43, 0xe3, 0xcc, 0x18, 0xfa, 0x85, 0x04, 0xf7, 0x74, 0x50, 0xf7, - 0x21, 0xbe, 0x90, 0x78, 0x7c, 0x79, 0xe1, 0xb0, 0x06, 0x66, 0xc4, 0x98, 0x9b, 0x90, 0x62, 0x1e, - 0xdf, 0xb8, 0xe7, 0x00, 0x2c, 0x5b, 0xdd, 0x56, 0x35, 0xd2, 0x12, 0x6d, 0x1d, 0xc5, 0x70, 0x49, - 0x6a, 0xc1, 0x0c, 0x8e, 0x50, 0xa1, 0x6f, 0xc2, 0x54, 0x93, 0x6c, 0x28, 0xae, 0x46, 0xe7, 0x9a, - 0xcd, 0x79, 0xc5, 0x52, 0xd6, 0x55, 0x4d, 0xa5, 0xaa, 0xb8, 0xec, 0x1c, 0xaa, 0x5e, 0xf2, 0xda, - 0x2d, 0xd2, 0x28, 0x6e, 0xef, 0x96, 0x1f, 0xd9, 0xff, 0x8d, 0xdc, 0x27, 0x6e, 0xe3, 0x0c, 0x21, - 0xe8, 0x5b, 0x12, 0x94, 0x6c, 0xf2, 0xb6, 0xcb, 0xce, 0xb4, 0x0b, 0xb6, 0x69, 0xc5, 0x34, 0xc8, - 0x73, 0x0d, 0x2e, 0xef, 0xed, 0x96, 0x4b, 0x38, 0x83, 0xa6, 0x1b, 0x1d, 0x32, 0x05, 0x21, 0x0a, - 0x13, 0x8a, 0xa6, 0x99, 0xef, 0x90, 0xb8, 0x07, 0x06, 0xb8, 0xfc, 0xea, 0xde, 0x6e, 0x79, 0x62, - 0xae, 0x73, 0xba, 0x1b, 0xd1, 0x69, 0xf0, 0x68, 0x16, 0x06, 0xb7, 0x4d, 0xcd, 0xd5, 0x89, 0x53, - 0x2a, 0x70, 0x49, 0x2c, 0xde, 0x0e, 0x5e, 0xf7, 0x86, 0x6e, 0xef, 0x96, 0x8f, 0x2f, 0xd6, 0xf9, - 0x2d, 0xb4, 0x4f, 0xc5, 0xce, 0x67, 0xac, 0x62, 0x12, 0x9f, 0x3c, 0x7f, 0x02, 0x2b, 0x86, 0x31, - 0xe6, 0x4a, 0x38, 0x85, 0xa3, 0x74, 0x48, 0x87, 0xa1, 0x4d, 0x71, 0x66, 0x77, 0x4a, 0x83, 0x3d, - 0xe5, 0xbe, 0xd8, 0x99, 0xbf, 0x3a, 0x2e, 0x44, 0x0e, 0xf9, 0xc3, 0x0e, 0x0e, 0x25, 0xa0, 0x47, - 0x61, 0x90, 0xff, 0x58, 0x5a, 0xe0, 0x0f, 0x67, 0xc5, 0x30, 0x12, 0x5d, 0xf1, 0x86, 0xb1, 0x3f, - 0xef, 0x93, 0x2e, 0xd5, 0xe6, 0xf9, 0x3b, 0x57, 0x82, 0x74, 0xa9, 0x36, 0x8f, 0xfd, 0x79, 0x64, - 0xc1, 0xa0, 0x43, 0x96, 0x55, 0xc3, 0xdd, 0x29, 0x01, 0xff, 0x72, 0x2f, 0x75, 0x7b, 0x33, 0x77, - 0x89, 0x73, 0x27, 0x5e, 0x05, 0x42, 0x89, 0x62, 0x1e, 0xfb, 0x62, 0xd0, 0x0e, 0x0c, 0xd9, 0xae, - 0x31, 0xe7, 0xac, 0x39, 0xc4, 0x2e, 0x0d, 0x73, 0x99, 0xdd, 0x06, 0x67, 0xec, 0xf3, 0x27, 0xa5, - 0x06, 0x1e, 0x0c, 0x28, 0x70, 0x28, 0x0c, 0x7d, 0x2c, 0x01, 0x72, 0x5c, 0xcb, 0xd2, 0x88, 0x4e, - 0x0c, 0xaa, 0x68, 0xfc, 0x61, 0xc2, 0x29, 0x9d, 0xe0, 0x3a, 0xd4, 0xba, 0xbe, 0x91, 0x4c, 0x02, - 0x25, 0x95, 0x09, 0x5e, 0xfd, 0x3a, 0x49, 0x71, 0x8a, 0x1e, 0x6c, 0x29, 0x36, 0x1c, 0xfe, 0x77, - 0x69, 0xa4, 0xa7, 0xa5, 0x48, 0x7f, 0xa0, 0x09, 0x97, 0x42, 0xcc, 0x63, 0x5f, 0x0c, 0xba, 0x0e, - 0x53, 0x36, 0x51, 0x9a, 0xd7, 0x0c, 0xad, 0x8d, 0x4d, 0x93, 0x2e, 0xaa, 0x1a, 0x71, 0xda, 0x0e, - 0x25, 0x7a, 0x69, 0x94, 0x6f, 0x9b, 0xa0, 0x2f, 0x0c, 0xa7, 0x52, 0xe1, 0x0c, 0x6e, 0xde, 0x94, - 0x25, 0x6e, 0xd2, 0xfa, 0xd3, 0xfd, 0x79, 0xb8, 0xa6, 0xac, 0x50, 0xd5, 0xbb, 0xd6, 0x94, 0x15, - 0x11, 0xb1, 0xff, 0xf5, 0xd1, 0xd7, 0x39, 0x98, 0x08, 0x89, 0x0f, 0xdc, 0x94, 0x95, 0xc2, 0xd2, - 0x87, 0xa6, 0xac, 0xf4, 0xae, 0xa6, 0xfc, 0xdd, 0xee, 0x6a, 0xba, 0x0b, 0xcd, 0x60, 0xbc, 0x51, - 0x2a, 0x74, 0xe2, 0xbf, 0x7f, 0xa3, 0x54, 0xa8, 0x6b, 0x46, 0x39, 0xf3, 0x8b, 0x5c, 0xd4, 0xa0, - 0xff, 0xa0, 0x6e, 0x9c, 0x94, 0xe6, 0x98, 0x81, 0xee, 0x9a, 0x63, 0xe4, 0x2f, 0xf2, 0x70, 0x32, - 0xf9, 0xc5, 0xc6, 0x9a, 0x32, 0xa4, 0x3b, 0x36, 0x65, 0xd4, 0x60, 0x72, 0xc3, 0xd5, 0xb4, 0x36, - 0x77, 0x48, 0xe4, 0x1d, 0xc2, 0xbb, 0xb1, 0xbf, 0x5f, 0x70, 0x4e, 0x2e, 0xa6, 0xd0, 0xe0, 0x54, - 0xce, 0x8c, 0x06, 0x93, 0x7c, 0x4f, 0x0d, 0x26, 0x1d, 0xfd, 0x0d, 0x03, 0x07, 0xef, 0x6f, 0x48, - 0x6f, 0x16, 0x29, 0xf4, 0xd0, 0x2c, 0x72, 0x14, 0xdd, 0x1d, 0x29, 0x81, 0xef, 0x4e, 0xdd, 0x1d, - 0xf2, 0xfd, 0x30, 0x2d, 0xd8, 0xd8, 0xef, 0x79, 0xd3, 0xa0, 0xb6, 0xa9, 0x69, 0xc4, 0x5e, 0x70, - 0x75, 0xbd, 0x2d, 0x5f, 0x84, 0xd1, 0x78, 0x8b, 0x91, 0xb7, 0xf2, 0x5e, 0xd7, 0x93, 0x78, 0x47, - 0x89, 0xac, 0xbc, 0x37, 0x8e, 0x03, 0x0a, 0xf9, 0x4b, 0x09, 0x4e, 0x65, 0x34, 0x5a, 0xa0, 0x1b, - 0x30, 0xaa, 0x2b, 0x3b, 0x91, 0xf6, 0x97, 0x64, 0x60, 0x39, 0xe0, 0x81, 0x9b, 0x3f, 0x0b, 0xae, - 0xc4, 0x90, 0x70, 0x02, 0x19, 0xbd, 0x0c, 0x45, 0x5d, 0xd9, 0xa9, 0xbb, 0x76, 0x8b, 0xf4, 0x78, - 0xac, 0xe7, 0x9f, 0xef, 0x8a, 0xc0, 0xc0, 0x01, 0x9a, 0xfc, 0xa9, 0x04, 0xa5, 0xac, 0x12, 0x0c, - 0x9d, 0x8f, 0xb5, 0x83, 0x3c, 0x98, 0x68, 0x07, 0x19, 0xef, 0xe0, 0xeb, 0x53, 0x33, 0xc8, 0x67, - 0x12, 0x4c, 0xa5, 0x97, 0xaa, 0xe8, 0x89, 0x98, 0xc6, 0xe5, 0x84, 0xc6, 0x63, 0x09, 0x2e, 0xa1, - 0xef, 0x26, 0x8c, 0x8a, 0x82, 0x56, 0xc0, 0x08, 0x1f, 0x3f, 0xb6, 0x7f, 0x20, 0x13, 0x60, 0x7e, - 0x69, 0xc6, 0xd7, 0x31, 0x3e, 0x86, 0x13, 0xb8, 0xf2, 0x8f, 0x72, 0x50, 0xe0, 0xaf, 0xa3, 0x7d, - 0xa8, 0xa3, 0x5e, 0x8d, 0xd5, 0x51, 0xdd, 0xfe, 0x33, 0x08, 0xd7, 0x32, 0xb3, 0x84, 0x5a, 0x4f, - 0x94, 0x50, 0x17, 0x7a, 0x42, 0xdf, 0xbf, 0x7a, 0x7a, 0x1a, 0x86, 0x02, 0x25, 0xba, 0x0b, 0xd8, - 0xf2, 0x4f, 0x72, 0x30, 0x1c, 0x11, 0xd1, 0x65, 0xb8, 0xdf, 0x8e, 0x25, 0xcc, 0x5e, 0xfe, 0xef, - 0x2c, 0x22, 0xbb, 0xe2, 0xa7, 0x4c, 0xaf, 0x83, 0x38, 0x6c, 0x73, 0xe8, 0xcc, 0xa4, 0x17, 0x61, - 0xd4, 0xfb, 0xf7, 0xbd, 0xe0, 0x5a, 0x2d, 0xcf, 0x77, 0x71, 0xd0, 0x97, 0xbe, 0x1a, 0x9b, 0xc5, - 0x09, 0xea, 0xe9, 0x67, 0x60, 0x24, 0x26, 0xac, 0xab, 0x86, 0xdf, 0x5f, 0x49, 0x30, 0x99, 0xd6, - 0x98, 0x81, 0x4e, 0xc3, 0xc0, 0x96, 0x2a, 0xde, 0x90, 0x22, 0xef, 0x6e, 0xff, 0xaf, 0x1a, 0x4d, - 0xcc, 0x67, 0x82, 0x7e, 0xed, 0x5c, 0x66, 0xbf, 0xf6, 0x39, 0x00, 0xc5, 0x52, 0xc5, 0xbf, 0x44, - 0x0a, 0xab, 0x82, 0xcd, 0x1b, 0xfe, 0xb3, 0x24, 0x8e, 0x50, 0xf1, 0x87, 0xd6, 0x50, 0x1f, 0x51, - 0x1c, 0x86, 0x2f, 0xa0, 0x11, 0x55, 0xa3, 0x74, 0xf2, 0xaf, 0x25, 0x78, 0xf0, 0x8e, 0xc7, 0x39, - 0x54, 0x8d, 0x85, 0x89, 0x4a, 0x22, 0x4c, 0xcc, 0x64, 0x03, 0xf4, 0xb1, 0xe5, 0xed, 0x7b, 0x39, - 0x40, 0xab, 0x9b, 0xaa, 0xdd, 0xac, 0x29, 0x36, 0x6d, 0x63, 0x61, 0x60, 0x1f, 0x02, 0xc7, 0x79, - 0x18, 0x6e, 0x12, 0xa7, 0x61, 0xab, 0xdc, 0x59, 0x62, 0x59, 0x03, 0xcf, 0x2f, 0x84, 0x53, 0x38, - 0x4a, 0x87, 0x5a, 0x50, 0xdc, 0xf6, 0xd6, 0xce, 0x7f, 0xb2, 0xeb, 0xb6, 0x0e, 0x0e, 0x77, 0x42, - 0xf8, 0x9d, 0x88, 0x01, 0x07, 0x07, 0xe0, 0xf2, 0x47, 0x12, 0x4c, 0x75, 0x3a, 0x66, 0x81, 0xa9, - 0x7e, 0xf7, 0x9d, 0x73, 0x3f, 0x0c, 0x70, 0x74, 0xe6, 0x95, 0x13, 0xde, 0x65, 0x39, 0x93, 0x8c, - 0xf9, 0xa8, 0xfc, 0x95, 0x04, 0xd3, 0xe9, 0xaa, 0xf5, 0xe1, 0x14, 0x72, 0x23, 0x7e, 0x0a, 0xe9, - 0xf6, 0xc6, 0x21, 0x5d, 0xef, 0x8c, 0x13, 0xc9, 0x6e, 0xea, 0x1a, 0xf4, 0xc1, 0xc8, 0x8d, 0xb8, - 0x91, 0x73, 0x87, 0x36, 0x32, 0xdd, 0xc0, 0xea, 0xa3, 0x37, 0x6f, 0xcd, 0x1c, 0xfb, 0xfc, 0xd6, - 0xcc, 0xb1, 0x3f, 0xdd, 0x9a, 0x39, 0xf6, 0xc1, 0xde, 0x8c, 0x74, 0x73, 0x6f, 0x46, 0xfa, 0x7c, - 0x6f, 0x46, 0xfa, 0xcb, 0xde, 0x8c, 0xf4, 0xe1, 0x5f, 0x67, 0x8e, 0xbd, 0x3a, 0x28, 0x30, 0xff, - 0x15, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x37, 0x36, 0xbc, 0xc4, 0x3f, 0x00, 0x00, + // 3582 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x4d, 0x6c, 0x1c, 0xc7, + 0x95, 0x56, 0xcf, 0x70, 0xc4, 0xe1, 0xa3, 0x48, 0x8a, 0x45, 0x9a, 0x1a, 0xd3, 0x36, 0x47, 0x6e, + 0x63, 0x6d, 0x79, 0x61, 0x0f, 0x57, 0xf2, 0xca, 0x6b, 0xcb, 0xb6, 0x6c, 0x0e, 0x29, 0x4a, 0xf4, + 0x92, 0xd4, 0xb8, 0x86, 0x14, 0xd6, 0xf2, 0xdf, 0x36, 0x67, 0x8a, 0xc3, 0x16, 0xfb, 0xcf, 0xdd, + 0xd5, 0x34, 0xc7, 0x46, 0x60, 0x03, 0x41, 0xae, 0x81, 0x73, 0x09, 0x1c, 0xc0, 0x39, 0xe6, 0x90, + 0x4b, 0x62, 0x1f, 0x12, 0x27, 0xc7, 0x1c, 0x82, 0x08, 0x48, 0x10, 0x38, 0x40, 0x02, 0xe4, 0xe0, + 0x30, 0x11, 0x8d, 0x18, 0xb9, 0x07, 0xbe, 0x28, 0x97, 0xa0, 0xaa, 0xab, 0x7f, 0xa7, 0x9b, 0xd2, + 0x0c, 0xa9, 0x41, 0x80, 0xdc, 0x38, 0x55, 0xef, 0x7d, 0xef, 0xa7, 0xaa, 0xdf, 0x7b, 0x55, 0xf5, + 0x08, 0x2f, 0x6c, 0x3f, 0xe3, 0x54, 0x54, 0x73, 0x76, 0xdb, 0xdd, 0x20, 0xb6, 0x41, 0x28, 0x71, + 0x66, 0xad, 0xed, 0xd6, 0xac, 0x62, 0xa9, 0xce, 0x2c, 0xd9, 0xa5, 0xc4, 0x70, 0x54, 0xd3, 0x70, + 0x66, 0x77, 0xce, 0x6e, 0x10, 0xaa, 0x9c, 0x9d, 0x6d, 0x11, 0x83, 0xd8, 0x0a, 0x25, 0xcd, 0x8a, + 0x65, 0x9b, 0xd4, 0x44, 0x4f, 0x7a, 0xec, 0x95, 0x90, 0xbd, 0x62, 0x6d, 0xb7, 0x2a, 0x8c, 0xbd, + 0x12, 0xb2, 0x57, 0x04, 0xfb, 0xf4, 0x93, 0x2d, 0x95, 0x6e, 0xb9, 0x1b, 0x95, 0x86, 0xa9, 0xcf, + 0xb6, 0xcc, 0x96, 0x39, 0xcb, 0x51, 0x36, 0xdc, 0x4d, 0xfe, 0x8b, 0xff, 0xe0, 0x7f, 0x79, 0xe8, + 0xd3, 0xff, 0x2d, 0x94, 0x53, 0x2c, 0x55, 0x57, 0x1a, 0x5b, 0xaa, 0x41, 0xec, 0xb6, 0xaf, 0xde, + 0xac, 0x4d, 0x1c, 0xd3, 0xb5, 0x1b, 0x24, 0xa9, 0xd3, 0x81, 0x5c, 0xce, 0xac, 0x4e, 0xa8, 0x32, + 0xbb, 0xd3, 0x61, 0xc9, 0xf4, 0x6c, 0x16, 0x97, 0xed, 0x1a, 0x54, 0xd5, 0x3b, 0xc5, 0x3c, 0x7d, + 0x27, 0x06, 0xa7, 0xb1, 0x45, 0x74, 0xa5, 0x83, 0xef, 0xa9, 0x2c, 0x3e, 0x97, 0xaa, 0xda, 0xac, + 0x6a, 0x50, 0x87, 0xda, 0x1d, 0x4c, 0x4f, 0x64, 0x2e, 0x53, 0x8a, 0x2d, 0x72, 0x05, 0x60, 0xae, + 0xb6, 0x74, 0x8d, 0xd8, 0xcc, 0xfb, 0xe8, 0x34, 0x0c, 0x18, 0x8a, 0x4e, 0x4a, 0xd2, 0x69, 0xe9, + 0xcc, 0x50, 0xf5, 0xc4, 0xcd, 0xbd, 0xf2, 0xb1, 0xfd, 0xbd, 0xf2, 0xc0, 0xaa, 0xa2, 0x13, 0xcc, + 0x67, 0xe4, 0xd7, 0x61, 0x72, 0xbe, 0xb6, 0xbe, 0xa6, 0xd8, 0x2d, 0x42, 0xd7, 0xa9, 0xaa, 0xa9, + 0xef, 0x2a, 0x94, 0x71, 0x2e, 0xc0, 0x49, 0xca, 0x07, 0x6b, 0xc4, 0x6e, 0x10, 0x83, 0x2a, 0x2d, + 0x0f, 0xa5, 0x50, 0x2d, 0x09, 0x94, 0x93, 0x6b, 0x89, 0x79, 0xdc, 0xc1, 0x21, 0x7f, 0x4f, 0x82, + 0xfb, 0xe7, 0x5d, 0x87, 0x9a, 0xfa, 0x0a, 0xa1, 0xb6, 0xda, 0x98, 0x77, 0x6d, 0x9b, 0x18, 0xb4, + 0x4e, 0x15, 0xea, 0x3a, 0x77, 0xd6, 0x0e, 0x5d, 0x87, 0xc2, 0x8e, 0xa2, 0xb9, 0xa4, 0x94, 0x3b, + 0x2d, 0x9d, 0x19, 0x3e, 0x57, 0xa9, 0x88, 0x3d, 0x17, 0x75, 0xa0, 0xbf, 0xeb, 0x2a, 0xfe, 0xae, + 0xa8, 0xbc, 0xe2, 0x2a, 0x06, 0x55, 0x69, 0xbb, 0x3a, 0x29, 0x20, 0x4f, 0x08, 0xb9, 0xd7, 0x18, + 0x16, 0xf6, 0x20, 0xe5, 0x6f, 0x4b, 0xf0, 0x50, 0xa6, 0x6e, 0xcb, 0xaa, 0x43, 0x91, 0x0e, 0x05, + 0x95, 0x12, 0xdd, 0x29, 0x49, 0xa7, 0xf3, 0x67, 0x86, 0xcf, 0x5d, 0xa9, 0x74, 0xb5, 0xe3, 0x2b, + 0x99, 0xe0, 0xd5, 0x11, 0xa1, 0x57, 0x61, 0x89, 0xc1, 0x63, 0x4f, 0x8a, 0xfc, 0x1d, 0x09, 0x50, + 0x94, 0xc7, 0xf3, 0xef, 0x5d, 0x78, 0xe9, 0xd5, 0xc3, 0x79, 0x69, 0x42, 0x40, 0x0e, 0x7b, 0x02, + 0x63, 0x4e, 0xfa, 0x40, 0x82, 0xa9, 0x4e, 0x9d, 0xb8, 0x77, 0x36, 0xe3, 0xde, 0x99, 0x3b, 0x84, + 0x77, 0x3c, 0xd4, 0x0c, 0xb7, 0xfc, 0x24, 0x07, 0x43, 0x0b, 0x0a, 0xd1, 0x4d, 0xa3, 0x4e, 0x28, + 0xfa, 0x7f, 0x28, 0xb2, 0xcf, 0xb8, 0xa9, 0x50, 0x85, 0x7b, 0x64, 0xf8, 0xdc, 0x7f, 0x1d, 0x64, + 0xae, 0x53, 0x61, 0xd4, 0x95, 0x9d, 0xb3, 0x95, 0xab, 0x1b, 0x37, 0x48, 0x83, 0xae, 0x10, 0xaa, + 0x54, 0x91, 0x90, 0x03, 0xe1, 0x18, 0x0e, 0x50, 0xd1, 0x9b, 0x30, 0xe0, 0x58, 0xa4, 0x21, 0x9c, + 0xf9, 0x7c, 0x97, 0x66, 0x05, 0x9a, 0xd6, 0x2d, 0xd2, 0x08, 0x57, 0x8b, 0xfd, 0xc2, 0x1c, 0x17, + 0x6d, 0xc2, 0x71, 0x87, 0x6f, 0x83, 0x52, 0x9e, 0x4b, 0xb8, 0xd8, 0xb3, 0x04, 0x6f, 0x33, 0x8d, + 0x0a, 0x19, 0xc7, 0xbd, 0xdf, 0x58, 0xa0, 0xcb, 0xbf, 0x91, 0x60, 0x24, 0xa0, 0xe5, 0x2b, 0xf6, + 0x7a, 0x87, 0xef, 0x2a, 0x77, 0xe7, 0x3b, 0xc6, 0xcd, 0x3d, 0x77, 0x52, 0xc8, 0x2a, 0xfa, 0x23, + 0x11, 0xbf, 0xbd, 0xe1, 0xef, 0x87, 0x1c, 0xdf, 0x0f, 0xcf, 0xf4, 0x6a, 0x56, 0xc6, 0x36, 0xf8, + 0x75, 0xd4, 0x1c, 0xe6, 0x4e, 0xf4, 0x06, 0x14, 0x1d, 0xa2, 0x91, 0x06, 0x35, 0x6d, 0x61, 0xce, + 0x53, 0x77, 0x69, 0x8e, 0xb2, 0x41, 0xb4, 0xba, 0x60, 0xad, 0x9e, 0x60, 0xf6, 0xf8, 0xbf, 0x70, + 0x00, 0x89, 0x5e, 0x83, 0x22, 0x25, 0xba, 0xa5, 0x29, 0xd4, 0xff, 0xb0, 0x9e, 0xcc, 0x36, 0x89, + 0xc1, 0xd6, 0xcc, 0xe6, 0x9a, 0x60, 0xe0, 0x8b, 0x1f, 0x38, 0xcb, 0x1f, 0xc5, 0x01, 0xa0, 0xfc, + 0x61, 0x1e, 0xc6, 0x12, 0x0b, 0x89, 0xae, 0xc1, 0x54, 0xc3, 0x0b, 0x13, 0xab, 0xae, 0xbe, 0x41, + 0xec, 0x7a, 0x63, 0x8b, 0x34, 0x5d, 0x8d, 0x34, 0x45, 0xe0, 0x9d, 0x11, 0x78, 0x53, 0xf3, 0xa9, + 0x54, 0x38, 0x83, 0x1b, 0xbd, 0x0c, 0xc8, 0xe0, 0x43, 0x2b, 0xaa, 0xe3, 0x04, 0x98, 0x39, 0x8e, + 0x39, 0x2d, 0x30, 0xd1, 0x6a, 0x07, 0x05, 0x4e, 0xe1, 0x62, 0x3a, 0x36, 0x89, 0xa3, 0xda, 0xa4, + 0x99, 0xd4, 0x31, 0x1f, 0xd7, 0x71, 0x21, 0x95, 0x0a, 0x67, 0x70, 0xa3, 0xf3, 0x30, 0xec, 0x49, + 0xc3, 0x44, 0x69, 0xb6, 0x4b, 0x03, 0x1c, 0x2c, 0x08, 0x4c, 0xab, 0xe1, 0x14, 0x8e, 0xd2, 0x31, + 0xd3, 0xcc, 0x0d, 0x87, 0xd8, 0x3b, 0xa4, 0x79, 0xd9, 0x4b, 0x84, 0xaa, 0x69, 0x94, 0x0a, 0xa7, + 0xa5, 0x33, 0xf9, 0xd0, 0xb4, 0xab, 0x1d, 0x14, 0x38, 0x85, 0x4b, 0xfe, 0x59, 0x0e, 0x60, 0x81, + 0x58, 0x9a, 0xd9, 0xd6, 0x89, 0xd1, 0x8f, 0x40, 0xf3, 0x56, 0x2c, 0xd0, 0xbc, 0xd0, 0xed, 0xf7, + 0x12, 0xa8, 0x9a, 0x19, 0x69, 0x5a, 0x89, 0x48, 0xf3, 0x62, 0xef, 0x22, 0x0e, 0x0e, 0x35, 0xb7, + 0xf2, 0x30, 0x11, 0x12, 0xcf, 0x9b, 0x46, 0x53, 0xe5, 0x45, 0xc4, 0x73, 0x30, 0x40, 0xdb, 0x96, + 0x9f, 0xba, 0x1e, 0xf3, 0x55, 0x5c, 0x6b, 0x5b, 0xe4, 0xf6, 0x5e, 0xf9, 0x54, 0x0a, 0x0b, 0x9b, + 0xc2, 0x9c, 0x09, 0x5d, 0x0b, 0xb4, 0xcf, 0x71, 0xf6, 0x8b, 0x71, 0xe1, 0xb7, 0xf7, 0xca, 0x07, + 0x56, 0x46, 0x95, 0x00, 0x33, 0xae, 0x2c, 0x7a, 0x14, 0x8e, 0xdb, 0x44, 0x71, 0x4c, 0x83, 0xef, + 0xb2, 0xa1, 0xd0, 0x28, 0xcc, 0x47, 0xb1, 0x98, 0x45, 0x8f, 0xc3, 0xa0, 0x4e, 0x1c, 0x87, 0x15, + 0x3e, 0x05, 0x4e, 0x38, 0x26, 0x08, 0x07, 0x57, 0xbc, 0x61, 0xec, 0xcf, 0xa3, 0x1b, 0x30, 0xaa, + 0x29, 0x0e, 0x5d, 0xb7, 0x9a, 0x0a, 0x25, 0x6b, 0xaa, 0x4e, 0x4a, 0xc7, 0xb9, 0xc3, 0xff, 0xf3, + 0xee, 0x76, 0x0c, 0xe3, 0xa8, 0x4e, 0x09, 0xf4, 0xd1, 0xe5, 0x18, 0x12, 0x4e, 0x20, 0xa3, 0x1d, + 0x40, 0x6c, 0x64, 0xcd, 0x56, 0x0c, 0xc7, 0x73, 0x19, 0x93, 0x37, 0xd8, 0xb5, 0xbc, 0xe0, 0xf3, + 0x58, 0xee, 0x40, 0xc3, 0x29, 0x12, 0xe4, 0xdf, 0x4a, 0x30, 0x1a, 0x2e, 0x58, 0x1f, 0xf2, 0xc9, + 0x9b, 0xf1, 0x7c, 0xf2, 0x6c, 0xcf, 0x9b, 0x37, 0x23, 0xa1, 0x7c, 0x94, 0x07, 0x14, 0x12, 0x61, + 0x53, 0xd3, 0x36, 0x94, 0xc6, 0xf6, 0x5d, 0x94, 0x5b, 0x3f, 0x90, 0x00, 0xb9, 0x7c, 0x41, 0x9a, + 0x73, 0x86, 0x61, 0x52, 0x1e, 0x3e, 0x7c, 0x35, 0x5f, 0xed, 0x59, 0x4d, 0x5f, 0x83, 0xca, 0x7a, + 0x07, 0xf6, 0x25, 0x83, 0xda, 0xed, 0x70, 0xc5, 0x3a, 0x09, 0x70, 0x8a, 0x42, 0xe8, 0x6d, 0x00, + 0x5b, 0x60, 0xae, 0x99, 0x22, 0x04, 0x74, 0x1b, 0x65, 0x7c, 0xa5, 0xe6, 0x4d, 0x63, 0x53, 0x6d, + 0x85, 0x01, 0x0d, 0x07, 0xc0, 0x38, 0x22, 0x64, 0xfa, 0x12, 0x9c, 0xca, 0xd0, 0x1e, 0x9d, 0x84, + 0xfc, 0x36, 0x69, 0x7b, 0x6e, 0xc5, 0xec, 0x4f, 0x34, 0x19, 0x2d, 0x5b, 0x87, 0x44, 0xc5, 0x79, + 0x21, 0xf7, 0x8c, 0x24, 0x7f, 0x55, 0x88, 0xee, 0x35, 0x9e, 0xec, 0xcf, 0x40, 0xd1, 0x26, 0x96, + 0xa6, 0x36, 0x14, 0x47, 0xa4, 0x43, 0x9e, 0xb7, 0xb1, 0x18, 0xc3, 0xc1, 0x6c, 0xac, 0x2c, 0xc8, + 0xdd, 0xdb, 0xb2, 0x20, 0x7f, 0xc4, 0x65, 0x01, 0x32, 0xa1, 0xe8, 0x50, 0x76, 0x9c, 0x6b, 0x79, + 0x39, 0xb0, 0xfb, 0xb2, 0x3a, 0x1a, 0xb3, 0x3d, 0xa0, 0x50, 0xa0, 0x3f, 0x82, 0x03, 0x21, 0x68, + 0x0e, 0xc6, 0x74, 0xd5, 0xe0, 0xc9, 0xb4, 0x4e, 0x1a, 0xa6, 0xd1, 0x74, 0x78, 0xb0, 0x2b, 0x54, + 0x4f, 0x09, 0xa6, 0xb1, 0x95, 0xf8, 0x34, 0x4e, 0xd2, 0xa3, 0x65, 0x98, 0xb4, 0xc9, 0x8e, 0xca, + 0xd4, 0xb8, 0xa2, 0x3a, 0xd4, 0xb4, 0xdb, 0xcb, 0xaa, 0xae, 0x52, 0x1e, 0x02, 0x0b, 0xd5, 0xd2, + 0xfe, 0x5e, 0x79, 0x12, 0xa7, 0xcc, 0xe3, 0x54, 0x2e, 0x16, 0x9d, 0x2d, 0xc5, 0x75, 0x48, 0x93, + 0x87, 0xb4, 0x62, 0x18, 0x9d, 0x6b, 0x7c, 0x14, 0x8b, 0x59, 0xa4, 0xc7, 0x36, 0x77, 0xf1, 0x28, + 0x36, 0xf7, 0x68, 0xf6, 0xc6, 0x46, 0xeb, 0x70, 0xca, 0xb2, 0xcd, 0x96, 0x4d, 0x1c, 0x67, 0x81, + 0x28, 0x4d, 0x4d, 0x35, 0x88, 0xef, 0xaf, 0x21, 0x6e, 0xe7, 0x03, 0xfb, 0x7b, 0xe5, 0x53, 0xb5, + 0x74, 0x12, 0x9c, 0xc5, 0x2b, 0x7f, 0x3c, 0x00, 0x27, 0x93, 0x59, 0x36, 0xa3, 0xa8, 0x91, 0x7a, + 0x29, 0x6a, 0xd0, 0x13, 0x91, 0xcf, 0xc6, 0xab, 0xf8, 0x82, 0xdd, 0x90, 0xf2, 0xe9, 0xcc, 0xc1, + 0x98, 0x88, 0x23, 0xfe, 0xa4, 0x28, 0xeb, 0x82, 0xdd, 0xb0, 0x1e, 0x9f, 0xc6, 0x49, 0x7a, 0x74, + 0x19, 0xc6, 0x95, 0x1d, 0x45, 0xd5, 0x94, 0x0d, 0x8d, 0x04, 0x20, 0x5e, 0x39, 0x77, 0xbf, 0x00, + 0x19, 0x9f, 0x4b, 0x12, 0xe0, 0x4e, 0x1e, 0xb4, 0x02, 0x13, 0xae, 0xd1, 0x09, 0xe5, 0xed, 0xce, + 0x07, 0x04, 0xd4, 0xc4, 0x7a, 0x27, 0x09, 0x4e, 0xe3, 0x43, 0x3b, 0x00, 0x0d, 0xbf, 0x20, 0x70, + 0x4a, 0xc7, 0x79, 0xac, 0xae, 0xf6, 0xfc, 0x6d, 0x05, 0xb5, 0x45, 0x18, 0x11, 0x83, 0x21, 0x07, + 0x47, 0x24, 0xa1, 0xe7, 0x60, 0xc4, 0xe6, 0x75, 0xab, 0x6f, 0xc0, 0x20, 0x37, 0xe0, 0x3e, 0xc1, + 0x36, 0x82, 0xa3, 0x93, 0x38, 0x4e, 0x2b, 0xff, 0x4e, 0x8a, 0xa6, 0x28, 0xff, 0xf3, 0x45, 0x17, + 0x62, 0x65, 0xd5, 0xa3, 0x89, 0xb2, 0x6a, 0xaa, 0x93, 0x23, 0x52, 0x55, 0xbd, 0x0f, 0x23, 0x6c, + 0x5b, 0xab, 0x46, 0xcb, 0x5b, 0x4a, 0x11, 0x22, 0x17, 0x7b, 0xf8, 0x74, 0x02, 0x8c, 0x48, 0xaa, + 0x1d, 0xe7, 0x36, 0x45, 0x27, 0x71, 0x5c, 0x9e, 0xfc, 0xa9, 0x04, 0x53, 0x8b, 0xf5, 0xcb, 0xb6, + 0xe9, 0x5a, 0xbe, 0x7a, 0x57, 0x2d, 0xcf, 0x57, 0xff, 0x03, 0x03, 0xb6, 0xab, 0xf9, 0x76, 0x3d, + 0xe2, 0xdb, 0x85, 0x5d, 0x8d, 0xd9, 0x35, 0x91, 0xe0, 0xf2, 0x8c, 0x62, 0x0c, 0xe8, 0x4d, 0x38, + 0x6e, 0x2b, 0x46, 0x8b, 0xf8, 0x49, 0xf8, 0xe9, 0x2e, 0xad, 0x59, 0x5a, 0xc0, 0x8c, 0x3d, 0x52, + 0x0a, 0x72, 0x34, 0x2c, 0x50, 0xe5, 0xef, 0x4b, 0x30, 0x76, 0x65, 0x6d, 0xad, 0xb6, 0x64, 0xf0, + 0xaf, 0xb8, 0xa6, 0xd0, 0x2d, 0x56, 0x27, 0x58, 0x0a, 0xdd, 0x4a, 0xd6, 0x09, 0x6c, 0x0e, 0xf3, + 0x19, 0xb4, 0x05, 0x83, 0x2c, 0x7a, 0x10, 0xa3, 0xd9, 0x63, 0x89, 0x2f, 0xc4, 0x55, 0x3d, 0x90, + 0xb0, 0xfe, 0x14, 0x03, 0xd8, 0x87, 0x97, 0xdf, 0x83, 0xc9, 0x88, 0x7a, 0xcc, 0x5f, 0xfc, 0x12, + 0x07, 0x35, 0xa0, 0xc0, 0x34, 0xf1, 0xaf, 0x68, 0xba, 0xbd, 0x69, 0x48, 0x98, 0x1c, 0xd6, 0x51, + 0xec, 0x97, 0x83, 0x3d, 0x6c, 0xf9, 0xcf, 0x39, 0x38, 0x75, 0xc5, 0xb4, 0xd5, 0x77, 0x4d, 0x83, + 0x2a, 0x5a, 0xcd, 0x6c, 0xce, 0xb9, 0xd4, 0x74, 0x1a, 0x8a, 0x46, 0xec, 0x3e, 0x1c, 0xa2, 0xb4, + 0xd8, 0x21, 0xea, 0xe5, 0x6e, 0x2d, 0x4c, 0xd7, 0x3b, 0xf3, 0x44, 0x45, 0x13, 0x27, 0xaa, 0xe5, + 0x23, 0x92, 0x77, 0xf0, 0xf1, 0xea, 0x6f, 0x12, 0x3c, 0x90, 0xc1, 0xd9, 0x87, 0x3a, 0x7c, 0x3b, + 0x5e, 0x87, 0x2f, 0x1e, 0x8d, 0xc9, 0x19, 0x45, 0xf9, 0x3f, 0x72, 0x99, 0xa6, 0xf2, 0x32, 0xf0, + 0x6d, 0x28, 0xf2, 0x5f, 0x98, 0x6c, 0x0a, 0x53, 0xe7, 0xbb, 0xd4, 0xa7, 0xee, 0x6e, 0xf8, 0x57, + 0xa0, 0x98, 0x6c, 0x12, 0x9b, 0x18, 0x0d, 0x12, 0x29, 0x91, 0x04, 0x38, 0x0e, 0xc4, 0xa0, 0xb3, + 0x30, 0xcc, 0x4b, 0x9e, 0x58, 0x16, 0x1d, 0xdb, 0xdf, 0x2b, 0x0f, 0xaf, 0x84, 0xc3, 0x38, 0x4a, + 0x83, 0xce, 0xc3, 0xb0, 0xae, 0xec, 0x26, 0x72, 0x68, 0x70, 0x9b, 0xb1, 0x12, 0x4e, 0xe1, 0x28, + 0x1d, 0x7a, 0x1f, 0x46, 0x1b, 0x96, 0x1b, 0xb9, 0x85, 0x17, 0x35, 0x60, 0xb7, 0x26, 0xa6, 0x5d, + 0xe8, 0x57, 0x11, 0x3b, 0x5b, 0xce, 0xd7, 0xd6, 0x23, 0x63, 0x38, 0x21, 0x4e, 0xfe, 0x45, 0x1e, + 0x1e, 0x3a, 0x70, 0x8b, 0xa2, 0xc5, 0x03, 0x6a, 0x93, 0xa9, 0x2e, 0xea, 0x92, 0x06, 0x8c, 0xb0, + 0x33, 0x26, 0x77, 0x37, 0x3f, 0xc0, 0xe6, 0xba, 0x3e, 0xc0, 0xf2, 0x54, 0xb3, 0x1c, 0x05, 0xc1, + 0x71, 0x4c, 0x56, 0xce, 0x88, 0x2b, 0xb1, 0xac, 0x72, 0x66, 0x3e, 0x3e, 0x8d, 0x93, 0xf4, 0x0c, + 0x42, 0xdc, 0x58, 0x25, 0x8a, 0x99, 0x00, 0x62, 0x21, 0x3e, 0x8d, 0x93, 0xf4, 0x48, 0x87, 0xb2, + 0x40, 0x8d, 0x7b, 0x3f, 0xf2, 0xb0, 0xe2, 0x15, 0x35, 0x8f, 0xec, 0xef, 0x95, 0xcb, 0xf3, 0x07, + 0x93, 0xe2, 0x3b, 0x61, 0xc9, 0x2b, 0x30, 0x72, 0xc5, 0x74, 0x68, 0xcd, 0xb4, 0x29, 0xcf, 0x62, + 0xe8, 0x21, 0xc8, 0xeb, 0xaa, 0x21, 0x0e, 0x4d, 0xc3, 0x42, 0xed, 0x3c, 0xdb, 0xbb, 0x6c, 0x9c, + 0x4f, 0x2b, 0xbb, 0x62, 0x5b, 0x87, 0xd3, 0xca, 0x2e, 0x66, 0xe3, 0xf2, 0x65, 0x18, 0x14, 0xd9, + 0x31, 0x0a, 0x94, 0x3f, 0x18, 0x28, 0x9f, 0x02, 0xf4, 0xe3, 0x1c, 0x0c, 0x8a, 0x64, 0xd2, 0x87, + 0xb4, 0xf0, 0x7a, 0x2c, 0x2d, 0x5c, 0xe8, 0x2d, 0xf1, 0x66, 0xa6, 0x81, 0x66, 0x22, 0x0d, 0x3c, + 0xdf, 0x23, 0xfe, 0xc1, 0x61, 0xff, 0x13, 0x09, 0x46, 0xe3, 0x25, 0x00, 0x0b, 0x2c, 0xec, 0x53, + 0x52, 0x1b, 0x64, 0x35, 0xbc, 0xa3, 0x08, 0x02, 0x4b, 0x3d, 0x9c, 0xc2, 0x51, 0x3a, 0xd4, 0x0a, + 0xd8, 0xd8, 0xb6, 0x10, 0x4e, 0xc9, 0x76, 0xb9, 0x4b, 0x55, 0xad, 0xe2, 0xbd, 0x46, 0x56, 0x96, + 0x0c, 0x7a, 0xd5, 0xae, 0x53, 0x5b, 0x35, 0x5a, 0x1d, 0x82, 0xf8, 0x1e, 0x8b, 0x22, 0xcb, 0x37, + 0x25, 0x18, 0x16, 0x2a, 0xf7, 0x21, 0x33, 0xbd, 0x16, 0xcf, 0x4c, 0x4f, 0xf7, 0x58, 0x5e, 0xa5, + 0x67, 0xa2, 0xcf, 0x42, 0x53, 0x58, 0x41, 0xc5, 0xea, 0xbd, 0x2d, 0xd3, 0xa1, 0xc9, 0x7a, 0x8f, + 0x7d, 0x6b, 0x98, 0xcf, 0xa0, 0x6f, 0x49, 0x70, 0x52, 0x4d, 0x94, 0x60, 0xc2, 0xd7, 0x2f, 0xf6, + 0xa6, 0x5a, 0x00, 0x13, 0x3e, 0xba, 0x26, 0x67, 0x70, 0x87, 0x48, 0xd9, 0x85, 0x0e, 0x2a, 0xa4, + 0xc0, 0xc0, 0x16, 0xa5, 0x56, 0x8f, 0x39, 0x33, 0xad, 0xb8, 0xac, 0x16, 0xb9, 0xf9, 0x6b, 0x6b, + 0x35, 0xcc, 0xa1, 0xe5, 0x1f, 0xe5, 0x02, 0x87, 0xd5, 0xbd, 0x8f, 0x24, 0x28, 0x7f, 0xa5, 0xa3, + 0x28, 0x7f, 0x87, 0xd3, 0x4a, 0x5f, 0xf4, 0x7f, 0x90, 0xa7, 0x5a, 0xaf, 0x77, 0x84, 0x42, 0xc2, + 0xda, 0x72, 0x3d, 0x0c, 0x58, 0x6b, 0xcb, 0x75, 0xcc, 0x20, 0xd1, 0x5b, 0x50, 0x60, 0x87, 0x0b, + 0xf6, 0x8d, 0xe7, 0x7b, 0x8f, 0x21, 0xcc, 0x5f, 0xe1, 0x0e, 0x63, 0xbf, 0x1c, 0xec, 0xe1, 0xca, + 0xef, 0xc1, 0x48, 0x2c, 0x10, 0xa0, 0x1b, 0x70, 0x42, 0x33, 0x95, 0x66, 0x55, 0xd1, 0x14, 0xa3, + 0x41, 0xec, 0x64, 0x68, 0x4c, 0xbf, 0x5e, 0x5a, 0x8e, 0x70, 0x88, 0x80, 0x12, 0x3c, 0x7b, 0x47, + 0xe7, 0x70, 0x0c, 0x5b, 0x56, 0x00, 0x42, 0xeb, 0x51, 0x19, 0x0a, 0x6c, 0x0b, 0x7b, 0x07, 0x85, + 0xa1, 0xea, 0x10, 0xd3, 0x95, 0xed, 0x6c, 0x07, 0x7b, 0xe3, 0xe8, 0x1c, 0x80, 0x43, 0x1a, 0x36, + 0xa1, 0x3c, 0xee, 0x78, 0x17, 0xf2, 0x41, 0x04, 0xae, 0x07, 0x33, 0x38, 0x42, 0x25, 0xff, 0x41, + 0x82, 0x91, 0x55, 0x42, 0xdf, 0x31, 0xed, 0xed, 0x9a, 0xa9, 0xa9, 0x8d, 0x76, 0x1f, 0xe2, 0xfe, + 0x46, 0x2c, 0xee, 0xbf, 0xd4, 0xe5, 0x9a, 0xc5, 0xb4, 0xcd, 0x8a, 0xfe, 0xf2, 0x5f, 0x25, 0x28, + 0xc5, 0x28, 0xa3, 0x61, 0x82, 0x40, 0xc1, 0x32, 0x6d, 0xea, 0x1f, 0xb9, 0x0e, 0xa5, 0x01, 0x0b, + 0xa9, 0x91, 0x43, 0x17, 0x83, 0xc5, 0x1e, 0x3a, 0xb3, 0x73, 0xd3, 0x36, 0x75, 0xb1, 0xef, 0x0f, + 0x27, 0x85, 0x10, 0x3b, 0xb4, 0x73, 0xd1, 0x36, 0x75, 0xcc, 0xb1, 0xe5, 0xdf, 0x4b, 0x30, 0x1e, + 0xa3, 0xec, 0x43, 0x48, 0x57, 0xe2, 0x21, 0xfd, 0xf9, 0xc3, 0x18, 0x96, 0x11, 0xd8, 0xbf, 0x4e, + 0x9a, 0xc5, 0x1c, 0x80, 0x36, 0x61, 0xd8, 0x32, 0x9b, 0xf5, 0x23, 0x78, 0x4f, 0xe6, 0x47, 0x83, + 0x5a, 0x88, 0x85, 0xa3, 0xc0, 0x68, 0x17, 0xc6, 0x0d, 0x45, 0x27, 0x8e, 0xa5, 0x34, 0x48, 0xfd, + 0x08, 0xae, 0xa9, 0xef, 0xdb, 0xdf, 0x2b, 0x8f, 0xaf, 0x26, 0x11, 0x71, 0xa7, 0x10, 0xf9, 0xa7, + 0x1d, 0x76, 0x9b, 0x36, 0x45, 0xaf, 0x40, 0x91, 0x37, 0x0e, 0x35, 0x4c, 0x4d, 0xa4, 0xb6, 0xf3, + 0x6c, 0x69, 0x6a, 0x62, 0xec, 0xf6, 0x5e, 0xf9, 0x3f, 0x0e, 0x7c, 0x65, 0xf3, 0x09, 0x71, 0x00, + 0x83, 0x56, 0x61, 0xc0, 0x3a, 0x4c, 0x99, 0xc1, 0x13, 0x0b, 0xaf, 0x2d, 0x38, 0x8e, 0xfc, 0xf7, + 0xa4, 0xe2, 0x3c, 0xbd, 0xdc, 0x38, 0xb2, 0x05, 0x0b, 0xca, 0x9a, 0xcc, 0x45, 0xb3, 0x61, 0x50, + 0x64, 0x59, 0xb1, 0x2f, 0x2f, 0x1f, 0x66, 0x5f, 0x46, 0x33, 0x43, 0x70, 0xa7, 0xe3, 0x0f, 0xfa, + 0x82, 0xe4, 0x3f, 0x49, 0x30, 0xce, 0x15, 0x6a, 0xb8, 0xb6, 0x4a, 0xdb, 0x7d, 0x8b, 0xa0, 0x9b, + 0xb1, 0x08, 0xba, 0xd0, 0xa5, 0xa1, 0x1d, 0x1a, 0x67, 0x46, 0xd1, 0x2f, 0x24, 0xb8, 0xaf, 0x83, + 0xba, 0x0f, 0x11, 0x86, 0xc4, 0x23, 0xcc, 0x4b, 0x87, 0x35, 0x30, 0x23, 0xca, 0xdc, 0x84, 0x14, + 0xf3, 0xf8, 0xc6, 0x3d, 0x07, 0x60, 0xd9, 0xea, 0x8e, 0xaa, 0x91, 0x96, 0x68, 0xed, 0x28, 0x86, + 0x4b, 0x52, 0x0b, 0x66, 0x70, 0x84, 0x0a, 0x7d, 0x03, 0xa6, 0x9a, 0x64, 0x53, 0x71, 0x35, 0x3a, + 0xd7, 0x6c, 0xce, 0x2b, 0x96, 0xb2, 0xa1, 0x6a, 0x2a, 0x55, 0xc5, 0x85, 0xe7, 0x50, 0xf5, 0x92, + 0xd7, 0x72, 0x91, 0x46, 0x71, 0x7b, 0xaf, 0xfc, 0xd8, 0xc1, 0xef, 0xe4, 0x3e, 0x71, 0x1b, 0x67, + 0x08, 0x41, 0xdf, 0x94, 0xa0, 0x64, 0x93, 0xb7, 0x5d, 0x76, 0xae, 0x5d, 0xb0, 0x4d, 0x2b, 0xa6, + 0x41, 0x9e, 0x6b, 0x70, 0x79, 0x7f, 0xaf, 0x5c, 0xc2, 0x19, 0x34, 0xdd, 0xe8, 0x90, 0x29, 0x08, + 0x51, 0x98, 0x50, 0x34, 0xcd, 0x7c, 0x87, 0xc4, 0x3d, 0x30, 0xc0, 0xe5, 0x57, 0xf7, 0xf7, 0xca, + 0x13, 0x73, 0x9d, 0xd3, 0xdd, 0x88, 0x4e, 0x83, 0x47, 0xb3, 0x30, 0xb8, 0x63, 0x6a, 0xae, 0x4e, + 0x9c, 0x52, 0x81, 0x4b, 0x62, 0x11, 0x77, 0xf0, 0x9a, 0x37, 0x74, 0x7b, 0xaf, 0x7c, 0x7c, 0xb1, + 0xce, 0x6f, 0xa2, 0x7d, 0x2a, 0x76, 0x46, 0x63, 0x35, 0x93, 0xf8, 0xe4, 0xf9, 0x33, 0x58, 0x31, + 0x8c, 0x31, 0x57, 0xc2, 0x29, 0x1c, 0xa5, 0x43, 0x3a, 0x0c, 0x6d, 0x89, 0x73, 0xbb, 0x53, 0x1a, + 0xec, 0x29, 0xfb, 0xc5, 0xce, 0xfd, 0xd5, 0x71, 0x21, 0x72, 0xc8, 0x1f, 0x76, 0x70, 0x28, 0x01, + 0x3d, 0x0e, 0x83, 0xfc, 0xc7, 0xd2, 0x02, 0x7f, 0x3c, 0x2b, 0x86, 0x91, 0xe8, 0x8a, 0x37, 0x8c, + 0xfd, 0x79, 0x9f, 0x74, 0xa9, 0x36, 0xcf, 0xdf, 0xba, 0x12, 0xa4, 0x4b, 0xb5, 0x79, 0xec, 0xcf, + 0x23, 0x0b, 0x06, 0x1d, 0xb2, 0xac, 0x1a, 0xee, 0x6e, 0x09, 0xf8, 0x97, 0x7b, 0xa9, 0xdb, 0xdb, + 0xb9, 0x4b, 0x9c, 0x3b, 0xf1, 0x32, 0x10, 0x4a, 0x14, 0xf3, 0xd8, 0x17, 0x83, 0x76, 0x61, 0xc8, + 0x76, 0x8d, 0x39, 0x67, 0xdd, 0x21, 0x76, 0x69, 0x98, 0xcb, 0xec, 0x36, 0x38, 0x63, 0x9f, 0x3f, + 0x29, 0x35, 0xf0, 0x60, 0x40, 0x81, 0x43, 0x61, 0xe8, 0x63, 0x09, 0x90, 0xe3, 0x5a, 0x96, 0x46, + 0x74, 0x62, 0x50, 0x45, 0xe3, 0x8f, 0x13, 0x4e, 0xe9, 0x04, 0xd7, 0xa1, 0xd6, 0xf5, 0xad, 0x64, + 0x12, 0x28, 0xa9, 0x4c, 0xf0, 0xf2, 0xd7, 0x49, 0x8a, 0x53, 0xf4, 0x60, 0x4b, 0xb1, 0xe9, 0xf0, + 0xbf, 0x4b, 0x23, 0x3d, 0x2d, 0x45, 0xfa, 0x23, 0x4d, 0xb8, 0x14, 0x62, 0x1e, 0xfb, 0x62, 0xd0, + 0x35, 0x98, 0xb2, 0x89, 0xd2, 0xbc, 0x6a, 0x68, 0x6d, 0x6c, 0x9a, 0x74, 0x51, 0xd5, 0x88, 0xd3, + 0x76, 0x28, 0xd1, 0x4b, 0xa3, 0x7c, 0xdb, 0x04, 0xbd, 0x61, 0x38, 0x95, 0x0a, 0x67, 0x70, 0xf3, + 0xc6, 0x2c, 0x71, 0x9b, 0xd6, 0x9f, 0x0e, 0xd0, 0xc3, 0x35, 0x66, 0x85, 0xaa, 0xde, 0xb3, 0xc6, + 0xac, 0x88, 0x88, 0x83, 0xaf, 0x90, 0xbe, 0xce, 0xc1, 0x44, 0x48, 0x7c, 0xd7, 0x8d, 0x59, 0x29, + 0x2c, 0x7d, 0x68, 0xcc, 0x4a, 0xef, 0x6c, 0xca, 0xdf, 0xeb, 0xce, 0xa6, 0x7b, 0xd0, 0x10, 0xc6, + 0x9b, 0xa5, 0x42, 0x27, 0xfe, 0xeb, 0x37, 0x4b, 0x85, 0xba, 0x66, 0x94, 0x33, 0x3f, 0xcf, 0x45, + 0x0d, 0xfa, 0x37, 0xea, 0xc8, 0x49, 0x69, 0x90, 0x19, 0xe8, 0xae, 0x41, 0x46, 0xfe, 0x22, 0x0f, + 0x27, 0x93, 0x5f, 0x6c, 0xac, 0x31, 0x43, 0xba, 0x63, 0x63, 0x46, 0x0d, 0x26, 0x37, 0x5d, 0x4d, + 0x6b, 0x73, 0x87, 0x44, 0xde, 0x22, 0xbc, 0x5b, 0xfb, 0x07, 0x05, 0xe7, 0xe4, 0x62, 0x0a, 0x0d, + 0x4e, 0xe5, 0xcc, 0x68, 0x32, 0xc9, 0xf7, 0xd4, 0x64, 0xd2, 0xd1, 0xe3, 0x30, 0x70, 0xf7, 0x3d, + 0x0e, 0xe9, 0x0d, 0x23, 0x85, 0x1e, 0x1a, 0x46, 0x8e, 0xa2, 0xc3, 0x23, 0x25, 0xf0, 0xdd, 0xa9, + 0xc3, 0x43, 0x7e, 0x10, 0xa6, 0x05, 0x1b, 0xfb, 0x3d, 0x6f, 0x1a, 0xd4, 0x36, 0x35, 0x8d, 0xd8, + 0x0b, 0xae, 0xae, 0xb7, 0xe5, 0x8b, 0x30, 0x1a, 0x6f, 0x33, 0xf2, 0x56, 0xde, 0xeb, 0x7c, 0x12, + 0x6f, 0x29, 0x91, 0x95, 0xf7, 0xc6, 0x71, 0x40, 0x21, 0x7f, 0x29, 0xc1, 0xa9, 0x8c, 0x66, 0x0b, + 0xa4, 0xc1, 0xa8, 0xae, 0xec, 0x46, 0x5a, 0x60, 0xee, 0x98, 0x0f, 0xb3, 0x8e, 0xdc, 0xfc, 0x71, + 0x70, 0x25, 0x86, 0x85, 0x13, 0xd8, 0xe8, 0x3a, 0x14, 0x75, 0x65, 0xb7, 0xee, 0xda, 0x2d, 0xd2, + 0xf3, 0xd1, 0x9e, 0x7f, 0xc2, 0x2b, 0x02, 0x05, 0x07, 0x78, 0xf2, 0xa7, 0x12, 0x94, 0xb2, 0xca, + 0x30, 0x74, 0x3e, 0xd6, 0x16, 0xf2, 0x70, 0xa2, 0x2d, 0x64, 0xbc, 0x83, 0xaf, 0x4f, 0x4d, 0x21, + 0x9f, 0x49, 0x30, 0x95, 0x5e, 0xae, 0xa2, 0xa7, 0x62, 0x1a, 0x97, 0x13, 0x1a, 0x8f, 0x25, 0xb8, + 0x84, 0xbe, 0x5b, 0x30, 0x2a, 0x8a, 0x5a, 0x01, 0x23, 0xbc, 0xfc, 0xc4, 0xc1, 0xc1, 0x4c, 0x80, + 0xf9, 0xe5, 0x19, 0x5f, 0xc9, 0xf8, 0x18, 0x4e, 0xe0, 0xca, 0x3f, 0xcc, 0x41, 0x81, 0xbf, 0x92, + 0xf6, 0xa1, 0x96, 0xba, 0x1e, 0xab, 0xa5, 0xba, 0xfd, 0xa7, 0x10, 0xae, 0x65, 0x66, 0x19, 0xb5, + 0x91, 0x28, 0xa3, 0x2e, 0xf4, 0x84, 0x7e, 0x70, 0x05, 0xf5, 0x2c, 0x0c, 0x05, 0x4a, 0x74, 0x17, + 0xb4, 0xe5, 0x4f, 0x72, 0x30, 0x1c, 0x11, 0xd1, 0x65, 0xc8, 0xdf, 0x89, 0x25, 0xcd, 0x5e, 0xfe, + 0xff, 0x2c, 0x22, 0xbb, 0xe2, 0xa7, 0x4d, 0xaf, 0x93, 0x38, 0x6c, 0x77, 0xe8, 0xcc, 0xa6, 0x17, + 0x61, 0xd4, 0xfb, 0x37, 0xbe, 0xe0, 0x6a, 0x2d, 0xcf, 0x77, 0x71, 0xd0, 0x9f, 0xbe, 0x16, 0x9b, + 0xc5, 0x09, 0xea, 0xe9, 0xe7, 0x60, 0x24, 0x26, 0xac, 0xab, 0xc6, 0xdf, 0x5f, 0x4a, 0x30, 0x99, + 0xd6, 0xa0, 0x81, 0x4e, 0xc3, 0xc0, 0xb6, 0x2a, 0x5e, 0x92, 0x22, 0xaf, 0x6f, 0xff, 0xab, 0x1a, + 0x4d, 0xcc, 0x67, 0x82, 0xbe, 0xed, 0x5c, 0x66, 0xdf, 0xf6, 0x39, 0x00, 0xc5, 0x52, 0xc5, 0xbf, + 0x46, 0x0a, 0xab, 0x82, 0xcd, 0x1b, 0xfe, 0xd3, 0x24, 0x8e, 0x50, 0xf1, 0x07, 0xd7, 0x50, 0x1f, + 0x51, 0x20, 0x86, 0xef, 0xa0, 0x11, 0x55, 0xa3, 0x74, 0xf2, 0xaf, 0x24, 0x78, 0xf8, 0x8e, 0x47, + 0x3a, 0x54, 0x8d, 0x85, 0x89, 0x4a, 0x22, 0x4c, 0xcc, 0x64, 0x03, 0xf4, 0xb1, 0xf5, 0xed, 0xbb, + 0x39, 0x40, 0x6b, 0x5b, 0xaa, 0xdd, 0xac, 0x29, 0x36, 0x6d, 0x63, 0x61, 0x60, 0x1f, 0x02, 0xc7, + 0x79, 0x18, 0x6e, 0x12, 0xa7, 0x61, 0xab, 0xdc, 0x59, 0x62, 0x59, 0x03, 0xcf, 0x2f, 0x84, 0x53, + 0x38, 0x4a, 0x87, 0x5a, 0x50, 0xdc, 0xf1, 0xd6, 0xce, 0x7f, 0xb8, 0xeb, 0xb6, 0x16, 0x0e, 0x77, + 0x42, 0xf8, 0x9d, 0x88, 0x01, 0x07, 0x07, 0xe0, 0xf2, 0x47, 0x12, 0x4c, 0x75, 0x3a, 0x66, 0x81, + 0xa9, 0x7e, 0xef, 0x9d, 0xf3, 0x20, 0x0c, 0x70, 0x74, 0xe6, 0x95, 0x13, 0xde, 0x85, 0x39, 0x93, + 0x8c, 0xf9, 0xa8, 0xfc, 0x95, 0x04, 0xd3, 0xe9, 0xaa, 0xf5, 0xe1, 0x24, 0x72, 0x23, 0x7e, 0x12, + 0xe9, 0xf6, 0xd6, 0x21, 0x5d, 0xef, 0x8c, 0x53, 0xc9, 0x5e, 0xea, 0x1a, 0xf4, 0xc1, 0xc8, 0xcd, + 0xb8, 0x91, 0x73, 0x87, 0x36, 0x32, 0xdd, 0xc0, 0xea, 0xe3, 0x37, 0x6f, 0xcd, 0x1c, 0xfb, 0xfc, + 0xd6, 0xcc, 0xb1, 0x3f, 0xde, 0x9a, 0x39, 0xf6, 0xc1, 0xfe, 0x8c, 0x74, 0x73, 0x7f, 0x46, 0xfa, + 0x7c, 0x7f, 0x46, 0xfa, 0xcb, 0xfe, 0x8c, 0xf4, 0xe1, 0x97, 0x33, 0xc7, 0xae, 0x0f, 0x0a, 0xcc, + 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x36, 0x92, 0x08, 0x32, 0xce, 0x3f, 0x00, 0x00, } diff --git a/pkg/apis/extensions/v1beta1/generated.proto b/pkg/apis/extensions/v1beta1/generated.proto index 2e1541addd3c1..2aeb4929d3c00 100644 --- a/pkg/apis/extensions/v1beta1/generated.proto +++ b/pkg/apis/extensions/v1beta1/generated.proto @@ -25,8 +25,8 @@ import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; @@ -450,7 +450,7 @@ message IngressBackend { optional string serviceName = 1; // Specifies the port of the referenced service. - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString servicePort = 2; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString servicePort = 2; } // IngressList is a collection of Ingress. @@ -623,7 +623,7 @@ message NetworkPolicyPort { // If present, only traffic on the specified protocol AND port // will be matched. // +optional - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 2; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString port = 2; } message NetworkPolicySpec { @@ -869,7 +869,7 @@ message RollingUpdateDeployment { // that the total number of pods available at all times during the update is at // least 70% of desired pods. // +optional - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString maxUnavailable = 1; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxUnavailable = 1; // The maximum number of pods that can be scheduled above the desired number of // pods. @@ -883,7 +883,7 @@ message RollingUpdateDeployment { // new RC can be scaled up further, ensuring that total number of pods running // at any time during the update is atmost 130% of desired pods. // +optional - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString maxSurge = 2; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxSurge = 2; } // Run A sUser Strategy Options defines the strategy type and any options used to create the strategy. diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index ea67af3ab3dbd..e66a5b559fc3a 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -28,8 +28,8 @@ import ( pkg3_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" + pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" pkg4_v1 "k8s.io/kubernetes/pkg/api/v1" - pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -68,8 +68,8 @@ func init() { var v0 pkg3_resource.Quantity var v1 pkg1_v1.TypeMeta var v2 pkg2_types.UID - var v3 pkg4_v1.PodTemplateSpec - var v4 pkg5_intstr.IntOrString + var v3 pkg5_intstr.IntOrString + var v4 pkg4_v1.PodTemplateSpec var v5 time.Time _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index 8a1072b0ee91a..2fa536391c3b1 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) // describes the attributes of a scale subresource diff --git a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go index cbd5cee387815..2df189a5f1d18 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go @@ -24,11 +24,11 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" + intstr "k8s.io/apimachinery/pkg/util/intstr" api "k8s.io/kubernetes/pkg/api" api_v1 "k8s.io/kubernetes/pkg/api/v1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" extensions "k8s.io/kubernetes/pkg/apis/extensions" - intstr "k8s.io/kubernetes/pkg/util/intstr" unsafe "unsafe" ) @@ -1440,14 +1440,14 @@ func Convert_extensions_RollbackConfig_To_v1beta1_RollbackConfig(in *extensions. } func autoConvert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in *RollingUpdateDeployment, out *extensions.RollingUpdateDeployment, s conversion.Scope) error { - // WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/util/intstr.IntOrString vs k8s.io/kubernetes/pkg/util/intstr.IntOrString) - // WARNING: in.MaxSurge requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/util/intstr.IntOrString vs k8s.io/kubernetes/pkg/util/intstr.IntOrString) + // WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (*k8s.io/apimachinery/pkg/util/intstr.IntOrString vs k8s.io/apimachinery/pkg/util/intstr.IntOrString) + // WARNING: in.MaxSurge requires manual conversion: inconvertible types (*k8s.io/apimachinery/pkg/util/intstr.IntOrString vs k8s.io/apimachinery/pkg/util/intstr.IntOrString) return nil } func autoConvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *extensions.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error { - // WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (k8s.io/kubernetes/pkg/util/intstr.IntOrString vs *k8s.io/kubernetes/pkg/util/intstr.IntOrString) - // WARNING: in.MaxSurge requires manual conversion: inconvertible types (k8s.io/kubernetes/pkg/util/intstr.IntOrString vs *k8s.io/kubernetes/pkg/util/intstr.IntOrString) + // WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (k8s.io/apimachinery/pkg/util/intstr.IntOrString vs *k8s.io/apimachinery/pkg/util/intstr.IntOrString) + // WARNING: in.MaxSurge requires manual conversion: inconvertible types (k8s.io/apimachinery/pkg/util/intstr.IntOrString vs *k8s.io/apimachinery/pkg/util/intstr.IntOrString) return nil } diff --git a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go index 4f8b281550c64..6a544b23df92e 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go @@ -24,8 +24,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" + intstr "k8s.io/apimachinery/pkg/util/intstr" api_v1 "k8s.io/kubernetes/pkg/api/v1" - intstr "k8s.io/kubernetes/pkg/util/intstr" reflect "reflect" ) diff --git a/pkg/apis/extensions/validation/BUILD b/pkg/apis/extensions/validation/BUILD index 18904c80f5ef4..3dee3649dd08c 100644 --- a/pkg/apis/extensions/validation/BUILD +++ b/pkg/apis/extensions/validation/BUILD @@ -19,10 +19,10 @@ go_library( "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", @@ -40,8 +40,8 @@ go_test( "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/extensions/validation/validation.go b/pkg/apis/extensions/validation/validation.go index 0f9d03dca2462..165a55a8db000 100644 --- a/pkg/apis/extensions/validation/validation.go +++ b/pkg/apis/extensions/validation/validation.go @@ -27,6 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" - "k8s.io/kubernetes/pkg/util/intstr" ) func ValidateThirdPartyResourceUpdate(update, old *extensions.ThirdPartyResource) field.ErrorList { diff --git a/pkg/apis/extensions/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go index 782487fe058fa..2584ec117400b 100644 --- a/pkg/apis/extensions/validation/validation_test.go +++ b/pkg/apis/extensions/validation/validation_test.go @@ -22,13 +22,13 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestValidateDaemonSetStatusUpdate(t *testing.T) { diff --git a/pkg/apis/extensions/zz_generated.deepcopy.go b/pkg/apis/extensions/zz_generated.deepcopy.go index d01391d9f3eba..d1920f9a42056 100644 --- a/pkg/apis/extensions/zz_generated.deepcopy.go +++ b/pkg/apis/extensions/zz_generated.deepcopy.go @@ -24,8 +24,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" + intstr "k8s.io/apimachinery/pkg/util/intstr" api "k8s.io/kubernetes/pkg/api" - intstr "k8s.io/kubernetes/pkg/util/intstr" reflect "reflect" ) diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.pb.go b/pkg/apis/imagepolicy/v1alpha1/generated.pb.go index 328437d9bfad4..572d1136b02ed 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.pb.go +++ b/pkg/apis/imagepolicy/v1alpha1/generated.pb.go @@ -1019,43 +1019,42 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 593 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xbf, 0x6f, 0x13, 0x31, - 0x14, 0xc7, 0x73, 0x49, 0x7f, 0xc5, 0x01, 0xda, 0x1a, 0x86, 0x28, 0xc3, 0xb5, 0x0a, 0x12, 0x2a, - 0x08, 0x6c, 0x52, 0x21, 0x54, 0x31, 0x50, 0x7a, 0x88, 0xa1, 0x03, 0x20, 0xcc, 0xc6, 0x84, 0x73, - 0x7d, 0xbd, 0xb8, 0xc9, 0xd9, 0xa7, 0xb3, 0x2f, 0x55, 0x06, 0x24, 0x46, 0x06, 0x06, 0xfe, 0x23, - 0xd6, 0x8e, 0x1d, 0x99, 0x2a, 0x1a, 0xfe, 0x11, 0x74, 0xbe, 0xbb, 0xde, 0x91, 0xb4, 0x20, 0xd4, - 0xcd, 0xcf, 0xcf, 0xef, 0xf3, 0xfd, 0xbe, 0xf7, 0x8c, 0x76, 0x87, 0x3b, 0x9a, 0x08, 0x45, 0x87, - 0x49, 0x1f, 0x62, 0x09, 0x06, 0x34, 0x8d, 0x86, 0x01, 0xe5, 0x91, 0xd0, 0x54, 0x84, 0x3c, 0x80, - 0x48, 0x8d, 0x84, 0x3f, 0xa1, 0xe3, 0x1e, 0x1f, 0x45, 0x03, 0xde, 0xa3, 0x01, 0x48, 0x88, 0xb9, - 0x81, 0x03, 0x12, 0xc5, 0xca, 0x28, 0x4c, 0x33, 0x00, 0x29, 0x01, 0x24, 0x1a, 0x06, 0x24, 0x05, - 0x90, 0x0a, 0x80, 0x14, 0x80, 0xce, 0xa3, 0x40, 0x98, 0x41, 0xd2, 0x27, 0xbe, 0x0a, 0x69, 0xa0, - 0x02, 0x45, 0x2d, 0xa7, 0x9f, 0x1c, 0xda, 0xc8, 0x06, 0xf6, 0x94, 0xf1, 0x3b, 0x4f, 0x72, 0x83, - 0x3c, 0x12, 0x21, 0xf7, 0x07, 0x42, 0x42, 0x3c, 0x29, 0x2c, 0xd2, 0x18, 0xb4, 0x4a, 0x62, 0x1f, - 0x66, 0x5d, 0xfd, 0xb5, 0x4a, 0xd3, 0x10, 0x0c, 0xa7, 0xe3, 0xb9, 0x5e, 0x3a, 0xf4, 0xaa, 0xaa, - 0x38, 0x91, 0x46, 0x84, 0xf3, 0x32, 0x4f, 0xff, 0x55, 0xa0, 0xfd, 0x01, 0x84, 0x7c, 0xae, 0xee, - 0xe1, 0x95, 0x53, 0xbf, 0xcc, 0x56, 0xef, 0xf2, 0xd7, 0x89, 0x11, 0x23, 0x2a, 0xa4, 0xd1, 0x26, - 0x9e, 0x2d, 0xe9, 0x7e, 0xaf, 0xa3, 0xd6, 0x7e, 0x3a, 0x7d, 0x06, 0x63, 0x01, 0xc7, 0xf8, 0x23, - 0x5a, 0x49, 0x9b, 0x3e, 0xe0, 0x86, 0xb7, 0x9d, 0x4d, 0x67, 0xab, 0xb5, 0xfd, 0x98, 0xe4, 0x8b, - 0xab, 0x7a, 0x2f, 0x57, 0x97, 0xbe, 0x26, 0xe3, 0x1e, 0x79, 0xdb, 0x3f, 0x02, 0xdf, 0xbc, 0x06, - 0xc3, 0x3d, 0x7c, 0x72, 0xb6, 0x51, 0x9b, 0x9e, 0x6d, 0xa0, 0xf2, 0x8e, 0x5d, 0x50, 0x71, 0x1f, - 0x2d, 0xe8, 0x08, 0xfc, 0x76, 0xdd, 0xd2, 0x5f, 0x90, 0xff, 0xfc, 0x16, 0xa4, 0xe2, 0xf6, 0x7d, - 0x04, 0xbe, 0x77, 0x23, 0x57, 0x5b, 0x48, 0x23, 0x66, 0xd9, 0xf8, 0x08, 0x2d, 0x69, 0xc3, 0x4d, - 0xa2, 0xdb, 0x0d, 0xab, 0xe2, 0x5d, 0x4b, 0xc5, 0x92, 0xbc, 0x5b, 0xb9, 0xce, 0x52, 0x16, 0xb3, - 0x5c, 0xa1, 0xbb, 0x8b, 0xda, 0x95, 0xc7, 0x2f, 0x95, 0x34, 0x3c, 0x1d, 0x51, 0xea, 0x06, 0xdf, - 0x45, 0x8b, 0x96, 0x6e, 0x47, 0xd9, 0xf4, 0x6e, 0xe6, 0x88, 0xc5, 0xac, 0x20, 0xcb, 0x75, 0xbf, - 0x36, 0xd0, 0xea, 0x4c, 0x53, 0xf8, 0x13, 0x42, 0x7e, 0x41, 0xd2, 0x6d, 0x67, 0xb3, 0xb1, 0xd5, - 0xda, 0xde, 0xbf, 0x4e, 0x13, 0x7f, 0xf8, 0x2a, 0x37, 0x74, 0x71, 0xad, 0x59, 0x45, 0x10, 0x7f, - 0x71, 0x50, 0x8b, 0x4b, 0xa9, 0x0c, 0x37, 0x42, 0x49, 0xdd, 0xae, 0x5b, 0x03, 0xef, 0xae, 0xbb, - 0x2b, 0xb2, 0x57, 0x32, 0x5f, 0x49, 0x13, 0x4f, 0xbc, 0xdb, 0xb9, 0x91, 0x56, 0x25, 0xc3, 0xaa, - 0xd2, 0x98, 0xa2, 0xa6, 0xe4, 0x21, 0xe8, 0x88, 0xfb, 0x60, 0xb7, 0xd9, 0xf4, 0xd6, 0xf3, 0xa2, - 0xe6, 0x9b, 0x22, 0xc1, 0xca, 0x37, 0x9d, 0xe7, 0x68, 0x6d, 0x56, 0x06, 0xaf, 0xa1, 0xc6, 0x10, - 0x26, 0xd9, 0x16, 0x58, 0x7a, 0xc4, 0x77, 0xd0, 0xe2, 0x98, 0x8f, 0x12, 0xb0, 0xdf, 0xb0, 0xc9, - 0xb2, 0xe0, 0x59, 0x7d, 0xc7, 0xe9, 0x1e, 0xa2, 0xf5, 0xb9, 0xe5, 0xe3, 0xfb, 0x68, 0x99, 0x8f, - 0x46, 0xea, 0x18, 0x0e, 0x2c, 0x64, 0xc5, 0x5b, 0xcd, 0x3d, 0x2c, 0xef, 0x65, 0xd7, 0xac, 0xc8, - 0xe3, 0x7b, 0x68, 0x29, 0x06, 0xae, 0x95, 0xcc, 0xd0, 0xe5, 0xbf, 0x61, 0xf6, 0x96, 0xe5, 0x59, - 0xef, 0xc1, 0xc9, 0xb9, 0x5b, 0x3b, 0x3d, 0x77, 0x6b, 0x3f, 0xce, 0xdd, 0xda, 0xe7, 0xa9, 0xeb, - 0x9c, 0x4c, 0x5d, 0xe7, 0x74, 0xea, 0x3a, 0x3f, 0xa7, 0xae, 0xf3, 0xed, 0x97, 0x5b, 0xfb, 0xb0, - 0x52, 0xcc, 0xf1, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0x6f, 0x01, 0x3b, 0x7d, 0x05, 0x00, - 0x00, + // 582 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x31, 0x6f, 0xd3, 0x4e, + 0x18, 0xc6, 0xe3, 0xa4, 0x49, 0x93, 0xcb, 0xff, 0x4f, 0xdb, 0x83, 0xc1, 0xca, 0xe0, 0x56, 0x41, + 0x42, 0x05, 0xc1, 0x1d, 0x29, 0x08, 0x55, 0x0c, 0x94, 0x1a, 0x31, 0x74, 0x00, 0xc4, 0xb1, 0x31, + 0x71, 0x71, 0xae, 0xce, 0x35, 0xf6, 0x9d, 0xe5, 0x3b, 0xa7, 0xca, 0x80, 0xc4, 0xc8, 0xc0, 0xc0, + 0x37, 0x62, 0xcd, 0xd8, 0x91, 0xa9, 0x22, 0xe1, 0x8b, 0x20, 0x9f, 0x9d, 0xda, 0x34, 0x44, 0x08, + 0x65, 0xf3, 0x7b, 0xef, 0xbd, 0xbf, 0xe7, 0xb9, 0xf7, 0x31, 0x38, 0x1a, 0x1d, 0x2a, 0xc4, 0x25, + 0x1e, 0x25, 0x7d, 0x16, 0x0b, 0xa6, 0x99, 0xc2, 0xd1, 0xc8, 0xc7, 0x34, 0xe2, 0x0a, 0xf3, 0x90, + 0xfa, 0x2c, 0x92, 0x01, 0xf7, 0x26, 0x78, 0xdc, 0xa3, 0x41, 0x34, 0xa4, 0x3d, 0xec, 0x33, 0xc1, + 0x62, 0xaa, 0xd9, 0x00, 0x45, 0xb1, 0xd4, 0x12, 0xe2, 0x0c, 0x80, 0x0a, 0x00, 0x8a, 0x46, 0x3e, + 0x4a, 0x01, 0xa8, 0x04, 0x40, 0x0b, 0x40, 0xe7, 0x81, 0xcf, 0xf5, 0x30, 0xe9, 0x23, 0x4f, 0x86, + 0xd8, 0x97, 0xbe, 0xc4, 0x86, 0xd3, 0x4f, 0x4e, 0x4d, 0x65, 0x0a, 0xf3, 0x95, 0xf1, 0x3b, 0x8f, + 0x73, 0x83, 0x34, 0xe2, 0x21, 0xf5, 0x86, 0x5c, 0xb0, 0x78, 0x52, 0x58, 0x0c, 0x99, 0xa6, 0x78, + 0xbc, 0xe4, 0xaa, 0x83, 0x57, 0x4d, 0xc5, 0x89, 0xd0, 0x3c, 0x64, 0x4b, 0x03, 0x4f, 0xfe, 0x36, + 0xa0, 0xbc, 0x21, 0x0b, 0xe9, 0xd2, 0xdc, 0xa3, 0x55, 0x73, 0x89, 0xe6, 0x01, 0xe6, 0x42, 0x2b, + 0x1d, 0x2f, 0x0d, 0xdd, 0x5f, 0xb9, 0xf4, 0x3f, 0xbc, 0xa5, 0xfb, 0xad, 0x0a, 0xda, 0x27, 0xe9, + 0x26, 0x09, 0x1b, 0x73, 0x76, 0x0e, 0x3f, 0x80, 0x66, 0xfa, 0xec, 0x01, 0xd5, 0xd4, 0xb6, 0xf6, + 0xac, 0xfd, 0xf6, 0xc1, 0x43, 0x94, 0x87, 0x50, 0x76, 0x51, 0xc4, 0x90, 0xde, 0x46, 0xe3, 0x1e, + 0x7a, 0xd3, 0x3f, 0x63, 0x9e, 0x7e, 0xc5, 0x34, 0x75, 0xe1, 0xf4, 0x72, 0xb7, 0x32, 0xbf, 0xdc, + 0x05, 0xc5, 0x19, 0xb9, 0xa2, 0xc2, 0x3e, 0xd8, 0x50, 0x11, 0xf3, 0xec, 0xaa, 0xa1, 0x3f, 0x47, + 0xff, 0x18, 0x31, 0x2a, 0xb9, 0x7d, 0x17, 0x31, 0xcf, 0xfd, 0x2f, 0x57, 0xdb, 0x48, 0x2b, 0x62, + 0xd8, 0xf0, 0x0c, 0x34, 0x94, 0xa6, 0x3a, 0x51, 0x76, 0xcd, 0xa8, 0xb8, 0x6b, 0xa9, 0x18, 0x92, + 0x7b, 0x23, 0xd7, 0x69, 0x64, 0x35, 0xc9, 0x15, 0xba, 0x47, 0xc0, 0x2e, 0x5d, 0x7e, 0x21, 0x85, + 0xa6, 0xe9, 0x8a, 0x52, 0x37, 0xf0, 0x36, 0xa8, 0x1b, 0xba, 0x59, 0x65, 0xcb, 0xfd, 0x3f, 0x47, + 0xd4, 0xb3, 0x81, 0xac, 0xd7, 0xfd, 0x52, 0x03, 0x5b, 0xd7, 0x1e, 0x05, 0x3f, 0x02, 0xe0, 0x2d, + 0x48, 0xca, 0xb6, 0xf6, 0x6a, 0xfb, 0xed, 0x83, 0x93, 0x75, 0x1e, 0xf1, 0x9b, 0xaf, 0x22, 0xa1, + 0xab, 0x63, 0x45, 0x4a, 0x82, 0xf0, 0xb3, 0x05, 0xda, 0x54, 0x08, 0xa9, 0xa9, 0xe6, 0x52, 0x28, + 0xbb, 0x6a, 0x0c, 0xbc, 0x5d, 0x37, 0x2b, 0x74, 0x5c, 0x30, 0x5f, 0x0a, 0x1d, 0x4f, 0xdc, 0x9b, + 0xb9, 0x91, 0x76, 0xa9, 0x43, 0xca, 0xd2, 0x10, 0x83, 0x96, 0xa0, 0x21, 0x53, 0x11, 0xf5, 0x98, + 0x49, 0xb3, 0xe5, 0xee, 0xe4, 0x43, 0xad, 0xd7, 0x8b, 0x06, 0x29, 0xee, 0x74, 0x9e, 0x81, 0xed, + 0xeb, 0x32, 0x70, 0x1b, 0xd4, 0x46, 0x6c, 0x92, 0xa5, 0x40, 0xd2, 0x4f, 0x78, 0x0b, 0xd4, 0xc7, + 0x34, 0x48, 0x98, 0xf9, 0x0d, 0x5b, 0x24, 0x2b, 0x9e, 0x56, 0x0f, 0xad, 0xee, 0x29, 0xd8, 0x59, + 0x0a, 0x1f, 0xde, 0x05, 0x9b, 0x34, 0x08, 0xe4, 0x39, 0x1b, 0x18, 0x48, 0xd3, 0xdd, 0xca, 0x3d, + 0x6c, 0x1e, 0x67, 0xc7, 0x64, 0xd1, 0x87, 0x77, 0x40, 0x23, 0x66, 0x54, 0x49, 0x91, 0xa1, 0x8b, + 0xff, 0x86, 0x98, 0x53, 0x92, 0x77, 0xdd, 0x7b, 0xd3, 0x99, 0x53, 0xb9, 0x98, 0x39, 0x95, 0xef, + 0x33, 0xa7, 0xf2, 0x69, 0xee, 0x58, 0xd3, 0xb9, 0x63, 0x5d, 0xcc, 0x1d, 0xeb, 0xc7, 0xdc, 0xb1, + 0xbe, 0xfe, 0x74, 0x2a, 0xef, 0x9b, 0x8b, 0x3d, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xc2, + 0xd7, 0x69, 0x49, 0x05, 0x00, 0x00, } diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.proto b/pkg/apis/imagepolicy/v1alpha1/generated.proto index 865fc0be619ee..6f1d8123978f1 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.proto +++ b/pkg/apis/imagepolicy/v1alpha1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.imagepolicy.v1alpha1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1alpha1"; diff --git a/pkg/apis/policy/BUILD b/pkg/apis/policy/BUILD index 3a367537c1aa6..98fd8ccb49857 100644 --- a/pkg/apis/policy/BUILD +++ b/pkg/apis/policy/BUILD @@ -17,11 +17,11 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index 22a56773ee14a..ef2ff713ad203 100644 --- a/pkg/apis/policy/types.go +++ b/pkg/apis/policy/types.go @@ -18,7 +18,7 @@ package policy import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" ) // PodDisruptionBudgetSpec is a description of a PodDisruptionBudget. diff --git a/pkg/apis/policy/v1alpha1/BUILD b/pkg/apis/policy/v1alpha1/BUILD index 0a71750dd31f1..ec13378d8d5d6 100644 --- a/pkg/apis/policy/v1alpha1/BUILD +++ b/pkg/apis/policy/v1alpha1/BUILD @@ -16,10 +16,10 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go index 8ce3aba99b4e6..951df533ba914 100644 --- a/pkg/apis/policy/v1alpha1/types.go +++ b/pkg/apis/policy/v1alpha1/types.go @@ -18,7 +18,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" ) // PodDisruptionBudgetSpec is a description of a PodDisruptionBudget. diff --git a/pkg/apis/policy/v1beta1/BUILD b/pkg/apis/policy/v1beta1/BUILD index 407f07a03fe32..47990f1c8da3c 100644 --- a/pkg/apis/policy/v1beta1/BUILD +++ b/pkg/apis/policy/v1beta1/BUILD @@ -22,7 +22,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/policy:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", @@ -31,6 +30,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/apis/policy/v1beta1/generated.pb.go b/pkg/apis/policy/v1beta1/generated.pb.go index 2a89cc8aa02ac..843bd6853add1 100644 --- a/pkg/apis/policy/v1beta1/generated.pb.go +++ b/pkg/apis/policy/v1beta1/generated.pb.go @@ -439,7 +439,7 @@ func (this *PodDisruptionBudgetSpec) String() string { return "nil" } s := strings.Join([]string{`&PodDisruptionBudgetSpec{`, - `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_apimachinery_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") @@ -1322,54 +1322,53 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 776 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x94, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0x9c, 0x5a, - 0x04, 0x63, 0x52, 0x10, 0x2a, 0x1c, 0x2a, 0x6a, 0x52, 0x41, 0x51, 0xab, 0x54, 0x2e, 0x12, 0x12, - 0x02, 0x89, 0xb1, 0xfd, 0x70, 0x86, 0xf8, 0x97, 0x66, 0xc6, 0x81, 0xdc, 0xf8, 0x13, 0x38, 0xec, - 0x1f, 0x55, 0x69, 0x2f, 0x3d, 0xae, 0x56, 0xab, 0x6a, 0x9b, 0xfd, 0x1b, 0xf6, 0xbe, 0xb2, 0x3d, - 0x49, 0xe3, 0x24, 0xdd, 0xcd, 0xaa, 0xab, 0xbd, 0x79, 0x66, 0xde, 0xe7, 0xfb, 0x7d, 0xef, 0xcd, - 0x1b, 0xa3, 0x6f, 0x07, 0x07, 0x82, 0xb0, 0xc8, 0x18, 0x24, 0x36, 0xf0, 0x10, 0x24, 0x08, 0x23, - 0x1e, 0x78, 0x06, 0x8d, 0x99, 0x30, 0xe2, 0xc8, 0x67, 0xce, 0xc8, 0x18, 0x76, 0x6c, 0x90, 0xb4, - 0x63, 0x78, 0x10, 0x02, 0xa7, 0x12, 0x5c, 0x12, 0xf3, 0x48, 0x46, 0x78, 0x2f, 0x47, 0xc9, 0x2d, - 0x4a, 0xe2, 0x81, 0x47, 0x52, 0x94, 0xe4, 0x28, 0x51, 0x68, 0xeb, 0x0b, 0x8f, 0xc9, 0x7e, 0x62, - 0x13, 0x27, 0x0a, 0x0c, 0x2f, 0xf2, 0x22, 0x23, 0x53, 0xb0, 0x93, 0xbf, 0xb2, 0x55, 0xb6, 0xc8, - 0xbe, 0x72, 0xe5, 0xd6, 0xd7, 0x2a, 0x29, 0x1a, 0xb3, 0x80, 0x3a, 0x7d, 0x16, 0x02, 0x1f, 0x4d, - 0xd2, 0x32, 0x38, 0x88, 0x28, 0xe1, 0x0e, 0xcc, 0xe7, 0xf3, 0x52, 0x4a, 0x18, 0x01, 0x48, 0x6a, - 0x0c, 0x17, 0xaa, 0x68, 0x19, 0x77, 0x51, 0x3c, 0x09, 0x25, 0x0b, 0x16, 0x6d, 0xbe, 0x79, 0x15, - 0x20, 0x9c, 0x3e, 0x04, 0x74, 0x81, 0xfb, 0xfc, 0xce, 0x4e, 0x2f, 0x4b, 0xab, 0xb3, 0x3c, 0x3a, - 0x91, 0xcc, 0x37, 0x58, 0x28, 0x85, 0xe4, 0xf3, 0x48, 0xfb, 0xb1, 0x86, 0x6a, 0xc7, 0x43, 0xe6, - 0x48, 0x16, 0x85, 0xf8, 0x4f, 0x54, 0x4b, 0x2b, 0x76, 0xa9, 0xa4, 0x4d, 0xed, 0x53, 0x6d, 0x77, - 0x63, 0xff, 0x4b, 0xa2, 0xee, 0x6b, 0x36, 0xf1, 0xdb, 0x1b, 0x4b, 0xa3, 0xc9, 0xb0, 0x43, 0x7a, - 0xf6, 0xdf, 0xe0, 0xc8, 0x33, 0x90, 0xd4, 0xc4, 0x97, 0xd7, 0x3b, 0xa5, 0xf1, 0xf5, 0x0e, 0xba, - 0xdd, 0xb3, 0xa6, 0xaa, 0xd8, 0x47, 0x0d, 0x17, 0x7c, 0x90, 0xd0, 0x8b, 0x53, 0x47, 0xd1, 0x5c, - 0xcb, 0x6c, 0xbe, 0x5a, 0xcd, 0xa6, 0x3b, 0x8b, 0x9a, 0xef, 0x8d, 0xaf, 0x77, 0x1a, 0x85, 0x2d, - 0xab, 0x28, 0xde, 0x7e, 0xb8, 0x86, 0xde, 0x3f, 0x8f, 0xdc, 0x2e, 0x13, 0x3c, 0xc9, 0xb6, 0xcc, - 0xc4, 0xf5, 0x40, 0xbe, 0x85, 0x3a, 0x5d, 0x54, 0x11, 0x31, 0x38, 0xaa, 0x3c, 0x93, 0xac, 0x3c, - 0xf5, 0x64, 0x49, 0xbe, 0x17, 0x31, 0x38, 0x66, 0x5d, 0xf9, 0x55, 0xd2, 0x95, 0x95, 0xa9, 0x63, - 0x1f, 0xad, 0x0b, 0x49, 0x65, 0x22, 0x9a, 0xe5, 0xcc, 0xa7, 0x7b, 0x4f, 0x9f, 0x4c, 0xcb, 0xdc, - 0x54, 0x4e, 0xeb, 0xf9, 0xda, 0x52, 0x1e, 0xed, 0x27, 0x1a, 0xfa, 0x68, 0x09, 0x75, 0xca, 0x84, - 0xc4, 0xbf, 0x2f, 0x74, 0x94, 0xac, 0xd6, 0xd1, 0x94, 0xce, 0xfa, 0xb9, 0xa5, 0x5c, 0x6b, 0x93, - 0x9d, 0x99, 0x6e, 0x3a, 0xa8, 0xca, 0x24, 0x04, 0xe9, 0xb4, 0x94, 0x77, 0x37, 0xf6, 0x0f, 0xef, - 0x57, 0xa6, 0xd9, 0x50, 0x56, 0xd5, 0x93, 0x54, 0xd4, 0xca, 0xb5, 0xdb, 0xe3, 0xe5, 0xe5, 0xa5, - 0xed, 0xc6, 0x7d, 0x54, 0x0f, 0x58, 0x78, 0x34, 0xa4, 0xcc, 0xa7, 0xb6, 0x0f, 0xf3, 0x25, 0xce, - 0xe5, 0x91, 0xbe, 0x37, 0x92, 0xbf, 0x37, 0x72, 0x12, 0xca, 0x1e, 0xbf, 0x90, 0x9c, 0x85, 0x9e, - 0xf9, 0x81, 0xf2, 0xad, 0x9f, 0xcd, 0x68, 0x59, 0x05, 0x65, 0xfc, 0x07, 0xaa, 0x09, 0xf0, 0xc1, - 0x91, 0x11, 0x7f, 0xbd, 0xb7, 0x71, 0x4a, 0x6d, 0xf0, 0x2f, 0x14, 0x6a, 0xd6, 0xd3, 0x4e, 0x4e, - 0x56, 0xd6, 0x54, 0xb2, 0xfd, 0xbc, 0x82, 0x3e, 0xbe, 0xf3, 0xe6, 0xf1, 0xcf, 0x08, 0x47, 0xb6, - 0x00, 0x3e, 0x04, 0xf7, 0xc7, 0xfc, 0x3f, 0xc1, 0xa2, 0x30, 0x2b, 0xb6, 0x6c, 0xb6, 0x54, 0xf2, - 0xb8, 0xb7, 0x10, 0x61, 0x2d, 0xa1, 0xf0, 0x03, 0x0d, 0x35, 0xdc, 0xdc, 0x06, 0xdc, 0xf3, 0xc8, - 0x9d, 0x5c, 0xde, 0xaf, 0x6f, 0x62, 0x46, 0x49, 0x77, 0x56, 0xf9, 0x38, 0x94, 0x7c, 0x64, 0x6e, - 0xab, 0x04, 0x1b, 0x85, 0x33, 0xab, 0x98, 0x04, 0x3e, 0x43, 0xd8, 0x9d, 0x4a, 0x8a, 0x23, 0xdf, - 0x8f, 0xfe, 0x01, 0x37, 0x7b, 0x3e, 0x55, 0xf3, 0x13, 0xa5, 0xb0, 0x5d, 0xf0, 0x9d, 0x04, 0x59, - 0x4b, 0x40, 0x7c, 0x88, 0x36, 0x9d, 0x84, 0x73, 0x08, 0xe5, 0x4f, 0x40, 0x7d, 0xd9, 0x1f, 0x35, - 0x2b, 0x99, 0xd4, 0x87, 0x4a, 0x6a, 0xf3, 0x87, 0xc2, 0xa9, 0x35, 0x17, 0x9d, 0xf2, 0x2e, 0x08, - 0xc6, 0xc1, 0x9d, 0xf0, 0xd5, 0x22, 0xdf, 0x2d, 0x9c, 0x5a, 0x73, 0xd1, 0xf8, 0x00, 0xd5, 0xe1, - 0xdf, 0x18, 0x9c, 0x49, 0x8f, 0xd7, 0x33, 0x7a, 0x3a, 0x68, 0xc7, 0x33, 0x67, 0x56, 0x21, 0xb2, - 0xe5, 0x23, 0xbc, 0xd8, 0x44, 0xbc, 0x85, 0xca, 0x03, 0x18, 0x65, 0x57, 0xfe, 0xae, 0x95, 0x7e, - 0xe2, 0xef, 0x51, 0x75, 0x48, 0xfd, 0x04, 0xd4, 0x34, 0x7e, 0xb6, 0xda, 0x34, 0xfe, 0xc2, 0x02, - 0xb0, 0x72, 0xf0, 0xbb, 0xb5, 0x03, 0xcd, 0xdc, 0xbb, 0xbc, 0xd1, 0x4b, 0x57, 0x37, 0x7a, 0xe9, - 0xd1, 0x8d, 0x5e, 0xfa, 0x6f, 0xac, 0x6b, 0x97, 0x63, 0x5d, 0xbb, 0x1a, 0xeb, 0xda, 0xd3, 0xb1, - 0xae, 0xfd, 0xff, 0x4c, 0x2f, 0xfd, 0xf6, 0x8e, 0xba, 0xf4, 0x17, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x02, 0xd3, 0x1e, 0x38, 0x5d, 0x08, 0x00, 0x00, + // 762 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x94, 0xcf, 0x6f, 0xd3, 0x48, + 0x14, 0xc7, 0xe3, 0x26, 0xe9, 0x66, 0xa7, 0x49, 0xd5, 0x9d, 0xdd, 0xee, 0x66, 0x23, 0xad, 0xbb, + 0xca, 0xa9, 0x45, 0x30, 0xa6, 0x2d, 0x42, 0x85, 0x43, 0x45, 0x4d, 0x2a, 0x28, 0x6a, 0x95, 0xca, + 0x45, 0x42, 0x42, 0x20, 0x31, 0xb6, 0x1f, 0xce, 0x34, 0xfe, 0x25, 0x7b, 0x1c, 0xc8, 0x8d, 0x3f, + 0x81, 0x03, 0x7f, 0x54, 0x25, 0x2e, 0x3d, 0x22, 0x84, 0x2a, 0x1a, 0xf8, 0x17, 0xb8, 0x23, 0xdb, + 0x93, 0x1f, 0x6e, 0x12, 0x35, 0xa8, 0x88, 0x9b, 0x67, 0xe6, 0x7d, 0xbe, 0xdf, 0xf7, 0xde, 0xbc, + 0x31, 0xba, 0xd3, 0xde, 0x0a, 0x09, 0xf3, 0x94, 0x76, 0xa4, 0x43, 0xe0, 0x02, 0x87, 0x50, 0xf1, + 0xdb, 0x96, 0x42, 0x7d, 0x16, 0x2a, 0xbe, 0x67, 0x33, 0xa3, 0xab, 0x74, 0xd6, 0x75, 0xe0, 0x74, + 0x5d, 0xb1, 0xc0, 0x85, 0x80, 0x72, 0x30, 0x89, 0x1f, 0x78, 0xdc, 0xc3, 0x6b, 0x29, 0x4a, 0x86, + 0x28, 0xf1, 0xdb, 0x16, 0x89, 0x51, 0x92, 0xa2, 0x44, 0xa0, 0xb5, 0x1b, 0x16, 0xe3, 0xad, 0x48, + 0x27, 0x86, 0xe7, 0x28, 0x96, 0x67, 0x79, 0x4a, 0xa2, 0xa0, 0x47, 0x2f, 0x93, 0x55, 0xb2, 0x48, + 0xbe, 0x52, 0xe5, 0xda, 0x2d, 0x91, 0x14, 0xf5, 0x99, 0x43, 0x8d, 0x16, 0x73, 0x21, 0xe8, 0x0e, + 0xd3, 0x72, 0x80, 0x53, 0xa5, 0x33, 0x96, 0x4f, 0x4d, 0x99, 0x46, 0x05, 0x91, 0xcb, 0x99, 0x03, + 0x63, 0xc0, 0xed, 0xcb, 0x80, 0xd0, 0x68, 0x81, 0x43, 0xc7, 0xb8, 0xcd, 0x69, 0x5c, 0xc4, 0x99, + 0xad, 0x30, 0x97, 0x87, 0x3c, 0x18, 0x83, 0xae, 0x4f, 0x6d, 0xf4, 0x84, 0x5a, 0xea, 0x1f, 0x25, + 0x54, 0xda, 0xed, 0x30, 0x83, 0x33, 0xcf, 0xc5, 0x2f, 0x50, 0x29, 0xae, 0xd9, 0xa4, 0x9c, 0x56, + 0xa5, 0xff, 0xa5, 0xd5, 0x85, 0x8d, 0x9b, 0x44, 0xf4, 0x7e, 0x34, 0x85, 0x61, 0xf7, 0xe3, 0x68, + 0xd2, 0x59, 0x27, 0x4d, 0xfd, 0x18, 0x0c, 0x7e, 0x00, 0x9c, 0xaa, 0xf8, 0xe4, 0x6c, 0x25, 0xd7, + 0x3b, 0x5b, 0x41, 0xc3, 0x3d, 0x6d, 0xa0, 0x8a, 0x6d, 0x54, 0x31, 0xc1, 0x06, 0x0e, 0x4d, 0x3f, + 0x76, 0x0c, 0xab, 0x73, 0x89, 0xcd, 0xe6, 0x6c, 0x36, 0x8d, 0x51, 0x54, 0xfd, 0xa3, 0x77, 0xb6, + 0x52, 0xc9, 0x6c, 0x69, 0x59, 0xf1, 0xfa, 0xfb, 0x39, 0xf4, 0xe7, 0xa1, 0x67, 0x36, 0x58, 0x18, + 0x44, 0xc9, 0x96, 0x1a, 0x99, 0x16, 0xf0, 0x5f, 0x50, 0xa7, 0x89, 0x0a, 0xa1, 0x0f, 0x86, 0x28, + 0x4f, 0x25, 0x33, 0x4f, 0x30, 0x99, 0x90, 0xef, 0x91, 0x0f, 0x86, 0x5a, 0x16, 0x7e, 0x85, 0x78, + 0xa5, 0x25, 0xea, 0xd8, 0x46, 0xf3, 0x21, 0xa7, 0x3c, 0x0a, 0xab, 0xf9, 0xc4, 0xa7, 0x71, 0x45, + 0x9f, 0x44, 0x4b, 0x5d, 0x14, 0x4e, 0xf3, 0xe9, 0x5a, 0x13, 0x1e, 0xf5, 0x4f, 0x12, 0xfa, 0x67, + 0x02, 0xb5, 0xcf, 0x42, 0x8e, 0x9f, 0x8d, 0x75, 0x94, 0xcc, 0xd6, 0xd1, 0x98, 0x4e, 0xfa, 0xb9, + 0x24, 0x5c, 0x4b, 0xfd, 0x9d, 0x91, 0x6e, 0x1a, 0xa8, 0xc8, 0x38, 0x38, 0xf1, 0xb4, 0xe4, 0x57, + 0x17, 0x36, 0xb6, 0xaf, 0x56, 0xa6, 0x5a, 0x11, 0x56, 0xc5, 0xbd, 0x58, 0x54, 0x4b, 0xb5, 0xeb, + 0x5f, 0x27, 0x97, 0x17, 0xb7, 0x1b, 0x1f, 0xa3, 0xb2, 0xc3, 0xdc, 0x9d, 0x0e, 0x65, 0x36, 0xd5, + 0x6d, 0xb8, 0x74, 0x68, 0xe2, 0xf7, 0x49, 0xd2, 0xf7, 0x49, 0xf6, 0x5c, 0xde, 0x0c, 0x8e, 0x78, + 0xc0, 0x5c, 0x4b, 0xfd, 0x4b, 0x38, 0x97, 0x0f, 0x46, 0xd4, 0xb4, 0x8c, 0x36, 0x7e, 0x8e, 0x4a, + 0x21, 0xd8, 0x60, 0x70, 0x2f, 0xf8, 0xb1, 0xd7, 0xb1, 0x4f, 0x75, 0xb0, 0x8f, 0x04, 0xaa, 0x96, + 0xe3, 0x5e, 0xf6, 0x57, 0xda, 0x40, 0xb2, 0xfe, 0xad, 0x80, 0xfe, 0x9d, 0x7a, 0xf7, 0xf8, 0x11, + 0xc2, 0x9e, 0x1e, 0x42, 0xd0, 0x01, 0xf3, 0x41, 0xfa, 0xa7, 0x60, 0x9e, 0x9b, 0x94, 0x9b, 0x57, + 0x6b, 0x22, 0x79, 0xdc, 0x1c, 0x8b, 0xd0, 0x26, 0x50, 0xf8, 0x9d, 0x84, 0x2a, 0x66, 0x6a, 0x03, + 0xe6, 0xa1, 0x67, 0xf6, 0xaf, 0xef, 0xc9, 0xcf, 0x98, 0x52, 0xd2, 0x18, 0x55, 0xde, 0x75, 0x79, + 0xd0, 0x55, 0x97, 0x45, 0x82, 0x95, 0xcc, 0x99, 0x96, 0x4d, 0x02, 0x1f, 0x20, 0x6c, 0x0e, 0x24, + 0xc3, 0x1d, 0xdb, 0xf6, 0x5e, 0x81, 0x99, 0x3c, 0xa0, 0xa2, 0xfa, 0x9f, 0x50, 0x58, 0xce, 0xf8, + 0xf6, 0x83, 0xb4, 0x09, 0x20, 0xde, 0x46, 0x8b, 0x46, 0x14, 0x04, 0xe0, 0xf2, 0x87, 0x40, 0x6d, + 0xde, 0xea, 0x56, 0x0b, 0x89, 0xd4, 0xdf, 0x42, 0x6a, 0xf1, 0x7e, 0xe6, 0x54, 0xbb, 0x10, 0x1d, + 0xf3, 0x26, 0x84, 0x2c, 0x00, 0xb3, 0xcf, 0x17, 0xb3, 0x7c, 0x23, 0x73, 0xaa, 0x5d, 0x88, 0xc6, + 0x5b, 0xa8, 0x0c, 0xaf, 0x7d, 0x30, 0xfa, 0x3d, 0x9e, 0x4f, 0xe8, 0xc1, 0xa0, 0xed, 0x8e, 0x9c, + 0x69, 0x99, 0xc8, 0x9a, 0x8d, 0xf0, 0x78, 0x13, 0xf1, 0x12, 0xca, 0xb7, 0xa1, 0x9b, 0x5c, 0xf9, + 0xef, 0x5a, 0xfc, 0x89, 0xef, 0xa1, 0x62, 0x87, 0xda, 0x11, 0x88, 0x69, 0xbc, 0x36, 0xdb, 0x34, + 0x3e, 0x66, 0x0e, 0x68, 0x29, 0x78, 0x77, 0x6e, 0x4b, 0x52, 0xd7, 0x4e, 0xce, 0xe5, 0xdc, 0xe9, + 0xb9, 0x9c, 0xfb, 0x70, 0x2e, 0xe7, 0xde, 0xf4, 0x64, 0xe9, 0xa4, 0x27, 0x4b, 0xa7, 0x3d, 0x59, + 0xfa, 0xdc, 0x93, 0xa5, 0xb7, 0x5f, 0xe4, 0xdc, 0xd3, 0xdf, 0xc4, 0xa5, 0x7f, 0x0f, 0x00, 0x00, + 0xff, 0xff, 0x3d, 0x4a, 0x99, 0x08, 0x2b, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/policy/v1beta1/generated.proto b/pkg/apis/policy/v1beta1/generated.proto index c528720b782dd..1e8f9b1bb7187 100644 --- a/pkg/apis/policy/v1beta1/generated.proto +++ b/pkg/apis/policy/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.policy.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; @@ -66,7 +65,7 @@ message PodDisruptionBudgetSpec { // "selector" will still be available after the eviction, i.e. even in the // absence of the evicted pod. So for example you can prevent all voluntary // evictions by specifying "100%". - optional k8s.io.kubernetes.pkg.util.intstr.IntOrString minAvailable = 1; + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString minAvailable = 1; // Label query over pods whose evictions are managed by the disruption // budget. diff --git a/pkg/apis/policy/v1beta1/types.generated.go b/pkg/apis/policy/v1beta1/types.generated.go index 9ab50514a6207..049bfe8e69981 100644 --- a/pkg/apis/policy/v1beta1/types.generated.go +++ b/pkg/apis/policy/v1beta1/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg3_types "k8s.io/apimachinery/pkg/types" - pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg1_intstr "k8s.io/apimachinery/pkg/util/intstr" "reflect" "runtime" time "time" diff --git a/pkg/apis/policy/v1beta1/types.go b/pkg/apis/policy/v1beta1/types.go index 7177a0c21321e..ca5ea37306ac5 100644 --- a/pkg/apis/policy/v1beta1/types.go +++ b/pkg/apis/policy/v1beta1/types.go @@ -18,7 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" ) // PodDisruptionBudgetSpec is a description of a PodDisruptionBudget. diff --git a/pkg/apis/policy/validation/BUILD b/pkg/apis/policy/validation/BUILD index 507406ebea838..dca369b9f2b56 100644 --- a/pkg/apis/policy/validation/BUILD +++ b/pkg/apis/policy/validation/BUILD @@ -28,7 +28,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/policy:go_default_library", - "//pkg/util/intstr:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/policy/validation/validation_test.go b/pkg/apis/policy/validation/validation_test.go index 6c745e1b81fe9..7dfc403ad9a3f 100644 --- a/pkg/apis/policy/validation/validation_test.go +++ b/pkg/apis/policy/validation/validation_test.go @@ -19,9 +19,9 @@ package validation import ( "testing" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestValidatePodDisruptionBudgetSpec(t *testing.T) { diff --git a/pkg/apis/rbac/v1alpha1/generated.pb.go b/pkg/apis/rbac/v1alpha1/generated.pb.go index 5c67948c58113..0504dc9310010 100644 --- a/pkg/apis/rbac/v1alpha1/generated.pb.go +++ b/pkg/apis/rbac/v1alpha1/generated.pb.go @@ -2760,58 +2760,57 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 841 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xbf, 0x6f, 0x23, 0x45, - 0x14, 0xf6, 0x24, 0x36, 0xb1, 0x5f, 0x88, 0x42, 0x06, 0x09, 0x2d, 0x29, 0xd6, 0xd1, 0x56, 0x11, - 0x1c, 0xbb, 0x38, 0x3a, 0xe0, 0x0a, 0x28, 0x6e, 0x29, 0x50, 0xc4, 0x11, 0xa2, 0x39, 0x71, 0x12, - 0xa7, 0x93, 0x60, 0xbc, 0x9e, 0xb3, 0x07, 0xef, 0x2f, 0xcd, 0xec, 0x46, 0x3a, 0x21, 0x24, 0x4a, - 0x4a, 0xfe, 0x0a, 0x4a, 0x0a, 0x24, 0x4a, 0x2a, 0x9a, 0x08, 0x9a, 0x2b, 0xa1, 0xb1, 0xc8, 0xf2, - 0x87, 0x80, 0x76, 0x76, 0xf6, 0x87, 0x63, 0x87, 0x38, 0x41, 0xb2, 0x84, 0x44, 0x65, 0xcf, 0x7b, - 0xdf, 0xf7, 0xde, 0xfb, 0xe6, 0xcd, 0x7e, 0x70, 0x6f, 0x7a, 0x4f, 0xda, 0x3c, 0x72, 0xa6, 0xe9, - 0x90, 0x89, 0x90, 0x25, 0x4c, 0x3a, 0xf1, 0x74, 0xec, 0xd0, 0x98, 0x4b, 0x47, 0x0c, 0xa9, 0xe7, - 0x9c, 0x0d, 0xa8, 0x1f, 0x4f, 0xe8, 0xc0, 0x19, 0xb3, 0x90, 0x09, 0x9a, 0xb0, 0x91, 0x1d, 0x8b, - 0x28, 0x89, 0xf0, 0x61, 0xc1, 0xb4, 0x6b, 0xa6, 0x1d, 0x4f, 0xc7, 0x76, 0xce, 0xb4, 0x73, 0xa6, - 0x5d, 0x32, 0xf7, 0xdf, 0x18, 0xf3, 0x64, 0x92, 0x0e, 0x6d, 0x2f, 0x0a, 0x9c, 0x71, 0x34, 0x8e, - 0x1c, 0x55, 0x60, 0x98, 0x3e, 0x55, 0x27, 0x75, 0x50, 0xff, 0x8a, 0xc2, 0xfb, 0x77, 0xf5, 0x48, - 0x34, 0xe6, 0x01, 0xf5, 0x26, 0x3c, 0x64, 0xe2, 0x59, 0x39, 0x94, 0x23, 0x98, 0x8c, 0x52, 0xe1, - 0xb1, 0xcb, 0xe3, 0xfc, 0x23, 0x4b, 0x3a, 0x01, 0x4b, 0xa8, 0x73, 0xb6, 0x20, 0x62, 0xdf, 0xb9, - 0x8a, 0x25, 0xd2, 0x30, 0xe1, 0xc1, 0x62, 0x9b, 0xb7, 0xaf, 0x23, 0x48, 0x6f, 0xc2, 0x02, 0xba, - 0xc0, 0xbb, 0x73, 0xe5, 0x3d, 0x2f, 0x1b, 0x6b, 0xb0, 0x1c, 0x9d, 0x26, 0xdc, 0x77, 0x78, 0x98, - 0xc8, 0x44, 0x5c, 0xa6, 0x58, 0xbf, 0x20, 0xd8, 0x7e, 0xdf, 0x4f, 0x65, 0xc2, 0x04, 0x89, 0x7c, - 0x86, 0x3f, 0x87, 0x6e, 0x2e, 0x7a, 0x44, 0x13, 0x6a, 0xa0, 0x03, 0x74, 0xb8, 0x7d, 0xf4, 0xa6, - 0xad, 0x37, 0xd6, 0x9c, 0xbd, 0xde, 0x59, 0x8e, 0xb6, 0xcf, 0x06, 0xf6, 0xc7, 0xc3, 0x2f, 0x98, - 0x97, 0x7c, 0xc4, 0x12, 0xea, 0xe2, 0xf3, 0x59, 0xbf, 0x95, 0xcd, 0xfa, 0x50, 0xc7, 0x48, 0x55, - 0x15, 0x7f, 0x0a, 0x1d, 0x91, 0xfa, 0x4c, 0x1a, 0x1b, 0x07, 0x9b, 0x87, 0xdb, 0x47, 0x77, 0xed, - 0x55, 0x1f, 0x84, 0x7d, 0x1a, 0xf9, 0xdc, 0x7b, 0x46, 0x52, 0x9f, 0xb9, 0x3b, 0xba, 0x45, 0x27, - 0x3f, 0x49, 0x52, 0x54, 0xb4, 0x7e, 0xdc, 0x00, 0xdc, 0x10, 0xe3, 0xf2, 0x70, 0xc4, 0xc3, 0xf1, - 0x1a, 0x34, 0x7d, 0x06, 0x5d, 0x99, 0xaa, 0x44, 0x29, 0x6b, 0xb0, 0xba, 0xac, 0x87, 0x05, 0xd3, - 0x7d, 0x49, 0xb7, 0xe8, 0xea, 0x80, 0x24, 0x55, 0x51, 0xfc, 0x04, 0xb6, 0x44, 0xe4, 0x33, 0xc2, - 0x9e, 0x1a, 0x9b, 0x4a, 0xc1, 0x0d, 0xea, 0x93, 0x82, 0xe8, 0xee, 0xea, 0xfa, 0x5b, 0x3a, 0x40, - 0xca, 0x92, 0xd6, 0x77, 0x08, 0x5e, 0x5d, 0xbc, 0x37, 0x37, 0xe5, 0xfe, 0x88, 0x09, 0xfc, 0x0d, - 0x02, 0xec, 0x2d, 0x64, 0xf5, 0x4d, 0xbe, 0xbb, 0xfa, 0x1c, 0x4b, 0x3a, 0xec, 0xeb, 0x91, 0x96, - 0x6c, 0x8d, 0x2c, 0xe9, 0x69, 0xfd, 0x8e, 0xe0, 0x95, 0x45, 0xe8, 0x03, 0x2e, 0x13, 0xfc, 0x64, - 0x61, 0xc9, 0xf6, 0x6a, 0x4b, 0xce, 0xd9, 0x6a, 0xc5, 0xd5, 0xfd, 0x97, 0x91, 0xc6, 0x82, 0x29, - 0x74, 0x78, 0xc2, 0x82, 0x72, 0xbb, 0xff, 0x4e, 0x75, 0xf5, 0x78, 0x8f, 0xf3, 0x92, 0xa4, 0xa8, - 0x6c, 0xfd, 0x8a, 0x60, 0xb7, 0x01, 0x5e, 0x83, 0xa8, 0xc7, 0xf3, 0xa2, 0xde, 0xba, 0x9d, 0xa8, - 0xe5, 0x6a, 0xfe, 0x42, 0x00, 0xf5, 0xf7, 0x8a, 0xfb, 0xd0, 0x39, 0x63, 0x62, 0x28, 0x0d, 0x74, - 0xb0, 0x79, 0xd8, 0x73, 0x7b, 0x39, 0xfe, 0x51, 0x1e, 0x20, 0x45, 0x1c, 0xbf, 0x0e, 0x3d, 0x1a, - 0xf3, 0x0f, 0x44, 0x94, 0xc6, 0xd2, 0xd8, 0x54, 0xa0, 0x9d, 0x6c, 0xd6, 0xef, 0xdd, 0x3f, 0x3d, - 0x2e, 0x82, 0xa4, 0xce, 0xe7, 0xe0, 0xd2, 0xd0, 0xa5, 0xd1, 0xae, 0xc1, 0xa4, 0x0c, 0x92, 0x3a, - 0x8f, 0xdf, 0x81, 0x9d, 0xf2, 0x70, 0x42, 0x03, 0x26, 0x8d, 0x8e, 0x22, 0xec, 0x65, 0xb3, 0xfe, - 0x0e, 0x69, 0x26, 0xc8, 0x3c, 0x0e, 0xbf, 0x07, 0xbb, 0x61, 0x14, 0x96, 0x90, 0x4f, 0xc8, 0x03, - 0x69, 0xbc, 0xa0, 0xa8, 0x2f, 0x67, 0xb3, 0xfe, 0xee, 0xc9, 0x7c, 0x8a, 0x5c, 0xc6, 0x5a, 0x5f, - 0xc1, 0x5e, 0xc3, 0xb0, 0xf4, 0xb7, 0x34, 0x01, 0x88, 0xab, 0xa0, 0x5e, 0xe9, 0xed, 0x1c, 0xb0, - 0x32, 0xa4, 0x3a, 0x46, 0x1a, 0xb5, 0xad, 0x9f, 0x11, 0xb4, 0xff, 0xfb, 0x8e, 0xfe, 0xfd, 0x06, - 0x6c, 0xff, 0x6f, 0xe5, 0x37, 0xb0, 0xf2, 0xdc, 0x45, 0xd6, 0x6b, 0x8d, 0xb7, 0x77, 0x91, 0xeb, - 0x3d, 0xf1, 0x27, 0x04, 0xdd, 0x35, 0x99, 0xe1, 0xc3, 0x79, 0x19, 0xf6, 0x0d, 0x65, 0x2c, 0x9f, - 0xff, 0x4b, 0x28, 0x37, 0x84, 0xef, 0x40, 0xb7, 0x34, 0x30, 0x35, 0x7d, 0xaf, 0x9e, 0xa6, 0xf4, - 0x38, 0x52, 0x21, 0xf0, 0x01, 0xb4, 0xa7, 0x3c, 0x1c, 0x19, 0x1b, 0x0a, 0xf9, 0xa2, 0x46, 0xb6, - 0x3f, 0xe4, 0xe1, 0x88, 0xa8, 0x4c, 0x8e, 0x08, 0x69, 0xc0, 0xd4, 0x1b, 0x6a, 0x20, 0x72, 0xeb, - 0x22, 0x2a, 0x63, 0xfd, 0x80, 0x60, 0x4b, 0xbf, 0xbf, 0xaa, 0x1e, 0xba, 0xb2, 0xde, 0x11, 0x00, - 0x8d, 0xf9, 0x23, 0x26, 0x24, 0x8f, 0x42, 0xdd, 0xb7, 0xfa, 0x52, 0xee, 0x9f, 0x1e, 0xeb, 0x0c, - 0x69, 0xa0, 0xae, 0x9f, 0x01, 0x3b, 0xd0, 0xcb, 0x7f, 0x65, 0x4c, 0x3d, 0x66, 0xb4, 0x15, 0x6c, - 0x4f, 0xc3, 0x7a, 0x27, 0x65, 0x82, 0xd4, 0x18, 0xf7, 0xb5, 0xf3, 0x0b, 0xb3, 0xf5, 0xfc, 0xc2, - 0x6c, 0xfd, 0x76, 0x61, 0xb6, 0xbe, 0xce, 0x4c, 0x74, 0x9e, 0x99, 0xe8, 0x79, 0x66, 0xa2, 0x3f, - 0x32, 0x13, 0x7d, 0xfb, 0xa7, 0xd9, 0x7a, 0xdc, 0x2d, 0x2f, 0xfe, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xb1, 0x27, 0x54, 0x88, 0x85, 0x0c, 0x00, 0x00, + // 832 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xcf, 0x6b, 0x24, 0x45, + 0x14, 0x9e, 0x4a, 0x66, 0xcc, 0xcc, 0x8b, 0x21, 0xa6, 0x04, 0x69, 0x73, 0xe8, 0x09, 0x7d, 0x0a, + 0xba, 0x76, 0x9b, 0xb8, 0xea, 0x1e, 0xf4, 0xb0, 0xed, 0x41, 0x82, 0x6b, 0x0c, 0xb5, 0xb8, 0xe0, + 0xb2, 0xa0, 0x35, 0x3d, 0xb5, 0x33, 0xe5, 0xf4, 0x2f, 0xaa, 0xba, 0x03, 0x8b, 0x08, 0x1e, 0x3d, + 0xfa, 0x57, 0x78, 0xf4, 0x20, 0x78, 0xf4, 0xe4, 0x25, 0xe8, 0x25, 0x47, 0xbd, 0x0c, 0xa6, 0xfd, + 0x43, 0x94, 0xae, 0xae, 0xfe, 0x11, 0x7b, 0x42, 0x26, 0x11, 0x06, 0x84, 0x3d, 0xcd, 0xd4, 0x7b, + 0xdf, 0xf7, 0xea, 0x7d, 0xef, 0x75, 0x7d, 0x70, 0x6f, 0x76, 0x4f, 0xda, 0x3c, 0x72, 0x66, 0xe9, + 0x88, 0x89, 0x90, 0x25, 0x4c, 0x3a, 0xf1, 0x6c, 0xe2, 0xd0, 0x98, 0x4b, 0x47, 0x8c, 0xa8, 0xe7, + 0x9c, 0x1e, 0x50, 0x3f, 0x9e, 0xd2, 0x03, 0x67, 0xc2, 0x42, 0x26, 0x68, 0xc2, 0xc6, 0x76, 0x2c, + 0xa2, 0x24, 0xc2, 0xfb, 0x05, 0xd3, 0xae, 0x99, 0x76, 0x3c, 0x9b, 0xd8, 0x39, 0xd3, 0xce, 0x99, + 0x76, 0xc9, 0xdc, 0x7d, 0x63, 0xc2, 0x93, 0x69, 0x3a, 0xb2, 0xbd, 0x28, 0x70, 0x26, 0xd1, 0x24, + 0x72, 0x54, 0x81, 0x51, 0xfa, 0x54, 0x9d, 0xd4, 0x41, 0xfd, 0x2b, 0x0a, 0xef, 0xde, 0xd5, 0x2d, + 0xd1, 0x98, 0x07, 0xd4, 0x9b, 0xf2, 0x90, 0x89, 0x67, 0x75, 0x53, 0x01, 0x4b, 0xa8, 0x73, 0xda, + 0x6a, 0x67, 0xd7, 0xb9, 0x8a, 0x25, 0xd2, 0x30, 0xe1, 0x01, 0x6b, 0x11, 0xde, 0xb9, 0x8e, 0x20, + 0xbd, 0x29, 0x0b, 0x68, 0x8b, 0xf7, 0xd6, 0x55, 0xbc, 0x34, 0xe1, 0xbe, 0xc3, 0xc3, 0x44, 0x26, + 0xa2, 0x45, 0xba, 0x73, 0xe5, 0x98, 0x17, 0x68, 0xb1, 0x7e, 0x45, 0xb0, 0xf9, 0x81, 0x9f, 0xca, + 0x84, 0x09, 0x12, 0xf9, 0x0c, 0x7f, 0x01, 0xfd, 0x5c, 0xf6, 0x98, 0x26, 0xd4, 0x40, 0x7b, 0x68, + 0x7f, 0xf3, 0xf0, 0x4d, 0x5b, 0x4f, 0xbf, 0xd9, 0x45, 0x3d, 0xff, 0x1c, 0x6d, 0x9f, 0x1e, 0xd8, + 0x9f, 0x8c, 0xbe, 0x64, 0x5e, 0xf2, 0x31, 0x4b, 0xa8, 0x8b, 0xcf, 0xe6, 0xc3, 0x4e, 0x36, 0x1f, + 0x42, 0x1d, 0x23, 0x55, 0x55, 0xfc, 0x19, 0xf4, 0x44, 0xea, 0x33, 0x69, 0xac, 0xed, 0xad, 0xef, + 0x6f, 0x1e, 0xde, 0xb5, 0x97, 0x5d, 0xae, 0x7d, 0x12, 0xf9, 0xdc, 0x7b, 0x46, 0x52, 0x9f, 0xb9, + 0x5b, 0xfa, 0x8a, 0x5e, 0x7e, 0x92, 0xa4, 0xa8, 0x68, 0xfd, 0xb4, 0x06, 0xb8, 0x21, 0xc6, 0xe5, + 0xe1, 0x98, 0x87, 0x93, 0x15, 0x68, 0xfa, 0x1c, 0xfa, 0x32, 0x55, 0x89, 0x52, 0xd6, 0xc1, 0xf2, + 0xb2, 0x1e, 0x16, 0x4c, 0xf7, 0x25, 0x7d, 0x45, 0x5f, 0x07, 0x24, 0xa9, 0x8a, 0xe2, 0x27, 0xb0, + 0x21, 0x22, 0x9f, 0x11, 0xf6, 0xd4, 0x58, 0x57, 0x0a, 0x6e, 0x50, 0x9f, 0x14, 0x44, 0x77, 0x5b, + 0xd7, 0xdf, 0xd0, 0x01, 0x52, 0x96, 0xb4, 0xbe, 0x47, 0xf0, 0x6a, 0x7b, 0x6e, 0x6e, 0xca, 0xfd, + 0x31, 0x13, 0xf8, 0x5b, 0x04, 0xd8, 0x6b, 0x65, 0xf5, 0x24, 0xdf, 0x5b, 0xbe, 0x8f, 0x05, 0x37, + 0xec, 0xea, 0x96, 0x16, 0x6c, 0x8d, 0x2c, 0xb8, 0xd3, 0xfa, 0x03, 0xc1, 0x2b, 0x6d, 0xe8, 0x03, + 0x2e, 0x13, 0xfc, 0xa4, 0xb5, 0x64, 0x7b, 0xb9, 0x25, 0xe7, 0x6c, 0xb5, 0xe2, 0x6a, 0xfe, 0x65, + 0xa4, 0xb1, 0x60, 0x0a, 0x3d, 0x9e, 0xb0, 0xa0, 0xdc, 0xee, 0x7f, 0x53, 0x5d, 0x7d, 0xbc, 0x47, + 0x79, 0x49, 0x52, 0x54, 0xb6, 0x7e, 0x43, 0xb0, 0xdd, 0x00, 0xaf, 0x40, 0xd4, 0xe3, 0xcb, 0xa2, + 0xde, 0xbe, 0x9d, 0xa8, 0xc5, 0x6a, 0xfe, 0x46, 0x00, 0xf5, 0x7b, 0xc5, 0x43, 0xe8, 0x9d, 0x32, + 0x31, 0x92, 0x06, 0xda, 0x5b, 0xdf, 0x1f, 0xb8, 0x83, 0x1c, 0xff, 0x28, 0x0f, 0x90, 0x22, 0x8e, + 0x5f, 0x87, 0x01, 0x8d, 0xf9, 0x87, 0x22, 0x4a, 0x63, 0x69, 0xac, 0x2b, 0xd0, 0x56, 0x36, 0x1f, + 0x0e, 0xee, 0x9f, 0x1c, 0x15, 0x41, 0x52, 0xe7, 0x73, 0xb0, 0x60, 0x32, 0x4a, 0x85, 0xc7, 0xa4, + 0xd1, 0xad, 0xc1, 0xa4, 0x0c, 0x92, 0x3a, 0x8f, 0xdf, 0x85, 0xad, 0xf2, 0x70, 0x4c, 0x03, 0x26, + 0x8d, 0x9e, 0x22, 0xec, 0x64, 0xf3, 0xe1, 0x16, 0x69, 0x26, 0xc8, 0x65, 0x1c, 0x7e, 0x1f, 0xb6, + 0xc3, 0x28, 0x2c, 0x21, 0x9f, 0x92, 0x07, 0xd2, 0x78, 0x41, 0x51, 0x5f, 0xce, 0xe6, 0xc3, 0xed, + 0xe3, 0xcb, 0x29, 0xf2, 0x6f, 0xac, 0xf5, 0x35, 0xec, 0x34, 0x0c, 0x4b, 0xbf, 0xa5, 0x29, 0x40, + 0x5c, 0x05, 0xf5, 0x4a, 0x6f, 0xe7, 0x80, 0x95, 0x21, 0xd5, 0x31, 0xd2, 0xa8, 0x6d, 0xfd, 0x82, + 0xa0, 0xfb, 0xff, 0x77, 0xf4, 0x1f, 0xd6, 0x60, 0xf3, 0xb9, 0x95, 0xdf, 0xc0, 0xca, 0x73, 0x17, + 0x59, 0xad, 0x35, 0xde, 0xde, 0x45, 0xae, 0xf7, 0xc4, 0x9f, 0x11, 0xf4, 0x57, 0x64, 0x86, 0x0f, + 0x2f, 0xcb, 0xb0, 0x6f, 0x28, 0x63, 0x71, 0xff, 0x5f, 0x41, 0xb9, 0x21, 0x7c, 0x07, 0xfa, 0xa5, + 0x81, 0xa9, 0xee, 0x07, 0x75, 0x37, 0xa5, 0xc7, 0x91, 0x0a, 0x81, 0xf7, 0xa0, 0x3b, 0xe3, 0xe1, + 0xd8, 0x58, 0x53, 0xc8, 0x17, 0x35, 0xb2, 0xfb, 0x11, 0x0f, 0xc7, 0x44, 0x65, 0x72, 0x44, 0x48, + 0x03, 0xa6, 0xbe, 0xa1, 0x06, 0x22, 0xb7, 0x2e, 0xa2, 0x32, 0xd6, 0x8f, 0x08, 0x36, 0xf4, 0xf7, + 0x57, 0xd5, 0x43, 0x57, 0xd6, 0x3b, 0x04, 0xa0, 0x31, 0x7f, 0xc4, 0x84, 0xe4, 0x51, 0xa8, 0xef, + 0xad, 0x5e, 0xca, 0xfd, 0x93, 0x23, 0x9d, 0x21, 0x0d, 0xd4, 0xf5, 0x3d, 0x60, 0x07, 0x06, 0xf9, + 0xaf, 0x8c, 0xa9, 0xc7, 0x8c, 0xae, 0x82, 0xed, 0x68, 0xd8, 0xe0, 0xb8, 0x4c, 0x90, 0x1a, 0xe3, + 0xbe, 0x76, 0x76, 0x61, 0x76, 0xce, 0x2f, 0xcc, 0xce, 0xef, 0x17, 0x66, 0xe7, 0x9b, 0xcc, 0x44, + 0x67, 0x99, 0x89, 0xce, 0x33, 0x13, 0xfd, 0x99, 0x99, 0xe8, 0xbb, 0xbf, 0xcc, 0xce, 0xe3, 0x7e, + 0x39, 0xf8, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x86, 0x70, 0x91, 0xa2, 0x51, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/rbac/v1alpha1/generated.proto b/pkg/apis/rbac/v1alpha1/generated.proto index 9107e785980ab..0075e36c6932f 100644 --- a/pkg/apis/rbac/v1alpha1/generated.proto +++ b/pkg/apis/rbac/v1alpha1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.rbac.v1alpha1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1alpha1"; diff --git a/pkg/apis/rbac/v1beta1/generated.pb.go b/pkg/apis/rbac/v1beta1/generated.pb.go index 90d8cb6a47514..df01ebec7298a 100644 --- a/pkg/apis/rbac/v1beta1/generated.pb.go +++ b/pkg/apis/rbac/v1beta1/generated.pb.go @@ -2760,58 +2760,57 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 839 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xbf, 0x6f, 0x23, 0x45, - 0x14, 0xf6, 0x24, 0xb6, 0x62, 0xbf, 0x10, 0x85, 0x0c, 0x12, 0x5a, 0x52, 0xac, 0xa3, 0x6d, 0x08, - 0xe2, 0x6e, 0xf7, 0x12, 0x4e, 0x1c, 0x12, 0xa2, 0xb8, 0xa5, 0x40, 0x11, 0x47, 0x88, 0x06, 0x71, - 0xe2, 0x97, 0xd0, 0x8d, 0xd7, 0x73, 0x9b, 0xc1, 0xfb, 0x4b, 0x33, 0xb3, 0x91, 0x4e, 0x50, 0xd0, - 0xd1, 0xf2, 0x4f, 0xd0, 0x51, 0x41, 0x4b, 0x45, 0x15, 0xa8, 0xae, 0xbc, 0xca, 0x22, 0xcb, 0x1f, - 0x02, 0xda, 0xdd, 0xd9, 0x1f, 0x8e, 0x1d, 0x62, 0x82, 0x64, 0x09, 0xe9, 0x2a, 0x7b, 0xde, 0xfb, - 0xbe, 0xf7, 0xde, 0x37, 0x6f, 0xf6, 0x83, 0x7b, 0x93, 0xb7, 0xa4, 0xcd, 0x63, 0x67, 0x92, 0x8e, - 0x98, 0x88, 0x98, 0x62, 0xd2, 0x49, 0x26, 0xbe, 0x43, 0x13, 0x2e, 0x1d, 0x31, 0xa2, 0x9e, 0x73, - 0x76, 0x30, 0x62, 0x8a, 0x1e, 0x38, 0x3e, 0x8b, 0x98, 0xa0, 0x8a, 0x8d, 0xed, 0x44, 0xc4, 0x2a, - 0xc6, 0xaf, 0x96, 0x44, 0xbb, 0x21, 0xda, 0xc9, 0xc4, 0xb7, 0x73, 0xa2, 0x9d, 0x13, 0x6d, 0x4d, - 0xdc, 0xbd, 0xed, 0x73, 0x75, 0x9a, 0x8e, 0x6c, 0x2f, 0x0e, 0x1d, 0x3f, 0xf6, 0x63, 0xa7, 0xe0, - 0x8f, 0xd2, 0xc7, 0xc5, 0xa9, 0x38, 0x14, 0xff, 0xca, 0xba, 0xbb, 0x77, 0xf5, 0x40, 0x34, 0xe1, - 0x21, 0xf5, 0x4e, 0x79, 0xc4, 0xc4, 0x93, 0x6a, 0x24, 0x47, 0x30, 0x19, 0xa7, 0xc2, 0x63, 0x97, - 0xa7, 0xf9, 0x47, 0x96, 0x74, 0x42, 0xa6, 0xa8, 0x73, 0x36, 0xa7, 0x61, 0xd7, 0xb9, 0x8a, 0x25, - 0xd2, 0x48, 0xf1, 0x70, 0xbe, 0xcd, 0x9b, 0xd7, 0x11, 0xa4, 0x77, 0xca, 0x42, 0x3a, 0xc7, 0xbb, - 0x75, 0xe5, 0x2d, 0x2f, 0x1a, 0xeb, 0x60, 0x31, 0x3a, 0x55, 0x3c, 0x70, 0x78, 0xa4, 0xa4, 0x12, - 0x97, 0x29, 0xd6, 0x6f, 0x08, 0x36, 0xdf, 0x0d, 0x52, 0xa9, 0x98, 0x20, 0x71, 0xc0, 0xf0, 0x23, - 0xe8, 0xe7, 0xa2, 0xc7, 0x54, 0x51, 0x03, 0xed, 0xa1, 0xfd, 0xcd, 0xc3, 0x3b, 0xb6, 0x5e, 0x58, - 0x7b, 0xf6, 0x66, 0x65, 0x39, 0xda, 0x3e, 0x3b, 0xb0, 0x3f, 0x1c, 0x7d, 0xc5, 0x3c, 0xf5, 0x01, - 0x53, 0xd4, 0xc5, 0xe7, 0xd3, 0x61, 0x27, 0x9b, 0x0e, 0xa1, 0x89, 0x91, 0xba, 0x2a, 0xfe, 0x04, - 0x7a, 0x22, 0x0d, 0x98, 0x34, 0xd6, 0xf6, 0xd6, 0xf7, 0x37, 0x0f, 0xdf, 0xb0, 0x97, 0x7c, 0x0f, - 0xf6, 0x49, 0x1c, 0x70, 0xef, 0x09, 0x49, 0x03, 0xe6, 0x6e, 0xe9, 0x0e, 0xbd, 0xfc, 0x24, 0x49, - 0x59, 0xd0, 0xfa, 0x79, 0x0d, 0x70, 0x4b, 0x8b, 0xcb, 0xa3, 0x31, 0x8f, 0xfc, 0x15, 0x48, 0xfa, - 0x12, 0xfa, 0x32, 0x2d, 0x12, 0x95, 0xaa, 0x3b, 0x4b, 0xab, 0xfa, 0xa8, 0x24, 0xba, 0x2f, 0xea, - 0x0e, 0x7d, 0x1d, 0x90, 0xa4, 0xae, 0x89, 0x3f, 0x87, 0x0d, 0x11, 0x07, 0x8c, 0xb0, 0xc7, 0xc6, - 0xfa, 0xac, 0x80, 0x6b, 0xcb, 0x93, 0x92, 0xe7, 0x6e, 0xeb, 0xf2, 0x1b, 0x3a, 0x40, 0xaa, 0x8a, - 0xd6, 0x0f, 0x08, 0x5e, 0x99, 0xbf, 0x35, 0x37, 0xe5, 0xc1, 0x98, 0x09, 0xfc, 0x1d, 0x02, 0xec, - 0xcd, 0x65, 0xf5, 0x3d, 0xbe, 0xbd, 0xf4, 0x18, 0x0b, 0x1a, 0xec, 0xea, 0x89, 0x16, 0xac, 0x8c, - 0x2c, 0x68, 0x69, 0x3d, 0x43, 0xf0, 0xf2, 0x3c, 0xf4, 0x01, 0x97, 0x0a, 0x7f, 0x31, 0xb7, 0x61, - 0x7b, 0xb9, 0x0d, 0xe7, 0xec, 0x62, 0xbf, 0xf5, 0xed, 0x57, 0x91, 0xd6, 0x76, 0x1f, 0x41, 0x8f, - 0x2b, 0x16, 0x56, 0xab, 0xfd, 0x4f, 0xa2, 0xeb, 0x87, 0x7b, 0x94, 0x57, 0x24, 0x65, 0x61, 0xeb, - 0x77, 0x04, 0xdb, 0x2d, 0xf0, 0x0a, 0x34, 0x7d, 0x3a, 0xab, 0xe9, 0xee, 0x8d, 0x34, 0x2d, 0x16, - 0xf3, 0x17, 0x02, 0x68, 0x3e, 0x55, 0x3c, 0x84, 0xde, 0x19, 0x13, 0x23, 0x69, 0xa0, 0xbd, 0xf5, - 0xfd, 0x81, 0x3b, 0xc8, 0xf1, 0x0f, 0xf3, 0x00, 0x29, 0xe3, 0xf8, 0x75, 0x18, 0xd0, 0x84, 0xbf, - 0x27, 0xe2, 0x34, 0x29, 0xc7, 0x19, 0xb8, 0x5b, 0xd9, 0x74, 0x38, 0xb8, 0x7f, 0x72, 0x54, 0x06, - 0x49, 0x93, 0xcf, 0xc1, 0x95, 0x95, 0x4b, 0x63, 0xbd, 0x01, 0x93, 0x2a, 0x48, 0x9a, 0x3c, 0xbe, - 0x07, 0x5b, 0xd5, 0xe1, 0x98, 0x86, 0x4c, 0x1a, 0xdd, 0x82, 0xb0, 0x93, 0x4d, 0x87, 0x5b, 0xa4, - 0x9d, 0x20, 0xb3, 0x38, 0xfc, 0x0e, 0x6c, 0x47, 0x71, 0x54, 0x41, 0x3e, 0x26, 0x0f, 0xa4, 0xd1, - 0x2b, 0xa8, 0x2f, 0x65, 0xd3, 0xe1, 0xf6, 0xf1, 0x6c, 0x8a, 0x5c, 0xc6, 0x5a, 0xdf, 0xc0, 0x4e, - 0xcb, 0xab, 0xf4, 0x87, 0xe4, 0x03, 0x24, 0x75, 0x50, 0x6f, 0xf4, 0x46, 0xde, 0x57, 0x5b, 0x51, - 0x13, 0x23, 0xad, 0xd2, 0xd6, 0xaf, 0x08, 0xba, 0xff, 0x7b, 0x2b, 0xff, 0x71, 0x0d, 0x36, 0x9f, - 0x7b, 0xf8, 0xd2, 0x1e, 0x9e, 0x1b, 0xc8, 0x6a, 0x4d, 0xf1, 0xc6, 0x06, 0x72, 0xbd, 0x1b, 0xfe, - 0x82, 0xa0, 0xbf, 0x22, 0x1b, 0x24, 0xb3, 0x2a, 0x6e, 0xff, 0x3b, 0x15, 0x8b, 0xc7, 0xff, 0x1a, - 0xaa, 0xfd, 0xe0, 0x5b, 0xd0, 0xaf, 0xac, 0xab, 0x18, 0x7e, 0xd0, 0x0c, 0x53, 0xb9, 0x1b, 0xa9, - 0x11, 0x78, 0x0f, 0xba, 0x13, 0x1e, 0x8d, 0x8d, 0xb5, 0x02, 0xf9, 0x82, 0x46, 0x76, 0xdf, 0xe7, - 0xd1, 0x98, 0x14, 0x99, 0x1c, 0x11, 0xd1, 0x90, 0x15, 0x0f, 0xa8, 0x85, 0xc8, 0x4d, 0x8b, 0x14, - 0x19, 0xeb, 0x27, 0x04, 0x1b, 0xfa, 0xf1, 0xd5, 0xf5, 0xd0, 0x95, 0xf5, 0x0e, 0x01, 0x68, 0xc2, - 0x1f, 0x32, 0x21, 0x79, 0x1c, 0xe9, 0xbe, 0xf5, 0x57, 0x72, 0xff, 0xe4, 0x48, 0x67, 0x48, 0x0b, - 0x75, 0xfd, 0x0c, 0xd8, 0x81, 0x41, 0xfe, 0x2b, 0x13, 0xea, 0x31, 0xa3, 0x5b, 0xc0, 0x76, 0x34, - 0x6c, 0x70, 0x5c, 0x25, 0x48, 0x83, 0x71, 0x5f, 0x3b, 0xbf, 0x30, 0x3b, 0x4f, 0x2f, 0xcc, 0xce, - 0xb3, 0x0b, 0xb3, 0xf3, 0x6d, 0x66, 0xa2, 0xf3, 0xcc, 0x44, 0x4f, 0x33, 0x13, 0xfd, 0x91, 0x99, - 0xe8, 0xfb, 0x3f, 0xcd, 0xce, 0x67, 0x1b, 0xfa, 0xde, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x14, - 0x07, 0x5d, 0xd2, 0x76, 0x0c, 0x00, 0x00, + // 830 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xbf, 0x6f, 0xe4, 0x44, + 0x14, 0xde, 0x49, 0x76, 0x95, 0xdd, 0x17, 0xa2, 0x90, 0x41, 0x42, 0x26, 0x85, 0x37, 0x72, 0x43, + 0x10, 0x77, 0xf6, 0x25, 0x77, 0xe2, 0x90, 0x10, 0xc5, 0x99, 0x02, 0x45, 0x1c, 0x21, 0x1a, 0xc4, + 0x89, 0x5f, 0x42, 0x37, 0xeb, 0x9d, 0x73, 0x86, 0xf5, 0x2f, 0xcd, 0x8c, 0x23, 0x9d, 0xa0, 0xa0, + 0xa3, 0xe5, 0x9f, 0xa0, 0xa3, 0x82, 0x96, 0x8a, 0x2a, 0x50, 0x5d, 0x79, 0xd5, 0x8a, 0x98, 0x3f, + 0x04, 0x64, 0x7b, 0xfc, 0x63, 0xf1, 0x46, 0x59, 0x82, 0x14, 0x09, 0x89, 0x6a, 0x77, 0xde, 0xfb, + 0xbe, 0x37, 0xef, 0x7b, 0xcf, 0xf3, 0xc1, 0xfd, 0xd9, 0x9b, 0xd2, 0xe6, 0xb1, 0x33, 0x4b, 0x27, + 0x4c, 0x44, 0x4c, 0x31, 0xe9, 0x24, 0x33, 0xdf, 0xa1, 0x09, 0x97, 0x8e, 0x98, 0x50, 0xcf, 0x39, + 0x3b, 0x98, 0x30, 0x45, 0x0f, 0x1c, 0x9f, 0x45, 0x4c, 0x50, 0xc5, 0xa6, 0x76, 0x22, 0x62, 0x15, + 0xe3, 0x57, 0x4b, 0xa2, 0xdd, 0x10, 0xed, 0x64, 0xe6, 0xdb, 0x39, 0xd1, 0xce, 0x89, 0xb6, 0x26, + 0xee, 0xde, 0xf6, 0xb9, 0x3a, 0x4d, 0x27, 0xb6, 0x17, 0x87, 0x8e, 0x1f, 0xfb, 0xb1, 0x53, 0xf0, + 0x27, 0xe9, 0x93, 0xe2, 0x54, 0x1c, 0x8a, 0x7f, 0x65, 0xdd, 0xdd, 0x7b, 0xba, 0x21, 0x9a, 0xf0, + 0x90, 0x7a, 0xa7, 0x3c, 0x62, 0xe2, 0x69, 0xd3, 0x52, 0xc8, 0x14, 0x75, 0xce, 0x3a, 0xdd, 0xec, + 0x3a, 0x97, 0xb1, 0x44, 0x1a, 0x29, 0x1e, 0xb2, 0x0e, 0xe1, 0x8d, 0xab, 0x08, 0xd2, 0x3b, 0x65, + 0x21, 0xed, 0xf0, 0xee, 0x5e, 0xc6, 0x4b, 0x15, 0x0f, 0x1c, 0x1e, 0x29, 0xa9, 0x44, 0x87, 0x74, + 0xeb, 0xd2, 0x21, 0x2f, 0xd1, 0x62, 0xfd, 0x8a, 0x60, 0xf3, 0x9d, 0x20, 0x95, 0x8a, 0x09, 0x12, + 0x07, 0x0c, 0x3f, 0x86, 0x61, 0x2e, 0x7b, 0x4a, 0x15, 0x35, 0xd0, 0x1e, 0xda, 0xdf, 0x3c, 0xbc, + 0x63, 0xeb, 0xe1, 0xb7, 0xbb, 0x68, 0xc6, 0x9f, 0xa3, 0xed, 0xb3, 0x03, 0xfb, 0x83, 0xc9, 0x97, + 0xcc, 0x53, 0xef, 0x33, 0x45, 0x5d, 0x7c, 0x3e, 0x1f, 0xf7, 0xb2, 0xf9, 0x18, 0x9a, 0x18, 0xa9, + 0xab, 0xe2, 0x8f, 0x61, 0x20, 0xd2, 0x80, 0x49, 0x63, 0x6d, 0x6f, 0x7d, 0x7f, 0xf3, 0xf0, 0xae, + 0xbd, 0xe2, 0x6e, 0xed, 0x93, 0x38, 0xe0, 0xde, 0x53, 0x92, 0x06, 0xcc, 0xdd, 0xd2, 0x37, 0x0c, + 0xf2, 0x93, 0x24, 0x65, 0x41, 0xeb, 0xa7, 0x35, 0xc0, 0x2d, 0x2d, 0x2e, 0x8f, 0xa6, 0x3c, 0xf2, + 0x6f, 0x40, 0xd2, 0x17, 0x30, 0x94, 0x69, 0x91, 0xa8, 0x54, 0xdd, 0x59, 0x59, 0xd5, 0x87, 0x25, + 0xd1, 0x7d, 0x51, 0xdf, 0x30, 0xd4, 0x01, 0x49, 0xea, 0x9a, 0xf8, 0x33, 0xd8, 0x10, 0x71, 0xc0, + 0x08, 0x7b, 0x62, 0xac, 0x2f, 0x0a, 0xb8, 0xb2, 0x3c, 0x29, 0x79, 0xee, 0xb6, 0x2e, 0xbf, 0xa1, + 0x03, 0xa4, 0xaa, 0x68, 0x7d, 0x8f, 0xe0, 0x95, 0xee, 0xd4, 0xdc, 0x94, 0x07, 0x53, 0x26, 0xf0, + 0xb7, 0x08, 0xb0, 0xd7, 0xc9, 0xea, 0x39, 0xbe, 0xb5, 0x72, 0x1b, 0x4b, 0x2e, 0xd8, 0xd5, 0x1d, + 0x2d, 0x59, 0x19, 0x59, 0x72, 0xa5, 0xf5, 0x1c, 0xc1, 0xcb, 0x5d, 0xe8, 0x43, 0x2e, 0x15, 0xfe, + 0xbc, 0xb3, 0x61, 0x7b, 0xb5, 0x0d, 0xe7, 0xec, 0x62, 0xbf, 0xf5, 0xf4, 0xab, 0x48, 0x6b, 0xbb, + 0x8f, 0x61, 0xc0, 0x15, 0x0b, 0xab, 0xd5, 0xfe, 0x2b, 0xd1, 0xf5, 0x87, 0x7b, 0x94, 0x57, 0x24, + 0x65, 0x61, 0xeb, 0x37, 0x04, 0xdb, 0x2d, 0xf0, 0x0d, 0x68, 0xfa, 0x64, 0x51, 0xd3, 0xbd, 0x6b, + 0x69, 0x5a, 0x2e, 0xe6, 0x4f, 0x04, 0xd0, 0x3c, 0x55, 0x3c, 0x86, 0xc1, 0x19, 0x13, 0x13, 0x69, + 0xa0, 0xbd, 0xf5, 0xfd, 0x91, 0x3b, 0xca, 0xf1, 0x8f, 0xf2, 0x00, 0x29, 0xe3, 0xf8, 0x75, 0x18, + 0xd1, 0x84, 0xbf, 0x2b, 0xe2, 0x34, 0x29, 0xdb, 0x19, 0xb9, 0x5b, 0xd9, 0x7c, 0x3c, 0x7a, 0x70, + 0x72, 0x54, 0x06, 0x49, 0x93, 0xcf, 0xc1, 0x82, 0xc9, 0x38, 0x15, 0x1e, 0x93, 0xc6, 0x7a, 0x03, + 0x26, 0x55, 0x90, 0x34, 0x79, 0x7c, 0x1f, 0xb6, 0xaa, 0xc3, 0x31, 0x0d, 0x99, 0x34, 0xfa, 0x05, + 0x61, 0x27, 0x9b, 0x8f, 0xb7, 0x48, 0x3b, 0x41, 0x16, 0x71, 0xf8, 0x6d, 0xd8, 0x8e, 0xe2, 0xa8, + 0x82, 0x7c, 0x44, 0x1e, 0x4a, 0x63, 0x50, 0x50, 0x5f, 0xca, 0xe6, 0xe3, 0xed, 0xe3, 0xc5, 0x14, + 0xf9, 0x3b, 0xd6, 0xfa, 0x1a, 0x76, 0x5a, 0x5e, 0xa5, 0x1f, 0x92, 0x0f, 0x90, 0xd4, 0x41, 0xbd, + 0xd1, 0x6b, 0x79, 0x5f, 0x6d, 0x45, 0x4d, 0x8c, 0xb4, 0x4a, 0x5b, 0xbf, 0x20, 0xe8, 0xff, 0xe7, + 0xad, 0xfc, 0x87, 0x35, 0xd8, 0xfc, 0xdf, 0xc3, 0x57, 0xf6, 0xf0, 0xdc, 0x40, 0x6e, 0xd6, 0x14, + 0xaf, 0x6d, 0x20, 0x57, 0xbb, 0xe1, 0xcf, 0x08, 0x86, 0x37, 0x64, 0x83, 0x64, 0x51, 0xc5, 0xed, + 0x7f, 0xa6, 0x62, 0x79, 0xfb, 0x5f, 0x41, 0xb5, 0x1f, 0x7c, 0x0b, 0x86, 0x95, 0x75, 0x15, 0xcd, + 0x8f, 0x9a, 0x66, 0x2a, 0x77, 0x23, 0x35, 0x02, 0xef, 0x41, 0x7f, 0xc6, 0xa3, 0xa9, 0xb1, 0x56, + 0x20, 0x5f, 0xd0, 0xc8, 0xfe, 0x7b, 0x3c, 0x9a, 0x92, 0x22, 0x93, 0x23, 0x22, 0x1a, 0xb2, 0xe2, + 0x03, 0x6a, 0x21, 0x72, 0xd3, 0x22, 0x45, 0xc6, 0xfa, 0x11, 0xc1, 0x86, 0xfe, 0xf8, 0xea, 0x7a, + 0xe8, 0xd2, 0x7a, 0x87, 0x00, 0x34, 0xe1, 0x8f, 0x98, 0x90, 0x3c, 0x8e, 0xf4, 0xbd, 0xf5, 0x2b, + 0x79, 0x70, 0x72, 0xa4, 0x33, 0xa4, 0x85, 0xba, 0xba, 0x07, 0xec, 0xc0, 0x28, 0xff, 0x95, 0x09, + 0xf5, 0x98, 0xd1, 0x2f, 0x60, 0x3b, 0x1a, 0x36, 0x3a, 0xae, 0x12, 0xa4, 0xc1, 0xb8, 0xaf, 0x9d, + 0x5f, 0x98, 0xbd, 0x67, 0x17, 0x66, 0xef, 0xf9, 0x85, 0xd9, 0xfb, 0x26, 0x33, 0xd1, 0x79, 0x66, + 0xa2, 0x67, 0x99, 0x89, 0x7e, 0xcf, 0x4c, 0xf4, 0xdd, 0x1f, 0x66, 0xef, 0xd3, 0x0d, 0x3d, 0xf7, + 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x8e, 0x36, 0x37, 0x42, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/rbac/v1beta1/generated.proto b/pkg/apis/rbac/v1beta1/generated.proto index 04806da8b6cd9..9ef26d71b445a 100644 --- a/pkg/apis/rbac/v1beta1/generated.proto +++ b/pkg/apis/rbac/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.rbac.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/storage/v1beta1/generated.pb.go b/pkg/apis/storage/v1beta1/generated.pb.go index 248eea13f39ef..222581338e969 100644 --- a/pkg/apis/storage/v1beta1/generated.pb.go +++ b/pkg/apis/storage/v1beta1/generated.pb.go @@ -696,36 +696,35 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 483 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x3b, 0x2d, 0xc5, 0xdd, 0xa9, 0x62, 0x89, 0x1e, 0x4a, 0x0f, 0xd9, 0xb2, 0xa7, 0x2a, - 0x3a, 0x63, 0x17, 0x95, 0xb2, 0xe0, 0xa5, 0x22, 0x28, 0x28, 0x2e, 0xf1, 0x26, 0x0a, 0x4e, 0xb2, - 0xcf, 0x74, 0x4c, 0x93, 0x09, 0x33, 0x2f, 0x81, 0x82, 0x07, 0xff, 0x04, 0xff, 0xac, 0xde, 0xdc, - 0xa3, 0xa7, 0xc5, 0x46, 0xff, 0x10, 0xc9, 0x8f, 0xdd, 0x84, 0x76, 0x57, 0x97, 0xbd, 0xe5, 0xcd, - 0xbc, 0xcf, 0xf7, 0x7d, 0xdf, 0x77, 0x42, 0x0f, 0x83, 0xa9, 0x61, 0x52, 0xf1, 0x20, 0x71, 0x41, - 0x47, 0x80, 0x60, 0x78, 0x1c, 0xf8, 0x5c, 0xc4, 0xd2, 0x70, 0x83, 0x4a, 0x0b, 0x1f, 0x78, 0x3a, - 0x71, 0x01, 0xc5, 0x84, 0xfb, 0x10, 0x81, 0x16, 0x08, 0xc7, 0x2c, 0xd6, 0x0a, 0x95, 0x75, 0xbf, - 0x64, 0x59, 0xcd, 0xb2, 0x38, 0xf0, 0x59, 0xce, 0xb2, 0x8a, 0x65, 0x15, 0x3b, 0x7c, 0xe8, 0x4b, - 0x9c, 0x27, 0x2e, 0xf3, 0x54, 0xc8, 0x7d, 0xe5, 0x2b, 0x5e, 0x48, 0xb8, 0xc9, 0xe7, 0xa2, 0x2a, - 0x8a, 0xe2, 0xab, 0x94, 0x1e, 0x3e, 0xae, 0x6c, 0x89, 0x58, 0x86, 0xc2, 0x9b, 0xcb, 0x08, 0xf4, - 0xf2, 0xcc, 0x18, 0xd7, 0x60, 0x54, 0xa2, 0x3d, 0xd8, 0x34, 0xf4, 0x4f, 0xca, 0xf0, 0x10, 0x50, - 0xf0, 0x74, 0x6b, 0x8d, 0x21, 0xbf, 0x8c, 0xd2, 0x49, 0x84, 0x32, 0xdc, 0x1e, 0xf3, 0xf4, 0x7f, - 0x80, 0xf1, 0xe6, 0x10, 0x8a, 0x2d, 0xee, 0xc1, 0xa5, 0x59, 0x5f, 0x64, 0x6b, 0x72, 0x71, 0x77, - 0x82, 0x72, 0xc1, 0x65, 0x84, 0x06, 0xf5, 0x26, 0xb2, 0xff, 0xa7, 0x4d, 0x6f, 0xbe, 0x2b, 0x83, - 0x7f, 0xbe, 0x10, 0xc6, 0x58, 0x9f, 0xe8, 0x4e, 0xbe, 0xf5, 0xb1, 0x40, 0x31, 0x20, 0x23, 0x32, - 0xee, 0x1d, 0x3c, 0x62, 0xd5, 0xa3, 0x35, 0xcd, 0xd7, 0xcf, 0x96, 0x77, 0xb3, 0x74, 0xc2, 0xde, - 0xba, 0x5f, 0xc0, 0xc3, 0x37, 0x80, 0x62, 0x66, 0xad, 0x4e, 0xf7, 0x5a, 0xd9, 0xe9, 0x1e, 0xad, - 0xcf, 0x9c, 0x73, 0x55, 0xeb, 0x09, 0xed, 0xc5, 0x5a, 0xa5, 0xd2, 0x48, 0x15, 0x81, 0x1e, 0xb4, - 0x47, 0x64, 0xbc, 0x3b, 0xbb, 0x53, 0x21, 0xbd, 0xa3, 0xfa, 0xca, 0x69, 0xf6, 0x59, 0x5f, 0x29, - 0x8d, 0x85, 0x16, 0x21, 0x20, 0x68, 0x33, 0xe8, 0x8c, 0x3a, 0xe3, 0xde, 0xc1, 0x4b, 0x76, 0xf5, - 0xff, 0x89, 0x35, 0xd7, 0x64, 0x47, 0xe7, 0x52, 0x2f, 0x22, 0xd4, 0xcb, 0xda, 0x72, 0x7d, 0xe1, - 0x34, 0xe6, 0x0d, 0x9f, 0xd1, 0xdb, 0x1b, 0x88, 0xd5, 0xa7, 0x9d, 0x00, 0x96, 0x45, 0x48, 0xbb, - 0x4e, 0xfe, 0x69, 0xdd, 0xa5, 0xdd, 0x54, 0x2c, 0x12, 0x28, 0x77, 0x72, 0xca, 0xe2, 0xb0, 0x3d, - 0x25, 0xfb, 0x3f, 0x08, 0xed, 0x37, 0xe7, 0xbf, 0x96, 0x06, 0xad, 0x0f, 0x5b, 0x51, 0xb3, 0xab, - 0x45, 0x9d, 0xd3, 0x45, 0xd0, 0xfd, 0xca, 0xf5, 0xce, 0xd9, 0x49, 0x23, 0xe6, 0x8f, 0xb4, 0x2b, - 0x11, 0x42, 0x33, 0x68, 0x17, 0x51, 0x4d, 0xaf, 0x1b, 0xd5, 0xec, 0x56, 0x35, 0xa4, 0xfb, 0x2a, - 0x97, 0x73, 0x4a, 0xd5, 0xd9, 0xbd, 0xd5, 0xda, 0x6e, 0x9d, 0xac, 0xed, 0xd6, 0xcf, 0xb5, 0xdd, - 0xfa, 0x96, 0xd9, 0x64, 0x95, 0xd9, 0xe4, 0x24, 0xb3, 0xc9, 0xaf, 0xcc, 0x26, 0xdf, 0x7f, 0xdb, - 0xad, 0xf7, 0x37, 0x2a, 0xb5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0x2f, 0x57, 0x0f, 0x31, - 0x04, 0x00, 0x00, + // 470 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0x8b, 0xd3, 0x40, + 0x18, 0xc6, 0x33, 0x2d, 0xc5, 0xdd, 0xa9, 0x62, 0x89, 0x1e, 0x4a, 0x0f, 0xd9, 0xb2, 0xa7, 0x2a, + 0x3a, 0x63, 0xd7, 0x3f, 0x94, 0x05, 0x2f, 0x15, 0x41, 0x41, 0x71, 0x89, 0x37, 0x51, 0x70, 0xd2, + 0x7d, 0x4d, 0xc7, 0x34, 0x99, 0x30, 0xf3, 0x26, 0x50, 0xf0, 0xe0, 0x47, 0xf0, 0x63, 0xf5, 0xe6, + 0x1e, 0x3d, 0x2d, 0x36, 0xfa, 0x41, 0x24, 0x7f, 0xdc, 0x04, 0x63, 0x71, 0xf1, 0x36, 0xef, 0xcc, + 0xfc, 0x9e, 0xf7, 0x79, 0x9f, 0x19, 0x7a, 0x1c, 0xcc, 0x0c, 0x93, 0x8a, 0x07, 0x89, 0x07, 0x3a, + 0x02, 0x04, 0xc3, 0xe3, 0xc0, 0xe7, 0x22, 0x96, 0x86, 0x1b, 0x54, 0x5a, 0xf8, 0xc0, 0xd3, 0xa9, + 0x07, 0x28, 0xa6, 0xdc, 0x87, 0x08, 0xb4, 0x40, 0x38, 0x65, 0xb1, 0x56, 0xa8, 0xec, 0xdb, 0x25, + 0xcb, 0x6a, 0x96, 0xc5, 0x81, 0xcf, 0x72, 0x96, 0x55, 0x2c, 0xab, 0xd8, 0xd1, 0x5d, 0x5f, 0xe2, + 0x32, 0xf1, 0xd8, 0x42, 0x85, 0xdc, 0x57, 0xbe, 0xe2, 0x85, 0x84, 0x97, 0x7c, 0x28, 0xaa, 0xa2, + 0x28, 0x56, 0xa5, 0xf4, 0xe8, 0x41, 0x65, 0x4b, 0xc4, 0x32, 0x14, 0x8b, 0xa5, 0x8c, 0x40, 0xaf, + 0x6b, 0x63, 0x21, 0xa0, 0xe0, 0x69, 0xcb, 0xd0, 0x88, 0xef, 0xa2, 0x74, 0x12, 0xa1, 0x0c, 0xa1, + 0x05, 0x3c, 0xfa, 0x17, 0x60, 0x16, 0x4b, 0x08, 0x45, 0x8b, 0xbb, 0xbf, 0x8b, 0x4b, 0x50, 0xae, + 0xb8, 0x8c, 0xd0, 0xa0, 0x6e, 0x41, 0x77, 0x76, 0x46, 0xfd, 0x97, 0x59, 0x0e, 0x7f, 0x76, 0xe8, + 0xd5, 0xd7, 0x65, 0x88, 0x4f, 0x56, 0xc2, 0x18, 0xfb, 0x3d, 0xdd, 0xcb, 0xe7, 0x3e, 0x15, 0x28, + 0x86, 0x64, 0x4c, 0x26, 0xfd, 0xa3, 0x7b, 0xac, 0x7a, 0x80, 0xa6, 0x8d, 0xfa, 0x09, 0xf2, 0xdb, + 0x2c, 0x9d, 0xb2, 0x57, 0xde, 0x47, 0x58, 0xe0, 0x4b, 0x40, 0x31, 0xb7, 0x37, 0xe7, 0x07, 0x56, + 0x76, 0x7e, 0x40, 0xeb, 0x3d, 0xf7, 0x42, 0xd5, 0x7e, 0x48, 0xfb, 0xb1, 0x56, 0xa9, 0x34, 0x52, + 0x45, 0xa0, 0x87, 0x9d, 0x31, 0x99, 0xec, 0xcf, 0x6f, 0x54, 0x48, 0xff, 0xa4, 0x3e, 0x72, 0x9b, + 0xf7, 0xec, 0x4f, 0x94, 0xc6, 0x42, 0x8b, 0x10, 0x10, 0xb4, 0x19, 0x76, 0xc7, 0xdd, 0x49, 0xff, + 0xe8, 0x19, 0xbb, 0xfc, 0xdf, 0x60, 0xcd, 0x31, 0xd9, 0xc9, 0x85, 0xd4, 0xd3, 0x08, 0xf5, 0xba, + 0xb6, 0x5c, 0x1f, 0xb8, 0x8d, 0x7e, 0xa3, 0xc7, 0xf4, 0xfa, 0x1f, 0x88, 0x3d, 0xa0, 0xdd, 0x00, + 0xd6, 0x45, 0x48, 0xfb, 0x6e, 0xbe, 0xb4, 0x6f, 0xd2, 0x5e, 0x2a, 0x56, 0x09, 0x94, 0x33, 0xb9, + 0x65, 0x71, 0xdc, 0x99, 0x91, 0xc3, 0xaf, 0x84, 0x0e, 0x9a, 0xfd, 0x5f, 0x48, 0x83, 0xf6, 0xdb, + 0x56, 0xd4, 0xec, 0x72, 0x51, 0xe7, 0x74, 0x11, 0xf4, 0xa0, 0x72, 0xbd, 0xf7, 0x7b, 0xa7, 0x11, + 0xf3, 0x3b, 0xda, 0x93, 0x08, 0xa1, 0x19, 0x76, 0x8a, 0xa8, 0x66, 0xff, 0x1b, 0xd5, 0xfc, 0x5a, + 0xd5, 0xa4, 0xf7, 0x3c, 0x97, 0x73, 0x4b, 0xd5, 0xf9, 0xad, 0xcd, 0xd6, 0xb1, 0xce, 0xb6, 0x8e, + 0xf5, 0x6d, 0xeb, 0x58, 0x9f, 0x33, 0x87, 0x6c, 0x32, 0x87, 0x9c, 0x65, 0x0e, 0xf9, 0x9e, 0x39, + 0xe4, 0xcb, 0x0f, 0xc7, 0x7a, 0x73, 0xa5, 0x52, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xbc, + 0x1f, 0x4d, 0xfd, 0x03, 0x00, 0x00, } diff --git a/pkg/apis/storage/v1beta1/generated.proto b/pkg/apis/storage/v1beta1/generated.proto index 752c03fa71443..d8b387f61c010 100644 --- a/pkg/apis/storage/v1beta1/generated.proto +++ b/pkg/apis/storage/v1beta1/generated.proto @@ -21,12 +21,11 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.storage.v1beta1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; 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"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 020e7ea327267..6c876e6f30912 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -66,10 +66,10 @@ go_test( "//pkg/controller:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/controller/informers:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/client-go/testing", ], diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 7699fc3ecbf9d..805152b7429a2 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" @@ -34,7 +35,6 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/controller/informers" - "k8s.io/kubernetes/pkg/util/intstr" ) var ( diff --git a/pkg/controller/deployment/rolling_test.go b/pkg/controller/deployment/rolling_test.go index 8d62f4b42f052..0da9b2babbb9f 100644 --- a/pkg/controller/deployment/rolling_test.go +++ b/pkg/controller/deployment/rolling_test.go @@ -19,11 +19,11 @@ package deployment import ( "testing" + "k8s.io/apimachinery/pkg/util/intstr" core "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestDeploymentController_reconcileNewReplicaSet(t *testing.T) { diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index b3457816f65d1..9e25457d4fb75 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -21,6 +21,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" testclient "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" @@ -28,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/controller/informers" - "k8s.io/kubernetes/pkg/util/intstr" ) func maxSurge(val int) *intstr.IntOrString { diff --git a/pkg/controller/deployment/util/BUILD b/pkg/controller/deployment/util/BUILD index 29ebc645ec332..93f7454ab4951 100644 --- a/pkg/controller/deployment/util/BUILD +++ b/pkg/controller/deployment/util/BUILD @@ -29,7 +29,6 @@ go_library( "//pkg/client/retry:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/hash:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/equality", @@ -38,6 +37,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/util/integer", ], @@ -56,11 +56,11 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index 7ad13c5edc0a7..d201b60280ada 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/errors" + intstrutil "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" @@ -41,7 +42,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/legacylisters" "k8s.io/kubernetes/pkg/controller" - intstrutil "k8s.io/kubernetes/pkg/util/intstr" labelsutil "k8s.io/kubernetes/pkg/util/labels" ) diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index e8edfde391a09..e1294a787c0f8 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -27,12 +27,12 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/util/intstr" ) func addListRSReactor(fakeClient *fake.Clientset, obj runtime.Object) *fake.Clientset { diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index f423b3b773b80..e27160658dde5 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -24,11 +24,11 @@ go_library( "//pkg/client/legacylisters:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", @@ -51,8 +51,8 @@ go_test( "//pkg/client/legacylisters:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/workqueue", diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 587204ca42efb..e0051338160dd 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/client/legacylisters" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/intstr" "github.com/golang/glog" ) diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index d9b3fd446ba5a..72b1fa58bfe59 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -24,6 +24,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/client/legacylisters" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/intstr" ) type pdbStates map[string]policy.PodDisruptionBudget diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index 97239db6d7d64..8464c48546ac9 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -50,9 +50,9 @@ go_test( "//pkg/api/v1/endpoints:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/controller:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/testing", diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index fa88e6f4543f7..5ebb90725de90 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" utiltesting "k8s.io/client-go/util/testing" @@ -33,7 +34,6 @@ import ( endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/intstr" ) var alwaysReady = func() bool { return true } diff --git a/pkg/controller/resourcequota/BUILD b/pkg/controller/resourcequota/BUILD index 7c3b311fa392f..beb64ca7a1815 100644 --- a/pkg/controller/resourcequota/BUILD +++ b/pkg/controller/resourcequota/BUILD @@ -54,11 +54,11 @@ go_test( "//pkg/controller:go_default_library", "//pkg/quota/generic:go_default_library", "//pkg/quota/install:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/client-go/testing", ], diff --git a/pkg/controller/resourcequota/replenishment_controller_test.go b/pkg/controller/resourcequota/replenishment_controller_test.go index d6be0af39780f..7a1224b293824 100644 --- a/pkg/controller/resourcequota/replenishment_controller_test.go +++ b/pkg/controller/resourcequota/replenishment_controller_test.go @@ -22,10 +22,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/intstr" ) // testReplenishment lets us test replenishment functions are invoked diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go index 3f791e2996337..5e6b4c412deae 100644 --- a/pkg/generated/bindata.go +++ b/pkg/generated/bindata.go @@ -188,7 +188,7 @@ func translationsKubectlOwners() (*asset, error) { return a, nil } -var _translationsKubectlDefaultLc_messagesK8sMo = []byte("\xde\x12\x04\x95\x00\x00\x00\x00\x11\x00\x00\x00\x1c\x00\x00\x00\xa4\x00\x00\x00\x17\x00\x00\x00,\x01\x00\x00\x00\x00\x00\x00\x88\x01\x00\x00q\x00\x00\x00\x89\x01\x00\x00a\x00\x00\x00\xfb\x01\x00\x00a\x00\x00\x00]\x02\x00\x00;\x00\x00\x00\xbf\x02\x00\x00U\x00\x00\x00\xfb\x02\x00\x00\x83\x00\x00\x00Q\x03\x00\x009\x00\x00\x00\xd5\x03\x00\x00/\x00\x00\x00\x0f\x04\x00\x00E\x00\x00\x00?\x04\x00\x00E\x00\x00\x00\x85\x04\x00\x00?\x00\x00\x00\xcb\x04\x00\x00[\x00\x00\x00\v\x05\x00\x00[\x00\x00\x00g\x05\x00\x00_\x00\x00\x00\xc3\x05\x00\x00I\x00\x00\x00#\x06\x00\x00(\x01\x00\x00m\x06\x00\x00\xac\x01\x00\x00\x96\a\x00\x008\x00\x00\x00C\t\x00\x000\x00\x00\x00|\t\x00\x000\x00\x00\x00\xad\t\x00\x00\x1d\x00\x00\x00\xde\t\x00\x00*\x00\x00\x00\xfc\t\x00\x00A\x00\x00\x00'\n\x00\x00\x1c\x00\x00\x00i\n\x00\x00\x17\x00\x00\x00\x86\n\x00\x00\"\x00\x00\x00\x9e\n\x00\x00\"\x00\x00\x00\xc1\n\x00\x00\x1f\x00\x00\x00\xe4\n\x00\x00-\x00\x00\x00\x04\v\x00\x00-\x00\x00\x002\v\x00\x00/\x00\x00\x00`\v\x00\x00$\x00\x00\x00\x90\v\x00\x00\xc3\x00\x00\x00\xb5\v\x00\x00\x01\x00\x00\x00\x0f\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\a\x00\x00\x00\n\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\b\x00\x00\x00\t\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\v\x00\x00\x00\r\x00\x00\x00\f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x00\x00\x00\x00Apply a configuration to a resource by filename or stdin\x04Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x04Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x04Delete the specified context from the kubeconfig\x00Describe one or many contexts\x04Describe one or many contexts\x00Display clusters defined in the kubeconfig\x04Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x04Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x04Displays the current-context\x00Modify kubeconfig files\x04Modify kubeconfig files\x00Sets a cluster entry in kubeconfig\x04Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x04Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x04Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x04Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x04Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x04Unsets an individual value in a kubeconfig file\x00Update the annotations on a resource\x04Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resources were found\x04watch is only supported on individual resources and resource collections - %d resources were found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00Project-Id-Version: gettext-go-examples-hello\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2013-12-12 20:03+0000\nPO-Revision-Date: 2017-01-27 20:30-0800\nLast-Translator: Brendan Burns \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.6.10\nX-Poedit-SourceCharset: UTF-8\nLanguage-Team: \nPlural-Forms: nplurals=2; plural=(n != 1);\nLanguage: en\n\x00Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x00Describe one or many contexts\x00Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x00Modify kubeconfig files\x00Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x00Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resource was found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00") +var _translationsKubectlDefaultLc_messagesK8sMo = []byte("\xde\x12\x04\x95\x00\x00\x00\x00\x15\x00\x00\x00\x1c\x00\x00\x00\xc4\x00\x00\x00\x1d\x00\x00\x00l\x01\x00\x00\x00\x00\x00\x00\xe0\x01\x00\x00q\x00\x00\x00\xe1\x01\x00\x00a\x00\x00\x00S\x02\x00\x00a\x00\x00\x00\xb5\x02\x00\x00;\x00\x00\x00\x17\x03\x00\x00U\x00\x00\x00S\x03\x00\x00\x83\x00\x00\x00\xa9\x03\x00\x009\x00\x00\x00-\x04\x00\x00/\x00\x00\x00g\x04\x00\x00A\x00\x00\x00\x97\x04\x00\x00=\x00\x00\x00\xd9\x04\x00\x00E\x00\x00\x00\x17\x05\x00\x00E\x00\x00\x00]\x05\x00\x00?\x00\x00\x00\xa3\x05\x00\x00[\x00\x00\x00\xe3\x05\x00\x00[\x00\x00\x00?\x06\x00\x00_\x00\x00\x00\x9b\x06\x00\x00=\x00\x00\x00\xfb\x06\x00\x00{\x00\x00\x009\a\x00\x00I\x00\x00\x00\xb5\a\x00\x00(\x01\x00\x00\xff\a\x00\x00\xac\x01\x00\x00(\t\x00\x008\x00\x00\x00\xd5\n\x00\x000\x00\x00\x00\x0e\v\x00\x000\x00\x00\x00?\v\x00\x00\x1d\x00\x00\x00p\v\x00\x00*\x00\x00\x00\x8e\v\x00\x00A\x00\x00\x00\xb9\v\x00\x00\x1c\x00\x00\x00\xfb\v\x00\x00\x17\x00\x00\x00\x18\f\x00\x00 \x00\x00\x000\f\x00\x00\x1e\x00\x00\x00Q\f\x00\x00\"\x00\x00\x00p\f\x00\x00\"\x00\x00\x00\x93\f\x00\x00\x1f\x00\x00\x00\xb6\f\x00\x00-\x00\x00\x00\xd6\f\x00\x00-\x00\x00\x00\x04\r\x00\x00/\x00\x00\x002\r\x00\x00\x1e\x00\x00\x00b\r\x00\x00=\x00\x00\x00\x81\r\x00\x00$\x00\x00\x00\xbf\r\x00\x00\xc3\x00\x00\x00\xe4\r\x00\x00\x01\x00\x00\x00\x03\x00\x00\x00\x13\x00\x00\x00\x0f\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x15\x00\x00\x00\x00\x00\x00\x00\a\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x14\x00\x00\x00\x0e\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\b\x00\x00\x00\v\x00\x00\x00\x11\x00\x00\x00\x06\x00\x00\x00\x12\x00\x00\x00\n\x00\x00\x00\f\x00\x00\x00\x00Apply a configuration to a resource by filename or stdin\x04Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x04Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x04Delete the specified context from the kubeconfig\x00Describe one or many contexts\x04Describe one or many contexts\x00Display clusters defined in the kubeconfig\x04Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x04Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x04Displays the current-context\x00Modify kubeconfig files\x04Modify kubeconfig files\x00Set specific features on objects\x04Set specific features on objects\x00Set the selector on a resource\x04Set the selector on a resource\x00Sets a cluster entry in kubeconfig\x04Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x04Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x04Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x04Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x04Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x04Unsets an individual value in a kubeconfig file\x00Update image of a pod template\x04Update image of a pod template\x00Update resource requests/limits on objects with pod templates\x04Update resource requests/limits on objects with pod templates\x00Update the annotations on a resource\x04Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resources were found\x04watch is only supported on individual resources and resource collections - %d resources were found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00Project-Id-Version: gettext-go-examples-hello\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2013-12-12 20:03+0000\nPO-Revision-Date: 2017-01-29 14:45-0800\nLast-Translator: Brendan Burns \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.6.10\nX-Poedit-SourceCharset: UTF-8\nLanguage-Team: \nPlural-Forms: nplurals=2; plural=(n != 1);\nLanguage: en\n\x00Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x00Describe one or many contexts\x00Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x00Modify kubeconfig files\x00Set specific features on objects\x00Set the selector on a resource\x00Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x00Update image of a pod template\x00Update resource requests/limits on objects with pod templates\x00Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resource was found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00") func translationsKubectlDefaultLc_messagesK8sMoBytes() ([]byte, error) { return _translationsKubectlDefaultLc_messagesK8sMo, nil @@ -215,7 +215,7 @@ msgstr "" "Project-Id-Version: gettext-go-examples-hello\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-12 20:03+0000\n" -"PO-Revision-Date: 2017-01-27 20:30-0800\n" +"PO-Revision-Date: 2017-01-29 14:45-0800\n" "Last-Translator: Brendan Burns \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -315,6 +315,26 @@ msgstr "Sets the current-context in a kubeconfig file" msgctxt "Display merged kubeconfig settings or a specified kubeconfig file" msgid "Display merged kubeconfig settings or a specified kubeconfig file" msgstr "Display merged kubeconfig settings or a specified kubeconfig file" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set.go#L37 +msgctxt "Set specific features on objects" +msgid "Set specific features on objects" +msgstr "Set specific features on objects" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set_image.go#L94 +msgctxt "Update image of a pod template" +msgid "Update image of a pod template" +msgstr "Update image of a pod template" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set_resources.go#L101 +msgctxt "Update resource requests/limits on objects with pod templates" +msgid "Update resource requests/limits on objects with pod templates" +msgstr "Update resource requests/limits on objects with pod templates" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set_selector.go#L81 +msgctxt "Set the selector on a resource" +msgid "Set the selector on a resource" +msgstr "Set the selector on a resource" `) func translationsKubectlDefaultLc_messagesK8sPoBytes() ([]byte, error) { @@ -332,7 +352,7 @@ func translationsKubectlDefaultLc_messagesK8sPo() (*asset, error) { return a, nil } -var _translationsKubectlEn_usLc_messagesK8sMo = []byte("\xde\x12\x04\x95\x00\x00\x00\x00\x11\x00\x00\x00\x1c\x00\x00\x00\xa4\x00\x00\x00\x17\x00\x00\x00,\x01\x00\x00\x00\x00\x00\x00\x88\x01\x00\x00q\x00\x00\x00\x89\x01\x00\x00a\x00\x00\x00\xfb\x01\x00\x00a\x00\x00\x00]\x02\x00\x00;\x00\x00\x00\xbf\x02\x00\x00U\x00\x00\x00\xfb\x02\x00\x00\x83\x00\x00\x00Q\x03\x00\x009\x00\x00\x00\xd5\x03\x00\x00/\x00\x00\x00\x0f\x04\x00\x00E\x00\x00\x00?\x04\x00\x00E\x00\x00\x00\x85\x04\x00\x00?\x00\x00\x00\xcb\x04\x00\x00[\x00\x00\x00\v\x05\x00\x00[\x00\x00\x00g\x05\x00\x00_\x00\x00\x00\xc3\x05\x00\x00I\x00\x00\x00#\x06\x00\x00(\x01\x00\x00m\x06\x00\x00\xac\x01\x00\x00\x96\a\x00\x008\x00\x00\x00C\t\x00\x000\x00\x00\x00|\t\x00\x000\x00\x00\x00\xad\t\x00\x00\x1d\x00\x00\x00\xde\t\x00\x00*\x00\x00\x00\xfc\t\x00\x00A\x00\x00\x00'\n\x00\x00\x1c\x00\x00\x00i\n\x00\x00\x17\x00\x00\x00\x86\n\x00\x00\"\x00\x00\x00\x9e\n\x00\x00\"\x00\x00\x00\xc1\n\x00\x00\x1f\x00\x00\x00\xe4\n\x00\x00-\x00\x00\x00\x04\v\x00\x00-\x00\x00\x002\v\x00\x00/\x00\x00\x00`\v\x00\x00$\x00\x00\x00\x90\v\x00\x00\xc3\x00\x00\x00\xb5\v\x00\x00\x01\x00\x00\x00\x0f\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\a\x00\x00\x00\n\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\b\x00\x00\x00\t\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\v\x00\x00\x00\r\x00\x00\x00\f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x00\x00\x00\x00Apply a configuration to a resource by filename or stdin\x04Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x04Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x04Delete the specified context from the kubeconfig\x00Describe one or many contexts\x04Describe one or many contexts\x00Display clusters defined in the kubeconfig\x04Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x04Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x04Displays the current-context\x00Modify kubeconfig files\x04Modify kubeconfig files\x00Sets a cluster entry in kubeconfig\x04Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x04Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x04Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x04Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x04Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x04Unsets an individual value in a kubeconfig file\x00Update the annotations on a resource\x04Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resources were found\x04watch is only supported on individual resources and resource collections - %d resources were found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00Project-Id-Version: gettext-go-examples-hello\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2013-12-12 20:03+0000\nPO-Revision-Date: 2017-01-27 20:30-0800\nLast-Translator: Brendan Burns \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.6.10\nX-Poedit-SourceCharset: UTF-8\nLanguage-Team: \nPlural-Forms: nplurals=2; plural=(n != 1);\nLanguage: en\n\x00Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x00Describe one or many contexts\x00Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x00Modify kubeconfig files\x00Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x00Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resource was found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00") +var _translationsKubectlEn_usLc_messagesK8sMo = []byte("\xde\x12\x04\x95\x00\x00\x00\x00\x15\x00\x00\x00\x1c\x00\x00\x00\xc4\x00\x00\x00\x1d\x00\x00\x00l\x01\x00\x00\x00\x00\x00\x00\xe0\x01\x00\x00q\x00\x00\x00\xe1\x01\x00\x00a\x00\x00\x00S\x02\x00\x00a\x00\x00\x00\xb5\x02\x00\x00;\x00\x00\x00\x17\x03\x00\x00U\x00\x00\x00S\x03\x00\x00\x83\x00\x00\x00\xa9\x03\x00\x009\x00\x00\x00-\x04\x00\x00/\x00\x00\x00g\x04\x00\x00A\x00\x00\x00\x97\x04\x00\x00=\x00\x00\x00\xd9\x04\x00\x00E\x00\x00\x00\x17\x05\x00\x00E\x00\x00\x00]\x05\x00\x00?\x00\x00\x00\xa3\x05\x00\x00[\x00\x00\x00\xe3\x05\x00\x00[\x00\x00\x00?\x06\x00\x00_\x00\x00\x00\x9b\x06\x00\x00=\x00\x00\x00\xfb\x06\x00\x00{\x00\x00\x009\a\x00\x00I\x00\x00\x00\xb5\a\x00\x00(\x01\x00\x00\xff\a\x00\x00\xac\x01\x00\x00(\t\x00\x008\x00\x00\x00\xd5\n\x00\x000\x00\x00\x00\x0e\v\x00\x000\x00\x00\x00?\v\x00\x00\x1d\x00\x00\x00p\v\x00\x00*\x00\x00\x00\x8e\v\x00\x00A\x00\x00\x00\xb9\v\x00\x00\x1c\x00\x00\x00\xfb\v\x00\x00\x17\x00\x00\x00\x18\f\x00\x00 \x00\x00\x000\f\x00\x00\x1e\x00\x00\x00Q\f\x00\x00\"\x00\x00\x00p\f\x00\x00\"\x00\x00\x00\x93\f\x00\x00\x1f\x00\x00\x00\xb6\f\x00\x00-\x00\x00\x00\xd6\f\x00\x00-\x00\x00\x00\x04\r\x00\x00/\x00\x00\x002\r\x00\x00\x1e\x00\x00\x00b\r\x00\x00=\x00\x00\x00\x81\r\x00\x00$\x00\x00\x00\xbf\r\x00\x00\xc3\x00\x00\x00\xe4\r\x00\x00\x01\x00\x00\x00\x03\x00\x00\x00\x13\x00\x00\x00\x0f\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x15\x00\x00\x00\x00\x00\x00\x00\a\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x14\x00\x00\x00\x0e\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\b\x00\x00\x00\v\x00\x00\x00\x11\x00\x00\x00\x06\x00\x00\x00\x12\x00\x00\x00\n\x00\x00\x00\f\x00\x00\x00\x00Apply a configuration to a resource by filename or stdin\x04Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x04Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x04Delete the specified context from the kubeconfig\x00Describe one or many contexts\x04Describe one or many contexts\x00Display clusters defined in the kubeconfig\x04Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x04Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x04Displays the current-context\x00Modify kubeconfig files\x04Modify kubeconfig files\x00Set specific features on objects\x04Set specific features on objects\x00Set the selector on a resource\x04Set the selector on a resource\x00Sets a cluster entry in kubeconfig\x04Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x04Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x04Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x04Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x04Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x04Unsets an individual value in a kubeconfig file\x00Update image of a pod template\x04Update image of a pod template\x00Update resource requests/limits on objects with pod templates\x04Update resource requests/limits on objects with pod templates\x00Update the annotations on a resource\x04Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resources were found\x04watch is only supported on individual resources and resource collections - %d resources were found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00Project-Id-Version: gettext-go-examples-hello\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2013-12-12 20:03+0000\nPO-Revision-Date: 2017-01-29 14:45-0800\nLast-Translator: Brendan Burns \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.6.10\nX-Poedit-SourceCharset: UTF-8\nLanguage-Team: \nPlural-Forms: nplurals=2; plural=(n != 1);\nLanguage: en\n\x00Apply a configuration to a resource by filename or stdin\x00Delete the specified cluster from the kubeconfig\x00Delete the specified context from the kubeconfig\x00Describe one or many contexts\x00Display clusters defined in the kubeconfig\x00Display merged kubeconfig settings or a specified kubeconfig file\x00Displays the current-context\x00Modify kubeconfig files\x00Set specific features on objects\x00Set the selector on a resource\x00Sets a cluster entry in kubeconfig\x00Sets a context entry in kubeconfig\x00Sets a user entry in kubeconfig\x00Sets an individual value in a kubeconfig file\x00Sets the current-context in a kubeconfig file\x00Unsets an individual value in a kubeconfig file\x00Update image of a pod template\x00Update resource requests/limits on objects with pod templates\x00Update the annotations on a resource\x00watch is only supported on individual resources and resource collections - %d resource was found\x00watch is only supported on individual resources and resource collections - %d resources were found\x00") func translationsKubectlEn_usLc_messagesK8sMoBytes() ([]byte, error) { return _translationsKubectlEn_usLc_messagesK8sMo, nil @@ -359,7 +379,7 @@ msgstr "" "Project-Id-Version: gettext-go-examples-hello\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-12 20:03+0000\n" -"PO-Revision-Date: 2017-01-27 20:30-0800\n" +"PO-Revision-Date: 2017-01-29 14:45-0800\n" "Last-Translator: Brendan Burns \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -459,6 +479,26 @@ msgstr "Sets the current-context in a kubeconfig file" msgctxt "Display merged kubeconfig settings or a specified kubeconfig file" msgid "Display merged kubeconfig settings or a specified kubeconfig file" msgstr "Display merged kubeconfig settings or a specified kubeconfig file" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set.go#L37 +msgctxt "Set specific features on objects" +msgid "Set specific features on objects" +msgstr "Set specific features on objects" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set_image.go#L94 +msgctxt "Update image of a pod template" +msgid "Update image of a pod template" +msgstr "Update image of a pod template" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set_resources.go#L101 +msgctxt "Update resource requests/limits on objects with pod templates" +msgid "Update resource requests/limits on objects with pod templates" +msgstr "Update resource requests/limits on objects with pod templates" + +# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/set/set_selector.go#L81 +msgctxt "Set the selector on a resource" +msgid "Set the selector on a resource" +msgstr "Set the selector on a resource" `) func translationsKubectlEn_usLc_messagesK8sPoBytes() ([]byte, error) { diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index 565693059e593..9e2c28dc35ea6 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -15,11 +15,11 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/util/intstr:go_default_library", "//vendor:github.com/go-openapi/spec", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/openapi", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 429f1cc842ef1..9ca011ee60e6c 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -25,7 +25,7 @@ import ( resource "k8s.io/apimachinery/pkg/api/resource" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" openapi "k8s.io/apimachinery/pkg/openapi" - intstr "k8s.io/kubernetes/pkg/util/intstr" + intstr "k8s.io/apimachinery/pkg/util/intstr" ) var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions{ diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 5ee8ce33eead2..658b7d4cf13d3 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -85,7 +85,6 @@ go_library( "//pkg/kubectl/resource:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/slice:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", @@ -104,6 +103,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/validation", @@ -168,7 +168,6 @@ go_test( "//pkg/controller/deployment/util:go_default_library", "//pkg/kubectl/testing:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/ghodss/yaml", "//vendor:github.com/spf13/cobra", "//vendor:k8s.io/apimachinery/pkg/api/equality", @@ -179,6 +178,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/yaml", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index b6aadd3569969..6597deb9f96f1 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -90,7 +90,6 @@ go_library( "//pkg/util/exec:go_default_library", "//pkg/util/i18n:go_default_library", "//pkg/util/interrupt:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/taints:go_default_library", "//pkg/util/term:go_default_library", "//pkg/version:go_default_library", @@ -113,6 +112,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/json", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", @@ -185,7 +185,6 @@ go_test( "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/resource:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/util/term:go_default_library", "//vendor:github.com/spf13/cobra", @@ -200,6 +199,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/json", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/kubectl/cmd/expose_test.go b/pkg/kubectl/cmd/expose_test.go index f077e2c0e6f7b..331d8f89d7276 100644 --- a/pkg/kubectl/cmd/expose_test.go +++ b/pkg/kubectl/cmd/expose_test.go @@ -25,11 +25,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/rest/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubectl" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestRunExposeService(t *testing.T) { diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index 318c8e8b89ebc..33cbfffd1c944 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -31,13 +31,13 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" - "k8s.io/kubernetes/pkg/util/intstr" ) var ( diff --git a/pkg/kubectl/cmd/run_test.go b/pkg/kubectl/cmd/run_test.go index f5cec08dc9f43..4af6c35454ce9 100644 --- a/pkg/kubectl/cmd/run_test.go +++ b/pkg/kubectl/cmd/run_test.go @@ -31,12 +31,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubernetes/pkg/api" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestGetRestartPolicy(t *testing.T) { diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index c16e75a95a1bb..af534e64fb093 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -36,6 +36,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/dynamic" "k8s.io/kubernetes/federation/apis/federation" @@ -58,7 +59,6 @@ import ( extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fieldpath" - "k8s.io/kubernetes/pkg/util/intstr" "github.com/golang/glog" ) diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index bbb10b98f4352..7a4a8d6bc1711 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -28,6 +28,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/federation/apis/federation" fedfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/fake" "k8s.io/kubernetes/pkg/api" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/intstr" ) type describeClient struct { diff --git a/pkg/kubectl/pdb.go b/pkg/kubectl/pdb.go index 56d3de0dc7916..04bc7688c0f0c 100644 --- a/pkg/kubectl/pdb.go +++ b/pkg/kubectl/pdb.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/util/intstr" ) // PodDisruptionBudgetV1Generator supports stable generation of a pod disruption budget. diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 6ebc948840555..11d39610762d1 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" yamlserializer "k8s.io/apimachinery/pkg/runtime/serializer/yaml" "k8s.io/apimachinery/pkg/util/diff" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/policy" kubectltesting "k8s.io/kubernetes/pkg/kubectl/testing" - "k8s.io/kubernetes/pkg/util/intstr" "github.com/ghodss/yaml" ) diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index a144fb96431be..427199c1db036 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -28,6 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/client/retry" client "k8s.io/kubernetes/pkg/client/unversioned" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" - "k8s.io/kubernetes/pkg/util/intstr" ) const ( diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 145775580e780..c9fe0671cc1e3 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -30,6 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" restclient "k8s.io/client-go/rest" manualfake "k8s.io/client-go/rest/fake" @@ -39,7 +40,6 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/util/intstr" ) func oldRc(replicas int, original int) *api.ReplicationController { diff --git a/pkg/kubectl/service.go b/pkg/kubectl/service.go index 84cf260ce3c46..820f716acd2eb 100644 --- a/pkg/kubectl/service.go +++ b/pkg/kubectl/service.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/intstr" ) // The only difference between ServiceGeneratorV1 and V2 is that the service port is named "default" in V1, while it is left unnamed in V2. diff --git a/pkg/kubectl/service_basic.go b/pkg/kubectl/service_basic.go index a2945794e2a89..a28a76f3cc844 100644 --- a/pkg/kubectl/service_basic.go +++ b/pkg/kubectl/service_basic.go @@ -23,9 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/intstr" ) type ServiceCommonGeneratorV1 struct { diff --git a/pkg/kubectl/service_basic_test.go b/pkg/kubectl/service_basic_test.go index 93b4b713810da..b0363e7dfca4b 100644 --- a/pkg/kubectl/service_basic_test.go +++ b/pkg/kubectl/service_basic_test.go @@ -21,8 +21,8 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestServiceBasicGenerate(t *testing.T) { diff --git a/pkg/kubectl/service_test.go b/pkg/kubectl/service_test.go index 64f835d21475f..784a707ac2bd9 100644 --- a/pkg/kubectl/service_test.go +++ b/pkg/kubectl/service_test.go @@ -21,8 +21,8 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestGenerateService(t *testing.T) { diff --git a/pkg/kubelet/dockertools/BUILD b/pkg/kubelet/dockertools/BUILD index af93df1559347..39b7112ecd81d 100644 --- a/pkg/kubelet/dockertools/BUILD +++ b/pkg/kubelet/dockertools/BUILD @@ -120,7 +120,6 @@ go_test( "//pkg/security/apparmor:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/hash:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/strings:go_default_library", "//vendor:github.com/docker/docker/pkg/jsonmessage", "//vendor:github.com/docker/engine-api/types", @@ -134,6 +133,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/client-go/util/clock", "//vendor:k8s.io/client-go/util/flowcontrol", diff --git a/pkg/kubelet/dockertools/docker_manager_test.go b/pkg/kubelet/dockertools/docker_manager_test.go index ab2d5774ef05b..37ae5f1d08687 100644 --- a/pkg/kubelet/dockertools/docker_manager_test.go +++ b/pkg/kubelet/dockertools/docker_manager_test.go @@ -41,6 +41,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubetypes "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/clock" "k8s.io/client-go/util/flowcontrol" @@ -57,7 +58,6 @@ import ( proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/kubelet/types" uexec "k8s.io/kubernetes/pkg/util/exec" - "k8s.io/kubernetes/pkg/util/intstr" ) var testTempDir string diff --git a/pkg/kubelet/dockertools/labels_test.go b/pkg/kubelet/dockertools/labels_test.go index 74a48a2641e86..19bbfd18be2ed 100644 --- a/pkg/kubelet/dockertools/labels_test.go +++ b/pkg/kubelet/dockertools/labels_test.go @@ -23,11 +23,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestLabels(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index ca40508f977db..49a0e599f4090 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -86,12 +86,12 @@ go_test( "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/network/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/golang/mock/gomock", "//vendor:github.com/google/cadvisor/info/v1", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/client-go/util/flowcontrol", ], diff --git a/pkg/kubelet/kuberuntime/labels_test.go b/pkg/kubelet/kuberuntime/labels_test.go index d4c03db6b24e6..fa95910f6b693 100644 --- a/pkg/kubelet/kuberuntime/labels_test.go +++ b/pkg/kubelet/kuberuntime/labels_test.go @@ -21,9 +21,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestContainerLabels(t *testing.T) { diff --git a/pkg/kubelet/lifecycle/BUILD b/pkg/kubelet/lifecycle/BUILD index f10f524fb4e74..e7f9c84721abc 100644 --- a/pkg/kubelet/lifecycle/BUILD +++ b/pkg/kubelet/lifecycle/BUILD @@ -24,11 +24,11 @@ go_library( "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/format:go_default_library", "//pkg/security/apparmor:go_default_library", - "//pkg/util/intstr:go_default_library", "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) @@ -40,7 +40,7 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/kubelet/container:go_default_library", - "//pkg/util/intstr:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/kubelet/lifecycle/handlers.go b/pkg/kubelet/lifecycle/handlers.go index 64a8e4dd02ecb..0a4916ecdb6df 100644 --- a/pkg/kubelet/lifecycle/handlers.go +++ b/pkg/kubelet/lifecycle/handlers.go @@ -25,12 +25,12 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/security/apparmor" - "k8s.io/kubernetes/pkg/util/intstr" ) type HandlerRunner struct { diff --git a/pkg/kubelet/lifecycle/handlers_test.go b/pkg/kubelet/lifecycle/handlers_test.go index bb238dc2bea43..77eceb98193a7 100644 --- a/pkg/kubelet/lifecycle/handlers_test.go +++ b/pkg/kubelet/lifecycle/handlers_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestResolvePortInt(t *testing.T) { diff --git a/pkg/kubelet/prober/BUILD b/pkg/kubelet/prober/BUILD index 2f01e8c9ec121..836128ed8c9d0 100644 --- a/pkg/kubelet/prober/BUILD +++ b/pkg/kubelet/prober/BUILD @@ -29,9 +29,9 @@ go_library( "//pkg/probe/http:go_default_library", "//pkg/probe/tcp:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", @@ -59,10 +59,10 @@ go_test( "//pkg/kubelet/status:go_default_library", "//pkg/probe:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", ], diff --git a/pkg/kubelet/prober/prober.go b/pkg/kubelet/prober/prober.go index 941520cd30932..e69bff9db0f9b 100644 --- a/pkg/kubelet/prober/prober.go +++ b/pkg/kubelet/prober/prober.go @@ -26,6 +26,7 @@ import ( "strings" "time" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -37,7 +38,6 @@ import ( httprobe "k8s.io/kubernetes/pkg/probe/http" tcprobe "k8s.io/kubernetes/pkg/probe/tcp" "k8s.io/kubernetes/pkg/util/exec" - "k8s.io/kubernetes/pkg/util/intstr" "github.com/golang/glog" ) diff --git a/pkg/kubelet/prober/prober_test.go b/pkg/kubelet/prober/prober_test.go index 5cb6eea6e0474..aa109f04d9f7a 100644 --- a/pkg/kubelet/prober/prober_test.go +++ b/pkg/kubelet/prober/prober_test.go @@ -23,13 +23,13 @@ import ( "reflect" "testing" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/probe" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestFormatURL(t *testing.T) { diff --git a/pkg/master/BUILD b/pkg/master/BUILD index f7c005f21ca78..c6aa0caedc2d5 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -72,13 +72,13 @@ go_library( "//pkg/registry/storage/rest:go_default_library", "//pkg/routes:go_default_library", "//pkg/util/async:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/node:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", @@ -117,7 +117,6 @@ go_test( "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/go-openapi/loads", "//vendor:github.com/go-openapi/spec", @@ -127,6 +126,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", diff --git a/pkg/master/controller.go b/pkg/master/controller.go index 51cdb02c3f3a1..716ff898f97d4 100644 --- a/pkg/master/controller.go +++ b/pkg/master/controller.go @@ -24,6 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" @@ -36,7 +37,6 @@ import ( servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller" portallocatorcontroller "k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller" "k8s.io/kubernetes/pkg/util/async" - "k8s.io/kubernetes/pkg/util/intstr" ) const kubernetesServiceName = "kubernetes" diff --git a/pkg/master/controller_test.go b/pkg/master/controller_test.go index dbb57a60741d1..50dc1bab734fe 100644 --- a/pkg/master/controller_test.go +++ b/pkg/master/controller_test.go @@ -22,10 +22,10 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestReconcileEndpoints(t *testing.T) { diff --git a/pkg/master/import_known_versions_test.go b/pkg/master/import_known_versions_test.go index 68d64a270fb4e..d945e1d1e2d15 100644 --- a/pkg/master/import_known_versions_test.go +++ b/pkg/master/import_known_versions_test.go @@ -25,10 +25,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestGroupVersions(t *testing.T) { diff --git a/pkg/proxy/iptables/BUILD b/pkg/proxy/iptables/BUILD index 9417aa107e800..85db5e56ac146 100644 --- a/pkg/proxy/iptables/BUILD +++ b/pkg/proxy/iptables/BUILD @@ -44,11 +44,11 @@ go_test( "//pkg/api/service:go_default_library", "//pkg/proxy:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/iptables:go_default_library", "//pkg/util/iptables/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go index e8d1c21fb5ffa..472432b8313bb 100644 --- a/pkg/proxy/iptables/proxier_test.go +++ b/pkg/proxy/iptables/proxier_test.go @@ -25,11 +25,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/util/exec" - "k8s.io/kubernetes/pkg/util/intstr" utiliptables "k8s.io/kubernetes/pkg/util/iptables" iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing" ) diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 2c0d5f4e55c7d..4b2ee14a373a2 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -65,10 +65,10 @@ go_test( "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/util/feature", diff --git a/pkg/registry/core/service/rest_test.go b/pkg/registry/core/service/rest_test.go index 9a8fd882a878c..cec3b37ae7416 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -34,7 +35,6 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" - "k8s.io/kubernetes/pkg/util/intstr" ) func init() { diff --git a/pkg/registry/core/service/storage/BUILD b/pkg/registry/core/service/storage/BUILD index bed29889f84df..a6c24dc332a4b 100644 --- a/pkg/registry/core/service/storage/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -18,11 +18,11 @@ go_test( "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index 3fc6311c3790a..e1c4d3cd8ece6 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/util/intstr" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index d92e748f3b772..f0765711edcd0 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestExportService(t *testing.T) { diff --git a/pkg/registry/extensions/deployment/storage/BUILD b/pkg/registry/extensions/deployment/storage/BUILD index e0f550d74054c..f6b1f688f8365 100644 --- a/pkg/registry/extensions/deployment/storage/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -21,7 +21,6 @@ go_test( "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index 7f6df0220cb1f..432800f2ef78d 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/util/intstr" ) const defaultReplicas = 100 diff --git a/pkg/registry/extensions/ingress/BUILD b/pkg/registry/extensions/ingress/BUILD index 13c70afb0bd1f..9b19cfb4d1bf6 100644 --- a/pkg/registry/extensions/ingress/BUILD +++ b/pkg/registry/extensions/ingress/BUILD @@ -40,8 +40,8 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/ingress/storage/BUILD b/pkg/registry/extensions/ingress/storage/BUILD index 489e1348894ca..87a45921b8576 100644 --- a/pkg/registry/extensions/ingress/storage/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -19,11 +19,11 @@ go_test( "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", ], ) diff --git a/pkg/registry/extensions/ingress/storage/storage_test.go b/pkg/registry/extensions/ingress/storage/storage_test.go index d2016559d292d..89d16a59cbccd 100644 --- a/pkg/registry/extensions/ingress/storage/storage_test.go +++ b/pkg/registry/extensions/ingress/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/util/intstr" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/ingress/strategy_test.go b/pkg/registry/extensions/ingress/strategy_test.go index f7fe25791baad..3e381eca41bba 100644 --- a/pkg/registry/extensions/ingress/strategy_test.go +++ b/pkg/registry/extensions/ingress/strategy_test.go @@ -20,12 +20,12 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/util/intstr" ) func newIngress() extensions.Ingress { diff --git a/pkg/registry/extensions/networkpolicy/storage/BUILD b/pkg/registry/extensions/networkpolicy/storage/BUILD index 94d1d4cde3e36..bab768f60f253 100644 --- a/pkg/registry/extensions/networkpolicy/storage/BUILD +++ b/pkg/registry/extensions/networkpolicy/storage/BUILD @@ -18,11 +18,11 @@ go_test( "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/networkpolicy/storage/storage_test.go b/pkg/registry/extensions/networkpolicy/storage/storage_test.go index f6314d32fc58c..73115c28c4bbb 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage_test.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/util/intstr" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD index 547817a604109..145ba2a69b842 100644 --- a/pkg/registry/policy/poddisruptionbudget/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/BUILD @@ -37,8 +37,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/policy:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD index 96220952499cb..d44959102e316 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -20,10 +20,10 @@ go_test( "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index 16801ffb33a67..f59daa9e0d9ed 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -22,6 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" @@ -29,7 +30,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/util/intstr" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/policy/poddisruptionbudget/strategy_test.go b/pkg/registry/policy/poddisruptionbudget/strategy_test.go index f535eab2dd8a9..33cf6f5425799 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy_test.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/util/intstr" ) func TestPodDisruptionBudgetStrategy(t *testing.T) { diff --git a/pkg/util/intstr/BUILD b/pkg/util/intstr/BUILD index 2ac06107c65e3..deefdcef3c178 100644 --- a/pkg/util/intstr/BUILD +++ b/pkg/util/intstr/BUILD @@ -5,31 +5,12 @@ licenses(["notice"]) load( "@io_bazel_rules_go//go:def.bzl", "go_library", - "go_test", ) go_library( name = "go_default_library", - srcs = [ - "generated.pb.go", - "intstr.go", - ], + srcs = ["doc.go"], tags = ["automanaged"], - deps = [ - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/gogo/protobuf/proto", - "//vendor:github.com/golang/glog", - "//vendor:github.com/google/gofuzz", - "//vendor:k8s.io/apimachinery/pkg/openapi", - ], -) - -go_test( - name = "go_default_test", - srcs = ["intstr_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:github.com/ghodss/yaml"], ) filegroup( diff --git a/pkg/util/intstr/doc.go b/pkg/util/intstr/doc.go new file mode 100644 index 0000000000000..e5221d4697aba --- /dev/null +++ b/pkg/util/intstr/doc.go @@ -0,0 +1,21 @@ +/* +Copyright 2017 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 intstr only exists until heapster rebases +// TODO genericapiserver remove this empty package. Godep fails without this because heapster relies +// on this package. This will allow us to start splitting packages, but will force +// heapster to update on their next kube rebase. +package intstr diff --git a/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.pb.go index e988e3bbe064c..87fb5f5803d1a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.pb.go @@ -51,21 +51,21 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x8f, 0xb1, 0x4a, 0x03, 0x41, - 0x10, 0x86, 0x77, 0x1b, 0x89, 0x57, 0x06, 0x11, 0x49, 0xb1, 0x17, 0xc4, 0x42, 0x04, 0x77, 0xb0, - 0x0b, 0x96, 0xf6, 0x16, 0x5a, 0xda, 0xdd, 0x5d, 0xc6, 0xcd, 0x72, 0x66, 0xf7, 0x98, 0x9d, 0x15, - 0xd2, 0xa5, 0xb4, 0x4c, 0x69, 0x99, 0x7b, 0x9b, 0x94, 0x29, 0x2d, 0x2c, 0xbc, 0xf3, 0x45, 0xe4, - 0x2e, 0x09, 0x88, 0x76, 0xf3, 0xff, 0xc3, 0x37, 0x7c, 0x93, 0xdc, 0x97, 0x93, 0xa0, 0xad, 0x87, - 0x32, 0xe6, 0x48, 0x0e, 0x19, 0x03, 0xbc, 0xa2, 0x9b, 0x7a, 0x82, 0xfd, 0x22, 0xab, 0xec, 0x3c, - 0x2b, 0x66, 0xd6, 0x21, 0x2d, 0xa0, 0x2a, 0x4d, 0x57, 0x00, 0x61, 0xf0, 0x91, 0x0a, 0x04, 0x83, - 0x0e, 0x29, 0x63, 0x9c, 0xea, 0x8a, 0x3c, 0xfb, 0xe1, 0xc5, 0x8e, 0xd2, 0xbf, 0x29, 0x5d, 0x95, - 0xa6, 0x2b, 0xf4, 0x81, 0x1a, 0x5d, 0x1b, 0xcb, 0xb3, 0x98, 0xeb, 0xc2, 0xcf, 0xc1, 0x78, 0xe3, - 0xa1, 0x87, 0xf3, 0xf8, 0xdc, 0xa7, 0x3e, 0xf4, 0xd3, 0xee, 0xe8, 0xe8, 0xe6, 0xbf, 0x63, 0x27, - 0x12, 0xd9, 0xbe, 0x80, 0x75, 0x1c, 0x98, 0xfe, 0x7a, 0x9c, 0x4f, 0x92, 0xc1, 0x43, 0xcc, 0x1c, - 0x5b, 0x5e, 0x0c, 0x4f, 0x93, 0xa3, 0xc0, 0x64, 0x9d, 0x39, 0x93, 0x63, 0x79, 0x79, 0xfc, 0xb8, - 0x4f, 0xb7, 0x27, 0xef, 0xeb, 0x54, 0xbc, 0xd5, 0xa9, 0x58, 0xd5, 0xa9, 0x58, 0xd7, 0xa9, 0x58, - 0x7e, 0x8e, 0xc5, 0xdd, 0xd5, 0xa6, 0x51, 0x62, 0xdb, 0x28, 0xf1, 0xd1, 0x28, 0xb1, 0x6c, 0x95, - 0xdc, 0xb4, 0x4a, 0x6e, 0x5b, 0x25, 0xbf, 0x5a, 0x25, 0x57, 0xdf, 0x4a, 0x3c, 0x0d, 0x0e, 0x7f, - 0xfc, 0x04, 0x00, 0x00, 0xff, 0xff, 0x6f, 0xaa, 0x3e, 0x00, 0x3d, 0x01, 0x00, 0x00, + // 253 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x8f, 0xb1, 0x4a, 0x03, 0x41, + 0x10, 0x86, 0x77, 0x1b, 0x89, 0x57, 0x06, 0x11, 0x49, 0xb1, 0x17, 0xc4, 0x42, 0x04, 0x77, 0x0a, + 0x9b, 0x60, 0x69, 0x6f, 0xa1, 0xa5, 0xdd, 0xdd, 0x65, 0xdc, 0x2c, 0x67, 0x76, 0x8f, 0xd9, 0x59, + 0x21, 0x5d, 0x4a, 0xcb, 0x94, 0x96, 0xb9, 0xb7, 0x49, 0x99, 0xd2, 0xc2, 0xc2, 0x3b, 0x5f, 0x44, + 0x72, 0xc9, 0x81, 0x08, 0x76, 0xf3, 0xfd, 0xc3, 0x37, 0xfc, 0x93, 0xdc, 0x97, 0x93, 0xa0, 0xad, + 0x87, 0x32, 0xe6, 0x48, 0x0e, 0x19, 0x03, 0xbc, 0xa2, 0x9b, 0x7a, 0x82, 0xc3, 0x22, 0xab, 0xec, + 0x3c, 0x2b, 0x66, 0xd6, 0x21, 0x2d, 0xa0, 0x2a, 0xcd, 0x2e, 0x00, 0xc2, 0xe0, 0x23, 0x15, 0x08, + 0x06, 0x1d, 0x52, 0xc6, 0x38, 0xd5, 0x15, 0x79, 0xf6, 0xc3, 0x8b, 0xbd, 0xa5, 0x7f, 0x5b, 0xba, + 0x2a, 0xcd, 0x2e, 0xd0, 0xbd, 0x35, 0xba, 0x36, 0x96, 0x67, 0x31, 0xd7, 0x85, 0x9f, 0x83, 0xf1, + 0xc6, 0x43, 0x27, 0xe7, 0xf1, 0xb9, 0xa3, 0x0e, 0xba, 0x69, 0x7f, 0x74, 0x74, 0xf3, 0x5f, 0x95, + 0xc8, 0xf6, 0x05, 0xac, 0xe3, 0xc0, 0xf4, 0xb7, 0xc9, 0xf9, 0x24, 0x19, 0x3c, 0xc4, 0xcc, 0xb1, + 0xe5, 0xc5, 0xf0, 0x34, 0x39, 0x0a, 0x4c, 0xd6, 0x99, 0x33, 0x39, 0x96, 0x97, 0xc7, 0x8f, 0x07, + 0xba, 0x3d, 0x79, 0x5f, 0xa7, 0xe2, 0xad, 0x4e, 0xc5, 0xaa, 0x4e, 0xc5, 0xba, 0x4e, 0xc5, 0xf2, + 0x73, 0x2c, 0xee, 0xae, 0x36, 0x8d, 0x12, 0xdb, 0x46, 0x89, 0x8f, 0x46, 0x89, 0x65, 0xab, 0xe4, + 0xa6, 0x55, 0x72, 0xdb, 0x2a, 0xf9, 0xd5, 0x2a, 0xb9, 0xfa, 0x56, 0xe2, 0x69, 0xd0, 0x7f, 0xf2, + 0x13, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x3c, 0xf3, 0xc9, 0x3f, 0x01, 0x00, 0x00, } diff --git a/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.proto b/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.proto index a5d402a7a741b..608299da4d7a1 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.proto @@ -21,7 +21,7 @@ syntax = 'proto2'; package k8s.io.apimachinery.pkg.api.resource; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "resource"; diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go index 69aa8c9df7993..2167cbf3968e7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go @@ -6700,137 +6700,137 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 2109 bytes of a gzipped FileDescriptorProto + // 2098 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x19, 0x4b, 0x6f, 0x23, 0x49, - 0x39, 0x6d, 0xc7, 0x1e, 0xfb, 0x73, 0x9c, 0x47, 0x31, 0x0b, 0xde, 0x48, 0xd8, 0xd9, 0xde, 0x15, - 0x9a, 0x85, 0x59, 0x9b, 0x84, 0x65, 0x35, 0x0c, 0x30, 0x10, 0xc7, 0x99, 0x28, 0xda, 0xc9, 0x24, - 0xaa, 0xec, 0x0c, 0x62, 0x19, 0x21, 0x3a, 0xee, 0x8a, 0xd3, 0xa4, 0xdd, 0xdd, 0x54, 0x95, 0x3d, - 0x09, 0x7b, 0x60, 0xa5, 0x05, 0xc1, 0x01, 0xa1, 0x39, 0x72, 0x40, 0x68, 0x47, 0x70, 0xe3, 0xc6, - 0x9f, 0x60, 0x8e, 0x2b, 0x71, 0xe1, 0x80, 0x2c, 0x26, 0x1c, 0x38, 0x72, 0x8f, 0x38, 0xa0, 0xaa, - 0xae, 0xea, 0x87, 0x3d, 0x9e, 0xb4, 0xd9, 0x3d, 0x70, 0x8a, 0xeb, 0x7b, 0xd7, 0x57, 0xdf, 0xb3, - 0x03, 0x7b, 0xa7, 0xb7, 0x58, 0xd3, 0xf1, 0x5b, 0xa7, 0x83, 0x23, 0x42, 0x3d, 0xc2, 0x09, 0x6b, - 0x0d, 0x89, 0x67, 0xfb, 0xb4, 0xa5, 0x10, 0x56, 0xe0, 0xf4, 0xad, 0xee, 0x89, 0xe3, 0x11, 0x7a, - 0xde, 0x0a, 0x4e, 0x7b, 0x02, 0xc0, 0x5a, 0x7d, 0xc2, 0xad, 0xd6, 0x70, 0xbd, 0xd5, 0x23, 0x1e, - 0xa1, 0x16, 0x27, 0x76, 0x33, 0xa0, 0x3e, 0xf7, 0xd1, 0x1b, 0x21, 0x57, 0x33, 0xc9, 0xd5, 0x0c, - 0x4e, 0x7b, 0x02, 0xc0, 0x9a, 0x82, 0xab, 0x39, 0x5c, 0x5f, 0x7d, 0xab, 0xe7, 0xf0, 0x93, 0xc1, - 0x51, 0xb3, 0xeb, 0xf7, 0x5b, 0x3d, 0xbf, 0xe7, 0xb7, 0x24, 0xf3, 0xd1, 0xe0, 0x58, 0x9e, 0xe4, - 0x41, 0xfe, 0x0a, 0x85, 0xae, 0xbe, 0xfd, 0x12, 0x53, 0x5a, 0x94, 0x30, 0x7f, 0x40, 0xbb, 0x64, - 0xdc, 0x94, 0xd5, 0xa9, 0x17, 0xa0, 0x03, 0x8f, 0x3b, 0xfd, 0x49, 0x86, 0x77, 0xae, 0x62, 0x60, - 0xdd, 0x13, 0xd2, 0xb7, 0x26, 0xf8, 0xd6, 0x27, 0x5d, 0x28, 0xb8, 0x06, 0xdc, 0x71, 0x5b, 0x8e, - 0xc7, 0x19, 0xa7, 0xe3, 0x2c, 0xe6, 0x5f, 0xf2, 0x50, 0xda, 0x3c, 0xd8, 0xdd, 0xa1, 0xfe, 0x20, - 0x40, 0x6b, 0x30, 0xef, 0x59, 0x7d, 0x52, 0x33, 0xd6, 0x8c, 0x1b, 0xe5, 0xf6, 0xc2, 0xb3, 0x51, - 0x63, 0xee, 0x62, 0xd4, 0x98, 0xbf, 0x6f, 0xf5, 0x09, 0x96, 0x18, 0xe4, 0x42, 0x69, 0x48, 0x28, - 0x73, 0x7c, 0x8f, 0xd5, 0x72, 0x6b, 0xf9, 0x1b, 0x95, 0x8d, 0x3b, 0xcd, 0x2c, 0x8e, 0x6e, 0x4a, - 0x05, 0x0f, 0x43, 0xd6, 0xbb, 0x3e, 0xed, 0x38, 0xac, 0xeb, 0x0f, 0x09, 0x3d, 0x6f, 0x2f, 0x2b, - 0x2d, 0x25, 0x85, 0x64, 0x38, 0xd2, 0x80, 0x7e, 0x6e, 0xc0, 0x72, 0x40, 0xc9, 0x31, 0xa1, 0x94, - 0xd8, 0x0a, 0x5f, 0xcb, 0xaf, 0x19, 0x9f, 0x81, 0xda, 0x9a, 0x52, 0xbb, 0x7c, 0x30, 0x26, 0x1f, - 0x4f, 0x68, 0x44, 0x7f, 0x30, 0x60, 0x95, 0x11, 0x3a, 0x24, 0x74, 0xd3, 0xb6, 0x29, 0x61, 0xac, - 0x7d, 0xbe, 0xe5, 0x3a, 0xc4, 0xe3, 0x5b, 0xbb, 0x1d, 0xcc, 0x6a, 0xf3, 0xd2, 0x0f, 0xdf, 0xc9, - 0x66, 0xd0, 0xe1, 0x34, 0x39, 0x6d, 0x53, 0x59, 0xb4, 0x3a, 0x95, 0x84, 0xe1, 0x97, 0x98, 0x61, - 0x1e, 0xc3, 0x82, 0x7e, 0xc8, 0x7b, 0x0e, 0xe3, 0xe8, 0x21, 0x14, 0x7b, 0xe2, 0xc0, 0x6a, 0x86, - 0x34, 0xb0, 0x99, 0xcd, 0x40, 0x2d, 0xa3, 0xbd, 0xa8, 0xec, 0x29, 0xca, 0x23, 0xc3, 0x4a, 0x9a, - 0xf9, 0x51, 0x0e, 0x2a, 0x9b, 0x07, 0xbb, 0x58, 0x45, 0x7b, 0x86, 0xa0, 0xd9, 0x00, 0x10, 0x7f, - 0x59, 0x60, 0x75, 0x89, 0x5d, 0xcb, 0xad, 0x19, 0x37, 0x4a, 0x6d, 0xa4, 0xe8, 0xe0, 0x7e, 0x84, - 0xc1, 0x09, 0x2a, 0x21, 0xf5, 0xd4, 0xf1, 0x6c, 0xf9, 0xda, 0x09, 0xa9, 0xef, 0x3a, 0x9e, 0x8d, - 0x25, 0x06, 0xdd, 0x83, 0xc2, 0x90, 0xd0, 0x23, 0xe1, 0x7f, 0x11, 0x10, 0x5f, 0xc9, 0x76, 0xbd, - 0x87, 0x82, 0xa5, 0x5d, 0xbe, 0x18, 0x35, 0x0a, 0xf2, 0x27, 0x0e, 0x85, 0xa0, 0x26, 0x00, 0x3b, - 0xf1, 0x29, 0x97, 0xe6, 0xd4, 0x0a, 0x6b, 0xf9, 0x1b, 0xe5, 0xf6, 0xa2, 0xb0, 0xef, 0x30, 0x82, - 0xe2, 0x04, 0x85, 0xf9, 0x67, 0x03, 0x96, 0x12, 0x5e, 0x90, 0x1e, 0xbf, 0x05, 0x0b, 0xbd, 0x44, - 0xbc, 0x29, 0x8f, 0x5c, 0x57, 0xb6, 0x2f, 0x24, 0x63, 0x11, 0xa7, 0x28, 0x11, 0x81, 0xb2, 0xae, - 0x1e, 0x3a, 0xaf, 0xd6, 0x33, 0x3f, 0x97, 0xb6, 0x21, 0xd6, 0x94, 0x00, 0x32, 0x1c, 0x4b, 0x36, - 0xff, 0x65, 0xc8, 0xa7, 0xd3, 0x99, 0x86, 0x6e, 0x24, 0xb2, 0xd9, 0x90, 0x57, 0x5e, 0x98, 0x92, - 0x89, 0x57, 0xa4, 0x40, 0xee, 0xff, 0x22, 0x05, 0x6e, 0x97, 0x7e, 0xfb, 0x71, 0x63, 0xee, 0xc3, - 0xbf, 0xaf, 0xcd, 0x99, 0xbf, 0xcc, 0x41, 0xb5, 0x43, 0x5c, 0xc2, 0xc9, 0x7e, 0xc0, 0xe5, 0x0d, - 0xee, 0x02, 0xea, 0x51, 0xab, 0x4b, 0x0e, 0x08, 0x75, 0x7c, 0xfb, 0x90, 0x74, 0x7d, 0xcf, 0x66, - 0xf2, 0x89, 0xf2, 0xed, 0xcf, 0x5f, 0x8c, 0x1a, 0x68, 0x67, 0x02, 0x8b, 0x5f, 0xc0, 0x81, 0x5c, - 0xa8, 0x06, 0x54, 0xfe, 0x76, 0xb8, 0x2a, 0x83, 0x22, 0xfc, 0xbe, 0x96, 0xed, 0xee, 0x07, 0x49, - 0xd6, 0xf6, 0xca, 0xc5, 0xa8, 0x51, 0x4d, 0x81, 0x70, 0x5a, 0x38, 0xfa, 0x2e, 0x2c, 0xfb, 0x34, - 0x38, 0xb1, 0xbc, 0x0e, 0x09, 0x88, 0x67, 0x13, 0x8f, 0x33, 0x99, 0x12, 0xa5, 0xf6, 0x75, 0x51, - 0xbc, 0xf6, 0xc7, 0x70, 0x78, 0x82, 0xda, 0xdc, 0x85, 0x52, 0x67, 0x40, 0x2d, 0x21, 0x0e, 0x7d, - 0x1b, 0x4a, 0xb6, 0xfa, 0xad, 0x6e, 0xfe, 0x9a, 0xae, 0xbe, 0x9a, 0xe6, 0x72, 0xd4, 0xa8, 0x8a, - 0x16, 0xd3, 0xd4, 0x00, 0x1c, 0xb1, 0x98, 0x8f, 0xa0, 0xba, 0x7d, 0x16, 0xf8, 0x94, 0x6b, 0x9f, - 0x7e, 0x09, 0x8a, 0x44, 0x02, 0xa4, 0xb4, 0x52, 0x5c, 0x32, 0x42, 0x32, 0xac, 0xb0, 0xe8, 0x75, - 0x28, 0x90, 0x33, 0xab, 0xcb, 0x55, 0xee, 0x57, 0x15, 0x59, 0x61, 0x5b, 0x00, 0x71, 0x88, 0x33, - 0xf7, 0x01, 0x76, 0x48, 0x24, 0x7a, 0x13, 0x96, 0x74, 0xdc, 0xa6, 0xd3, 0xe9, 0x0b, 0x8a, 0x79, - 0x09, 0xa7, 0xd1, 0x78, 0x9c, 0xde, 0x7c, 0x04, 0x65, 0x99, 0x72, 0xa2, 0x66, 0x08, 0x13, 0x64, - 0xc6, 0x29, 0x29, 0x91, 0x09, 0x92, 0x02, 0x87, 0xb8, 0xa8, 0xe8, 0xe4, 0xa6, 0x15, 0x9d, 0x44, - 0x84, 0xb9, 0x50, 0x0d, 0x79, 0x75, 0x1d, 0xcc, 0xa4, 0xe1, 0x26, 0x94, 0xb4, 0x99, 0x4a, 0x4b, - 0xd4, 0xff, 0xb4, 0x20, 0x1c, 0x51, 0x24, 0xb4, 0x9d, 0x40, 0xaa, 0x7c, 0x64, 0x53, 0xf6, 0x26, - 0x5c, 0x53, 0x09, 0xac, 0x74, 0x2d, 0x29, 0xb2, 0x6b, 0xda, 0x67, 0x1a, 0x9f, 0xd0, 0xf4, 0x33, - 0xa8, 0x4d, 0x6b, 0x9a, 0x9f, 0xa2, 0xc0, 0x65, 0x37, 0xc5, 0xfc, 0x8d, 0x01, 0xcb, 0x49, 0x49, - 0xd9, 0x9f, 0x2f, 0xbb, 0x92, 0xab, 0xdb, 0x4b, 0xc2, 0x23, 0xbf, 0x37, 0xe0, 0x7a, 0xea, 0x6a, - 0x33, 0xbd, 0xf8, 0x0c, 0x46, 0x25, 0x83, 0x23, 0x3f, 0x43, 0x70, 0xfc, 0x35, 0x07, 0xd5, 0x7b, - 0xd6, 0x11, 0x71, 0x0f, 0x89, 0x4b, 0xba, 0xdc, 0xa7, 0xe8, 0x03, 0xa8, 0xf4, 0x2d, 0xde, 0x3d, - 0x91, 0x50, 0x3d, 0x00, 0x74, 0xb2, 0x95, 0xa8, 0x94, 0xa4, 0xe6, 0x5e, 0x2c, 0x66, 0xdb, 0xe3, - 0xf4, 0xbc, 0xfd, 0x39, 0x65, 0x52, 0x25, 0x81, 0xc1, 0x49, 0x6d, 0x72, 0x6a, 0x93, 0xe7, 0xed, - 0xb3, 0x40, 0xd4, 0xe8, 0xd9, 0x87, 0xc5, 0x94, 0x09, 0x98, 0xfc, 0x64, 0xe0, 0x50, 0xd2, 0x27, - 0x1e, 0x8f, 0xa7, 0xb6, 0xbd, 0x31, 0xf9, 0x78, 0x42, 0xe3, 0xea, 0x1d, 0x58, 0x1e, 0x37, 0x1e, - 0x2d, 0x43, 0xfe, 0x94, 0x9c, 0x87, 0xef, 0x85, 0xc5, 0x4f, 0x74, 0x1d, 0x0a, 0x43, 0xcb, 0x1d, - 0xa8, 0x6c, 0xc4, 0xe1, 0xe1, 0x76, 0xee, 0x96, 0x61, 0xfe, 0xd1, 0x80, 0xda, 0x34, 0x43, 0xd0, - 0x17, 0x13, 0x82, 0xda, 0x15, 0x65, 0x55, 0xfe, 0x5d, 0x72, 0x1e, 0x4a, 0xdd, 0x86, 0x92, 0x1f, - 0x88, 0x39, 0xdb, 0xa7, 0xea, 0xd5, 0xdf, 0xd4, 0x2f, 0xb9, 0xaf, 0xe0, 0x97, 0xa3, 0xc6, 0x2b, - 0x29, 0xf1, 0x1a, 0x81, 0x23, 0x56, 0x64, 0x42, 0x51, 0xda, 0x23, 0x6a, 0xbe, 0xe8, 0xce, 0x20, - 0x6a, 0xeb, 0x43, 0x09, 0xc1, 0x0a, 0x63, 0x7e, 0x00, 0x25, 0x31, 0x7c, 0xec, 0x11, 0x6e, 0x89, - 0x00, 0x62, 0xc4, 0x3d, 0xbe, 0xe7, 0x78, 0xa7, 0xca, 0xb4, 0x28, 0x80, 0x0e, 0x15, 0x1c, 0x47, - 0x14, 0x2f, 0x2a, 0xb1, 0xb9, 0x19, 0x4b, 0xec, 0x9f, 0x72, 0x50, 0x11, 0xda, 0x75, 0xd5, 0xfe, - 0x26, 0x54, 0xdd, 0xe4, 0x9d, 0x94, 0x15, 0xaf, 0x28, 0x81, 0xe9, 0x28, 0xc5, 0x69, 0x5a, 0xc1, - 0x7c, 0xec, 0x10, 0xd7, 0x8e, 0x98, 0x73, 0x69, 0xe6, 0xbb, 0x49, 0x24, 0x4e, 0xd3, 0x8a, 0x5c, - 0x7c, 0x2c, 0x5e, 0x5b, 0x75, 0xc7, 0x28, 0x17, 0xbf, 0x27, 0x80, 0x38, 0xc4, 0xbd, 0xe8, 0xc6, - 0xf3, 0xb3, 0xdd, 0x18, 0xdd, 0x86, 0x45, 0xd1, 0x1e, 0xfd, 0x01, 0xd7, 0x23, 0x44, 0x41, 0x36, - 0x52, 0x74, 0x31, 0x6a, 0x2c, 0xbe, 0x97, 0xc2, 0xe0, 0x31, 0x4a, 0xf3, 0x23, 0x00, 0xd8, 0x3f, - 0xfa, 0x31, 0xe9, 0x86, 0xaf, 0x75, 0xf5, 0xe0, 0x2c, 0xea, 0xad, 0xda, 0xd7, 0x04, 0x54, 0x39, - 0x24, 0xae, 0xb7, 0x09, 0x1c, 0x4e, 0x51, 0xa2, 0x16, 0x94, 0xa3, 0x61, 0x5a, 0xd5, 0x92, 0x15, - 0xc5, 0x56, 0x8e, 0x26, 0x6e, 0x1c, 0xd3, 0xa4, 0x42, 0x67, 0xfe, 0xca, 0xd0, 0x69, 0x43, 0x7e, - 0xe0, 0xd8, 0xf2, 0xea, 0xe5, 0xf6, 0x57, 0x75, 0xf8, 0x3f, 0xd8, 0xed, 0x5c, 0x8e, 0x1a, 0xaf, - 0x4d, 0x5b, 0x5e, 0xf9, 0x79, 0x40, 0x58, 0xf3, 0xc1, 0x6e, 0x07, 0x0b, 0xe6, 0x17, 0x3d, 0x46, - 0x71, 0xc6, 0xc7, 0xd8, 0x00, 0x50, 0xb7, 0x16, 0xdc, 0xd7, 0xc2, 0x87, 0xd0, 0x8b, 0xc5, 0x4e, - 0x84, 0xc1, 0x09, 0x2a, 0xc4, 0x60, 0xa5, 0x4b, 0x89, 0xfc, 0x2d, 0x9e, 0x8b, 0x71, 0xab, 0x1f, - 0xd4, 0x4a, 0x72, 0x86, 0xfb, 0x72, 0xb6, 0xea, 0x24, 0xd8, 0xda, 0xaf, 0x2a, 0x35, 0x2b, 0x5b, - 0xe3, 0xc2, 0xf0, 0xa4, 0x7c, 0xe4, 0xc3, 0x8a, 0x2d, 0xa6, 0xd1, 0x94, 0xd2, 0xf2, 0xcc, 0x4a, - 0x5f, 0x11, 0x0a, 0x3b, 0xe3, 0x82, 0xf0, 0xa4, 0x6c, 0xf4, 0x43, 0x58, 0xd5, 0xc0, 0xc9, 0xb9, - 0xb6, 0x06, 0xd2, 0x53, 0x75, 0x31, 0x69, 0x77, 0xa6, 0x52, 0xe1, 0x97, 0x48, 0x40, 0x36, 0x14, - 0xdd, 0xb0, 0xb7, 0x54, 0x64, 0x61, 0xff, 0x56, 0xb6, 0x5b, 0xc4, 0xd1, 0xdf, 0x4c, 0xf6, 0x94, - 0x68, 0x6e, 0x54, 0xed, 0x44, 0xc9, 0x46, 0x67, 0x50, 0xb1, 0x3c, 0xcf, 0xe7, 0x56, 0x38, 0x69, - 0x2f, 0x48, 0x55, 0x9b, 0x33, 0xab, 0xda, 0x8c, 0x65, 0x8c, 0xf5, 0xb0, 0x04, 0x06, 0x27, 0x55, - 0xa1, 0xc7, 0xb0, 0xe4, 0x3f, 0xf6, 0x08, 0xc5, 0xe4, 0x98, 0x50, 0xe2, 0x89, 0xb5, 0xac, 0x2a, - 0xb5, 0xbf, 0x9d, 0x51, 0x7b, 0x8a, 0x39, 0x0e, 0xe9, 0x34, 0x9c, 0xe1, 0x71, 0x2d, 0x62, 0x0f, - 0x3d, 0x76, 0x3c, 0xcb, 0x75, 0x7e, 0x4a, 0x28, 0xab, 0x2d, 0xc6, 0x7b, 0xe8, 0xdd, 0x08, 0x8a, - 0x13, 0x14, 0xe8, 0xeb, 0x50, 0xe9, 0xba, 0x03, 0xc6, 0x09, 0x95, 0x15, 0x62, 0x49, 0x66, 0x50, - 0x74, 0xbf, 0xad, 0x18, 0x85, 0x93, 0x74, 0xab, 0xdf, 0x80, 0xca, 0xff, 0xd8, 0x17, 0x45, 0x5f, - 0x1d, 0x77, 0xe8, 0x4c, 0x7d, 0xf5, 0x3f, 0x06, 0x2c, 0xa6, 0xdd, 0x10, 0x4d, 0x63, 0xc6, 0xd4, - 0x65, 0x5f, 0xd7, 0xca, 0xfc, 0xd4, 0x5a, 0xa9, 0x4a, 0xd2, 0xfc, 0xa7, 0x29, 0x49, 0x1b, 0x00, - 0x56, 0xe0, 0xe8, 0x6a, 0x14, 0x56, 0xb7, 0xa8, 0x9e, 0xc4, 0x8b, 0x33, 0x4e, 0x50, 0x89, 0x07, - 0xeb, 0xfa, 0x1e, 0xa7, 0xbe, 0xeb, 0x12, 0x2a, 0x2b, 0x58, 0x29, 0x7c, 0xb0, 0xad, 0x08, 0x8a, - 0x13, 0x14, 0xe6, 0x3e, 0xa4, 0x37, 0x3e, 0x74, 0x27, 0x34, 0x3c, 0xbc, 0xfb, 0xcd, 0x99, 0x8d, - 0x36, 0x6f, 0x42, 0x19, 0xfb, 0x3e, 0x3f, 0xb0, 0xf8, 0x09, 0x43, 0x0d, 0x28, 0x04, 0xe2, 0x87, - 0x5a, 0xe7, 0xe5, 0x77, 0x0e, 0x89, 0xc1, 0x21, 0xdc, 0xfc, 0xb5, 0x01, 0xaf, 0x4e, 0xdd, 0xae, - 0x85, 0x03, 0xba, 0xd1, 0x49, 0x99, 0x14, 0x39, 0x20, 0xa6, 0xc3, 0x09, 0x2a, 0xd1, 0xb6, 0x53, - 0x2b, 0xf9, 0x78, 0xdb, 0x4e, 0x69, 0xc3, 0x69, 0x5a, 0xf3, 0xdf, 0x39, 0x28, 0x1e, 0x72, 0x8b, - 0x0f, 0x18, 0x7a, 0x04, 0x25, 0x91, 0x3d, 0xb6, 0xc5, 0x2d, 0xa9, 0x39, 0xf3, 0x17, 0x2b, 0x3d, - 0xfe, 0xc4, 0x1d, 0x4b, 0x43, 0x70, 0x24, 0x51, 0xac, 0xaa, 0x4c, 0xea, 0x51, 0xe6, 0x45, 0x25, - 0x27, 0xd4, 0x8e, 0x15, 0x56, 0x8c, 0xeb, 0x7d, 0xc2, 0x98, 0xd5, 0xd3, 0xb1, 0x16, 0x8d, 0xeb, - 0x7b, 0x21, 0x18, 0x6b, 0x3c, 0x7a, 0x07, 0x8a, 0x94, 0x58, 0x2c, 0x1a, 0x22, 0xea, 0x5a, 0x24, - 0x96, 0xd0, 0xcb, 0x51, 0x63, 0x41, 0x09, 0x97, 0x67, 0xac, 0xa8, 0xd1, 0xfb, 0x70, 0xcd, 0x26, - 0xdc, 0x72, 0xdc, 0x70, 0x76, 0xc8, 0xfc, 0xed, 0x20, 0x14, 0xd6, 0x09, 0x59, 0xdb, 0x15, 0x61, - 0x93, 0x3a, 0x60, 0x2d, 0x50, 0xe4, 0x49, 0xd7, 0xb7, 0x89, 0x8c, 0xc3, 0x42, 0x9c, 0x27, 0x5b, - 0xbe, 0x4d, 0xb0, 0xc4, 0x98, 0x4f, 0x0c, 0xa8, 0x84, 0x92, 0xb6, 0xac, 0x01, 0x23, 0x68, 0x3d, - 0xba, 0x45, 0xf8, 0xdc, 0xba, 0xb1, 0xcd, 0xbf, 0x77, 0x1e, 0x90, 0xcb, 0x51, 0xa3, 0x2c, 0xc9, - 0xc4, 0x21, 0xba, 0x40, 0xc2, 0x47, 0xb9, 0x2b, 0x7c, 0xf4, 0x3a, 0x14, 0xe4, 0x9c, 0xa6, 0x9c, - 0x19, 0x8d, 0x65, 0x72, 0x96, 0xc3, 0x21, 0xce, 0xfc, 0x5d, 0x0e, 0xaa, 0xa9, 0xcb, 0x65, 0x18, - 0x8d, 0xa2, 0xdd, 0x2b, 0x97, 0x61, 0x9f, 0x9f, 0xfe, 0x11, 0xf1, 0xfb, 0x50, 0xec, 0x8a, 0xfb, - 0xe9, 0xaf, 0xb8, 0xeb, 0xb3, 0x3c, 0x85, 0xf4, 0x4c, 0x1c, 0x49, 0xf2, 0xc8, 0xb0, 0x12, 0x88, - 0x76, 0x60, 0x85, 0x12, 0x4e, 0xcf, 0x37, 0x8f, 0x39, 0xa1, 0xc9, 0x61, 0xb1, 0x10, 0x0f, 0x0f, - 0x78, 0x9c, 0x00, 0x4f, 0xf2, 0x98, 0x2e, 0xcc, 0x8b, 0xc6, 0x2e, 0xdc, 0xce, 0x52, 0x9f, 0xad, - 0x22, 0xb7, 0x6b, 0x66, 0x8d, 0x17, 0xde, 0xf1, 0x2c, 0xcf, 0x0f, 0x83, 0xbd, 0x10, 0x7b, 0xe7, - 0xbe, 0x00, 0xe2, 0x10, 0x77, 0xfb, 0xba, 0x58, 0x20, 0x7f, 0xf5, 0xb4, 0x31, 0xf7, 0xe4, 0x69, - 0x63, 0xee, 0xe3, 0xa7, 0x6a, 0x99, 0xfc, 0x01, 0x94, 0xe3, 0x31, 0xe2, 0x33, 0x56, 0x69, 0xfe, - 0x08, 0x4a, 0x22, 0x92, 0xf4, 0xf8, 0x7b, 0x45, 0xd1, 0x4f, 0x97, 0xe3, 0x5c, 0x96, 0x72, 0x6c, - 0x6e, 0x40, 0xf8, 0x5d, 0x57, 0x54, 0x42, 0x87, 0x93, 0x7e, 0xaa, 0x12, 0xee, 0x0a, 0x00, 0x0e, - 0xe1, 0x89, 0xfd, 0xf9, 0x17, 0x06, 0x80, 0xdc, 0x13, 0xb6, 0x87, 0x62, 0xb7, 0x5b, 0x83, 0x79, - 0x51, 0x62, 0xc7, 0x0d, 0x93, 0x29, 0x20, 0x31, 0xe8, 0x01, 0x14, 0x7d, 0x39, 0x5e, 0xa8, 0x8f, - 0x7f, 0x6f, 0x4d, 0x8d, 0x1a, 0xf5, 0x0f, 0x9b, 0x26, 0xb6, 0x1e, 0x6f, 0x9f, 0x71, 0xe2, 0x09, - 0x1b, 0xe3, 0x88, 0x09, 0x67, 0x14, 0xac, 0x84, 0xb5, 0xdf, 0x78, 0xf6, 0xbc, 0x3e, 0xf7, 0xc9, - 0xf3, 0xfa, 0xdc, 0xdf, 0x9e, 0xd7, 0xe7, 0x3e, 0xbc, 0xa8, 0x1b, 0xcf, 0x2e, 0xea, 0xc6, 0x27, - 0x17, 0x75, 0xe3, 0x1f, 0x17, 0x75, 0xe3, 0xc9, 0x3f, 0xeb, 0x73, 0xef, 0xe7, 0x86, 0xeb, 0xff, - 0x0d, 0x00, 0x00, 0xff, 0xff, 0x07, 0x07, 0xdb, 0xc2, 0x28, 0x1b, 0x00, 0x00, + 0x39, 0x6d, 0xc7, 0x1e, 0xfb, 0x73, 0x9c, 0x47, 0x91, 0x01, 0x6f, 0x24, 0xec, 0x6c, 0xef, 0x0a, + 0x65, 0x61, 0xd6, 0x26, 0x59, 0x58, 0x0d, 0x03, 0x0c, 0xc4, 0x71, 0x26, 0x8a, 0x76, 0x32, 0x89, + 0x2a, 0x3b, 0x83, 0x58, 0x46, 0x88, 0x8e, 0xbb, 0xe2, 0x34, 0x69, 0x77, 0x37, 0x55, 0x65, 0x4f, + 0xc2, 0x1e, 0x58, 0x69, 0x41, 0x70, 0x40, 0x68, 0x8e, 0x1c, 0x10, 0xda, 0x11, 0xdc, 0xb8, 0xf1, + 0x27, 0x98, 0xe3, 0x4a, 0x5c, 0x38, 0x20, 0x8b, 0x09, 0x07, 0x8e, 0xdc, 0x23, 0x0e, 0xa8, 0xaa, + 0xab, 0xfa, 0xe1, 0x8c, 0x37, 0x6d, 0x76, 0x0f, 0x9c, 0xe2, 0xfa, 0xde, 0xf5, 0xd5, 0xf7, 0xec, + 0xc0, 0xde, 0xe9, 0x6d, 0xd6, 0x74, 0xfc, 0xd6, 0xe9, 0xe0, 0x88, 0x50, 0x8f, 0x70, 0xc2, 0x5a, + 0x43, 0xe2, 0xd9, 0x3e, 0x6d, 0x29, 0x84, 0x15, 0x38, 0x7d, 0xab, 0x7b, 0xe2, 0x78, 0x84, 0x9e, + 0xb7, 0x82, 0xd3, 0x9e, 0x00, 0xb0, 0x56, 0x9f, 0x70, 0xab, 0x35, 0x5c, 0x6f, 0xf5, 0x88, 0x47, + 0xa8, 0xc5, 0x89, 0xdd, 0x0c, 0xa8, 0xcf, 0x7d, 0xf4, 0x7a, 0xc8, 0xd5, 0x4c, 0x72, 0x35, 0x83, + 0xd3, 0x9e, 0x00, 0xb0, 0xa6, 0xe0, 0x6a, 0x0e, 0xd7, 0x57, 0xde, 0xec, 0x39, 0xfc, 0x64, 0x70, + 0xd4, 0xec, 0xfa, 0xfd, 0x56, 0xcf, 0xef, 0xf9, 0x2d, 0xc9, 0x7c, 0x34, 0x38, 0x96, 0x27, 0x79, + 0x90, 0xbf, 0x42, 0xa1, 0x2b, 0x13, 0x4d, 0xa1, 0x03, 0x8f, 0x3b, 0x7d, 0x32, 0x6e, 0xc5, 0xca, + 0xdb, 0xd7, 0x31, 0xb0, 0xee, 0x09, 0xe9, 0x5b, 0x57, 0xf8, 0xde, 0x9a, 0xc4, 0x37, 0xe0, 0x8e, + 0xdb, 0x72, 0x3c, 0xce, 0x38, 0x1d, 0x67, 0x32, 0xff, 0x92, 0x87, 0xd2, 0xe6, 0xc1, 0xee, 0x0e, + 0xf5, 0x07, 0x01, 0x5a, 0x85, 0x59, 0xcf, 0xea, 0x93, 0x9a, 0xb1, 0x6a, 0xac, 0x95, 0xdb, 0x73, + 0xcf, 0x47, 0x8d, 0x99, 0x8b, 0x51, 0x63, 0xf6, 0x81, 0xd5, 0x27, 0x58, 0x62, 0x90, 0x0b, 0xa5, + 0x21, 0xa1, 0xcc, 0xf1, 0x3d, 0x56, 0xcb, 0xad, 0xe6, 0xd7, 0x2a, 0x1b, 0x77, 0x9b, 0x59, 0x9c, + 0xd6, 0x94, 0x0a, 0x1e, 0x85, 0xac, 0xf7, 0x7c, 0xda, 0x71, 0x58, 0xd7, 0x1f, 0x12, 0x7a, 0xde, + 0x5e, 0x54, 0x5a, 0x4a, 0x0a, 0xc9, 0x70, 0xa4, 0x01, 0xfd, 0xdc, 0x80, 0xc5, 0x80, 0x92, 0x63, + 0x42, 0x29, 0xb1, 0x15, 0xbe, 0x96, 0x5f, 0x35, 0x3e, 0x03, 0xb5, 0x35, 0xa5, 0x76, 0xf1, 0x60, + 0x4c, 0x3e, 0xbe, 0xa2, 0x11, 0xfd, 0xc1, 0x80, 0x15, 0x46, 0xe8, 0x90, 0xd0, 0x4d, 0xdb, 0xa6, + 0x84, 0xb1, 0xf6, 0xf9, 0x96, 0xeb, 0x10, 0x8f, 0x6f, 0xed, 0x76, 0x30, 0xab, 0xcd, 0x4a, 0x3f, + 0x7c, 0x27, 0x9b, 0x41, 0x87, 0x93, 0xe4, 0xb4, 0x4d, 0x65, 0xd1, 0xca, 0x44, 0x12, 0x86, 0x3f, + 0xc1, 0x0c, 0xf3, 0x18, 0xe6, 0xf4, 0x43, 0xde, 0x77, 0x18, 0x47, 0x8f, 0xa0, 0xd8, 0x13, 0x07, + 0x56, 0x33, 0xa4, 0x81, 0xcd, 0x6c, 0x06, 0x6a, 0x19, 0xed, 0x79, 0x65, 0x4f, 0x51, 0x1e, 0x19, + 0x56, 0xd2, 0xcc, 0x0f, 0x73, 0x50, 0xd9, 0x3c, 0xd8, 0xc5, 0x84, 0xf9, 0x03, 0xda, 0x25, 0x19, + 0x82, 0x66, 0x03, 0x40, 0xfc, 0x65, 0x81, 0xd5, 0x25, 0x76, 0x2d, 0xb7, 0x6a, 0xac, 0x95, 0xda, + 0x48, 0xd1, 0xc1, 0x83, 0x08, 0x83, 0x13, 0x54, 0x42, 0xea, 0xa9, 0xe3, 0xd9, 0xf2, 0xb5, 0x13, + 0x52, 0xdf, 0x71, 0x3c, 0x1b, 0x4b, 0x0c, 0xba, 0x0f, 0x85, 0x21, 0xa1, 0x47, 0xc2, 0xff, 0x22, + 0x20, 0xbe, 0x92, 0xed, 0x7a, 0x8f, 0x04, 0x4b, 0xbb, 0x7c, 0x31, 0x6a, 0x14, 0xe4, 0x4f, 0x1c, + 0x0a, 0x41, 0x4d, 0x00, 0x76, 0xe2, 0x53, 0x2e, 0xcd, 0xa9, 0x15, 0x56, 0xf3, 0x6b, 0xe5, 0xf6, + 0xbc, 0xb0, 0xef, 0x30, 0x82, 0xe2, 0x04, 0x85, 0xf9, 0x67, 0x03, 0x16, 0x12, 0x5e, 0x90, 0x1e, + 0xbf, 0x0d, 0x73, 0xbd, 0x44, 0xbc, 0x29, 0x8f, 0x2c, 0x2b, 0xdb, 0xe7, 0x92, 0xb1, 0x88, 0x53, + 0x94, 0x88, 0x40, 0x99, 0x2a, 0x49, 0x3a, 0xaf, 0xd6, 0x33, 0x3f, 0x97, 0xb6, 0x21, 0xd6, 0x94, + 0x00, 0x32, 0x1c, 0x4b, 0x36, 0xff, 0x65, 0xc8, 0xa7, 0xd3, 0x99, 0x86, 0xd6, 0x12, 0xd9, 0x6c, + 0xc8, 0x2b, 0xcf, 0x4d, 0xc8, 0xc4, 0x6b, 0x52, 0x20, 0xf7, 0x7f, 0x91, 0x02, 0x77, 0x4a, 0xbf, + 0xfd, 0xa8, 0x31, 0xf3, 0xc1, 0xdf, 0x57, 0x67, 0xcc, 0x5f, 0xe6, 0xa0, 0xda, 0x21, 0x2e, 0xe1, + 0x64, 0x3f, 0xe0, 0xf2, 0x06, 0xf7, 0x00, 0xf5, 0xa8, 0xd5, 0x25, 0x07, 0x84, 0x3a, 0xbe, 0x7d, + 0x48, 0xba, 0xbe, 0x67, 0x33, 0xf9, 0x44, 0xf9, 0xf6, 0xe7, 0x2f, 0x46, 0x0d, 0xb4, 0x73, 0x05, + 0x8b, 0x5f, 0xc2, 0x81, 0x5c, 0xa8, 0x06, 0x54, 0xfe, 0x76, 0xb8, 0x2a, 0x83, 0x22, 0xfc, 0xde, + 0xca, 0x76, 0xf7, 0x83, 0x24, 0x6b, 0x7b, 0xe9, 0x62, 0xd4, 0xa8, 0xa6, 0x40, 0x38, 0x2d, 0x1c, + 0x7d, 0x17, 0x16, 0x7d, 0x1a, 0x9c, 0x58, 0x5e, 0x87, 0x04, 0xc4, 0xb3, 0x89, 0xc7, 0x99, 0x4c, + 0x89, 0x52, 0x7b, 0x59, 0x14, 0xaf, 0xfd, 0x31, 0x1c, 0xbe, 0x42, 0x6d, 0xee, 0x42, 0xa9, 0x33, + 0xa0, 0x96, 0x10, 0x87, 0xbe, 0x0d, 0x25, 0x5b, 0xfd, 0x56, 0x37, 0x7f, 0x55, 0x57, 0x5f, 0x4d, + 0x73, 0x39, 0x6a, 0x54, 0x45, 0x93, 0x69, 0x6a, 0x00, 0x8e, 0x58, 0xcc, 0xc7, 0x50, 0xdd, 0x3e, + 0x0b, 0x7c, 0xca, 0xb5, 0x4f, 0xbf, 0x04, 0x45, 0x22, 0x01, 0x52, 0x5a, 0x29, 0x2e, 0x19, 0x21, + 0x19, 0x56, 0x58, 0xf4, 0x1a, 0x14, 0xc8, 0x99, 0xd5, 0xe5, 0x2a, 0xf7, 0xab, 0x8a, 0xac, 0xb0, + 0x2d, 0x80, 0x38, 0xc4, 0x99, 0xfb, 0x00, 0x3b, 0x24, 0x12, 0xbd, 0x09, 0x0b, 0x3a, 0x6e, 0xd3, + 0xe9, 0xf4, 0x05, 0xc5, 0xbc, 0x80, 0xd3, 0x68, 0x3c, 0x4e, 0x6f, 0x3e, 0x86, 0xb2, 0x4c, 0x39, + 0x51, 0x33, 0x84, 0x09, 0x32, 0xe3, 0x94, 0x94, 0xc8, 0x04, 0x49, 0x81, 0x43, 0x5c, 0x54, 0x74, + 0x72, 0x93, 0x8a, 0x4e, 0x22, 0xc2, 0x5c, 0xa8, 0x86, 0xbc, 0xba, 0x0e, 0x66, 0xd2, 0x70, 0x0b, + 0x4a, 0xda, 0x4c, 0xa5, 0x25, 0xea, 0x7f, 0x5a, 0x10, 0x8e, 0x28, 0x12, 0xda, 0x4e, 0x20, 0x55, + 0x3e, 0xb2, 0x29, 0x7b, 0x03, 0x6e, 0xa8, 0x04, 0x56, 0xba, 0x16, 0x14, 0xd9, 0x0d, 0xed, 0x33, + 0x8d, 0x4f, 0x68, 0xfa, 0x19, 0xd4, 0x26, 0x35, 0xcd, 0x4f, 0x51, 0xe0, 0xb2, 0x9b, 0x62, 0xfe, + 0xc6, 0x80, 0xc5, 0xa4, 0xa4, 0xec, 0xcf, 0x97, 0x5d, 0xc9, 0xf5, 0xed, 0x25, 0xe1, 0x91, 0xdf, + 0x1b, 0xb0, 0x9c, 0xba, 0xda, 0x54, 0x2f, 0x3e, 0x85, 0x51, 0xc9, 0xe0, 0xc8, 0x4f, 0x11, 0x1c, + 0x7f, 0xcd, 0x41, 0xf5, 0xbe, 0x75, 0x44, 0xdc, 0x43, 0xe2, 0x92, 0x2e, 0xf7, 0x29, 0x7a, 0x1f, + 0x2a, 0x7d, 0x8b, 0x77, 0x4f, 0x24, 0x54, 0x0f, 0x00, 0x9d, 0x6c, 0x25, 0x2a, 0x25, 0xa9, 0xb9, + 0x17, 0x8b, 0xd9, 0xf6, 0x38, 0x3d, 0x6f, 0x7f, 0x4e, 0x99, 0x54, 0x49, 0x60, 0x70, 0x52, 0x9b, + 0x9c, 0xda, 0xe4, 0x79, 0xfb, 0x2c, 0x10, 0x35, 0x7a, 0xfa, 0x61, 0x31, 0x65, 0x02, 0x26, 0x3f, + 0x19, 0x38, 0x94, 0xf4, 0x89, 0xc7, 0xe3, 0xa9, 0x6d, 0x6f, 0x4c, 0x3e, 0xbe, 0xa2, 0x71, 0xe5, + 0x2e, 0x2c, 0x8e, 0x1b, 0x8f, 0x16, 0x21, 0x7f, 0x4a, 0xce, 0xc3, 0xf7, 0xc2, 0xe2, 0x27, 0x5a, + 0x86, 0xc2, 0xd0, 0x72, 0x07, 0x2a, 0x1b, 0x71, 0x78, 0xb8, 0x93, 0xbb, 0x6d, 0x98, 0x7f, 0x34, + 0xa0, 0x36, 0xc9, 0x10, 0xf4, 0xc5, 0x84, 0xa0, 0x76, 0x45, 0x59, 0x95, 0x7f, 0x87, 0x9c, 0x87, + 0x52, 0xb7, 0xa1, 0xe4, 0x07, 0x62, 0xce, 0xf6, 0xa9, 0x7a, 0xf5, 0x37, 0xf4, 0x4b, 0xee, 0x2b, + 0xf8, 0xe5, 0xa8, 0x71, 0x33, 0x25, 0x5e, 0x23, 0x70, 0xc4, 0x8a, 0x4c, 0x28, 0x4a, 0x7b, 0x44, + 0xcd, 0x17, 0xdd, 0x19, 0x44, 0x6d, 0x7d, 0x24, 0x21, 0x58, 0x61, 0xcc, 0xf7, 0xa1, 0x24, 0x86, + 0x8f, 0x3d, 0xc2, 0x2d, 0x11, 0x40, 0x8c, 0xb8, 0xc7, 0xf7, 0x1d, 0xef, 0x54, 0x99, 0x16, 0x05, + 0xd0, 0xa1, 0x82, 0xe3, 0x88, 0xe2, 0x65, 0x25, 0x36, 0x37, 0x65, 0x89, 0xfd, 0x53, 0x0e, 0x2a, + 0x42, 0xbb, 0xae, 0xda, 0xdf, 0x84, 0xaa, 0x9b, 0xbc, 0x93, 0xb2, 0xe2, 0xa6, 0x12, 0x98, 0x8e, + 0x52, 0x9c, 0xa6, 0x15, 0xcc, 0xc7, 0x0e, 0x71, 0xed, 0x88, 0x39, 0x97, 0x66, 0xbe, 0x97, 0x44, + 0xe2, 0x34, 0xad, 0xc8, 0xc5, 0x27, 0xe2, 0xb5, 0x55, 0x77, 0x8c, 0x72, 0xf1, 0x7b, 0x02, 0x88, + 0x43, 0xdc, 0xcb, 0x6e, 0x3c, 0x3b, 0xdd, 0x8d, 0xd1, 0x1d, 0x98, 0x17, 0xed, 0xd1, 0x1f, 0x70, + 0x3d, 0x42, 0x14, 0x64, 0x23, 0x45, 0x17, 0xa3, 0xc6, 0xfc, 0xbb, 0x29, 0x0c, 0x1e, 0xa3, 0x34, + 0x3f, 0x04, 0x80, 0xfd, 0xa3, 0x1f, 0x93, 0x6e, 0xf8, 0x5a, 0xd7, 0x0f, 0xce, 0xa2, 0xde, 0xaa, + 0x7d, 0x4d, 0x40, 0x95, 0x43, 0xe2, 0x7a, 0x9b, 0xc0, 0xe1, 0x14, 0x25, 0x6a, 0x41, 0x39, 0x1a, + 0xa6, 0x55, 0x2d, 0x59, 0x52, 0x6c, 0xe5, 0x68, 0xe2, 0xc6, 0x31, 0x4d, 0x2a, 0x74, 0x66, 0xaf, + 0x0d, 0x9d, 0x36, 0xe4, 0x07, 0x8e, 0x2d, 0xaf, 0x5e, 0x6e, 0x7f, 0x55, 0x87, 0xff, 0xc3, 0xdd, + 0xce, 0xe5, 0xa8, 0xf1, 0xea, 0xa4, 0x35, 0x94, 0x9f, 0x07, 0x84, 0x35, 0x1f, 0xee, 0x76, 0xb0, + 0x60, 0x7e, 0xd9, 0x63, 0x14, 0xa7, 0x7c, 0x8c, 0x0d, 0x00, 0x75, 0x6b, 0xc1, 0x7d, 0x23, 0x7c, + 0x08, 0xbd, 0x58, 0xec, 0x44, 0x18, 0x9c, 0xa0, 0x42, 0x0c, 0x96, 0xba, 0x94, 0xc8, 0xdf, 0xe2, + 0xb9, 0x18, 0xb7, 0xfa, 0x41, 0xad, 0x24, 0x67, 0xb8, 0x2f, 0x67, 0xab, 0x4e, 0x82, 0xad, 0xfd, + 0x8a, 0x52, 0xb3, 0xb4, 0x35, 0x2e, 0x0c, 0x5f, 0x95, 0x8f, 0x7c, 0x58, 0xb2, 0xc5, 0x34, 0x9a, + 0x52, 0x5a, 0x9e, 0x5a, 0xe9, 0x4d, 0xa1, 0xb0, 0x33, 0x2e, 0x08, 0x5f, 0x95, 0x8d, 0x7e, 0x08, + 0x2b, 0x1a, 0x78, 0x75, 0xae, 0xad, 0x81, 0xf4, 0x54, 0x5d, 0x4c, 0xda, 0x9d, 0x89, 0x54, 0xf8, + 0x13, 0x24, 0x20, 0x1b, 0x8a, 0x6e, 0xd8, 0x5b, 0x2a, 0xb2, 0xb0, 0x7f, 0x2b, 0xdb, 0x2d, 0xe2, + 0xe8, 0x6f, 0x26, 0x7b, 0x4a, 0x34, 0x37, 0xaa, 0x76, 0xa2, 0x64, 0xa3, 0x33, 0xa8, 0x58, 0x9e, + 0xe7, 0x73, 0x2b, 0x9c, 0xb4, 0xe7, 0xa4, 0xaa, 0xcd, 0xa9, 0x55, 0x6d, 0xc6, 0x32, 0xc6, 0x7a, + 0x58, 0x02, 0x83, 0x93, 0xaa, 0xd0, 0x13, 0x58, 0xf0, 0x9f, 0x78, 0x84, 0x62, 0x72, 0x4c, 0x28, + 0xf1, 0xc4, 0x5a, 0x56, 0x95, 0xda, 0xbf, 0x96, 0x51, 0x7b, 0x8a, 0x39, 0x0e, 0xe9, 0x34, 0x9c, + 0xe1, 0x71, 0x2d, 0x62, 0x0f, 0x3d, 0x76, 0x3c, 0xcb, 0x75, 0x7e, 0x4a, 0x28, 0xab, 0xcd, 0xc7, + 0x7b, 0xe8, 0xbd, 0x08, 0x8a, 0x13, 0x14, 0xe8, 0xeb, 0x50, 0xe9, 0xba, 0x03, 0xc6, 0x09, 0x95, + 0x15, 0x62, 0x41, 0x66, 0x50, 0x74, 0xbf, 0xad, 0x18, 0x85, 0x93, 0x74, 0x2b, 0xdf, 0x80, 0xca, + 0xff, 0xd8, 0x17, 0x45, 0x5f, 0x1d, 0x77, 0xe8, 0x54, 0x7d, 0xf5, 0x3f, 0x06, 0xcc, 0xa7, 0xdd, + 0x10, 0x4d, 0x63, 0xc6, 0xc4, 0x65, 0x5f, 0xd7, 0xca, 0xfc, 0xc4, 0x5a, 0xa9, 0x4a, 0xd2, 0xec, + 0xa7, 0x29, 0x49, 0x1b, 0x00, 0x56, 0xe0, 0xe8, 0x6a, 0x14, 0x56, 0xb7, 0xa8, 0x9e, 0xc4, 0x8b, + 0x33, 0x4e, 0x50, 0x89, 0x07, 0xeb, 0xfa, 0x1e, 0xa7, 0xbe, 0xeb, 0x12, 0x2a, 0x2b, 0x58, 0x29, + 0x7c, 0xb0, 0xad, 0x08, 0x8a, 0x13, 0x14, 0xe6, 0x3e, 0xa4, 0x37, 0x3e, 0x74, 0x37, 0x34, 0x3c, + 0xbc, 0xfb, 0xad, 0xa9, 0x8d, 0x36, 0x6f, 0x41, 0x19, 0xfb, 0x3e, 0x3f, 0xb0, 0xf8, 0x09, 0x43, + 0x0d, 0x28, 0x04, 0xe2, 0x87, 0x5a, 0xe7, 0xe5, 0x77, 0x0e, 0x89, 0xc1, 0x21, 0xdc, 0xfc, 0xb5, + 0x01, 0xaf, 0x4c, 0xdc, 0xae, 0x85, 0x03, 0xba, 0xd1, 0x49, 0x99, 0x14, 0x39, 0x20, 0xa6, 0xc3, + 0x09, 0x2a, 0xd1, 0xb6, 0x53, 0x2b, 0xf9, 0x78, 0xdb, 0x4e, 0x69, 0xc3, 0x69, 0x5a, 0xf3, 0xdf, + 0x39, 0x28, 0x1e, 0x72, 0x8b, 0x0f, 0x18, 0x7a, 0x0c, 0x25, 0x91, 0x3d, 0xb6, 0xc5, 0x2d, 0xa9, + 0x39, 0xf3, 0x17, 0x2b, 0x3d, 0xfe, 0xc4, 0x1d, 0x4b, 0x43, 0x70, 0x24, 0x51, 0xac, 0xaa, 0x4c, + 0xea, 0x51, 0xe6, 0x45, 0x25, 0x27, 0xd4, 0x8e, 0x15, 0x56, 0x8c, 0xeb, 0x7d, 0xc2, 0x98, 0xd5, + 0xd3, 0xb1, 0x16, 0x8d, 0xeb, 0x7b, 0x21, 0x18, 0x6b, 0x3c, 0x7a, 0x1b, 0x8a, 0x94, 0x58, 0x2c, + 0x1a, 0x22, 0xea, 0x5a, 0x24, 0x96, 0xd0, 0xcb, 0x51, 0x63, 0x4e, 0x09, 0x97, 0x67, 0xac, 0xa8, + 0xd1, 0x7b, 0x70, 0xc3, 0x26, 0xdc, 0x72, 0xdc, 0x70, 0x76, 0xc8, 0xfc, 0xed, 0x20, 0x14, 0xd6, + 0x09, 0x59, 0xdb, 0x15, 0x61, 0x93, 0x3a, 0x60, 0x2d, 0x50, 0xe4, 0x49, 0xd7, 0xb7, 0x89, 0x8c, + 0xc3, 0x42, 0x9c, 0x27, 0x5b, 0xbe, 0x4d, 0xb0, 0xc4, 0x98, 0x4f, 0x0d, 0xa8, 0x84, 0x92, 0xb6, + 0xac, 0x01, 0x23, 0x68, 0x3d, 0xba, 0x45, 0xf8, 0xdc, 0xba, 0xb1, 0xcd, 0xbe, 0x7b, 0x1e, 0x90, + 0xcb, 0x51, 0xa3, 0x2c, 0xc9, 0xc4, 0x21, 0xba, 0x40, 0xc2, 0x47, 0xb9, 0x6b, 0x7c, 0xf4, 0x1a, + 0x14, 0xe4, 0x9c, 0xa6, 0x9c, 0x19, 0x8d, 0x65, 0x72, 0x96, 0xc3, 0x21, 0xce, 0xfc, 0x5d, 0x0e, + 0xaa, 0xa9, 0xcb, 0x65, 0x18, 0x8d, 0xa2, 0xdd, 0x2b, 0x97, 0x61, 0x9f, 0x9f, 0xfc, 0x11, 0xf1, + 0xfb, 0x50, 0xec, 0x8a, 0xfb, 0xe9, 0xaf, 0xb8, 0xeb, 0xd3, 0x3c, 0x85, 0xf4, 0x4c, 0x1c, 0x49, + 0xf2, 0xc8, 0xb0, 0x12, 0x88, 0x76, 0x60, 0x89, 0x12, 0x4e, 0xcf, 0x37, 0x8f, 0x39, 0xa1, 0xc9, + 0x61, 0xb1, 0x10, 0x0f, 0x0f, 0x78, 0x9c, 0x00, 0x5f, 0xe5, 0x31, 0x5d, 0x98, 0x15, 0x8d, 0x5d, + 0xb8, 0x9d, 0xa5, 0x3e, 0x5b, 0x45, 0x6e, 0xd7, 0xcc, 0x1a, 0x2f, 0xbc, 0xe3, 0x59, 0x9e, 0x1f, + 0x06, 0x7b, 0x21, 0xf6, 0xce, 0x03, 0x01, 0xc4, 0x21, 0xee, 0xce, 0xb2, 0x58, 0x20, 0x7f, 0xf5, + 0xac, 0x31, 0xf3, 0xf4, 0x59, 0x63, 0xe6, 0xa3, 0x67, 0x6a, 0x99, 0xfc, 0x01, 0x94, 0xe3, 0x31, + 0xe2, 0x33, 0x56, 0x69, 0xfe, 0x08, 0x4a, 0x22, 0x92, 0xf4, 0xf8, 0x7b, 0x4d, 0xd1, 0x4f, 0x97, + 0xe3, 0x5c, 0x96, 0x72, 0x6c, 0x6e, 0x40, 0xf8, 0x5d, 0x57, 0x54, 0x42, 0x87, 0x93, 0x7e, 0xaa, + 0x12, 0xee, 0x0a, 0x00, 0x0e, 0xe1, 0x89, 0xfd, 0xf9, 0x17, 0x06, 0x80, 0xdc, 0x13, 0xb6, 0x87, + 0x62, 0xb7, 0x5b, 0x85, 0x59, 0x51, 0x62, 0xc7, 0x0d, 0x93, 0x29, 0x20, 0x31, 0xe8, 0x21, 0x14, + 0x7d, 0x39, 0x5e, 0xa8, 0x8f, 0x7f, 0x6f, 0x4e, 0x8c, 0x1a, 0xf5, 0x2f, 0x9b, 0x26, 0xb6, 0x9e, + 0x6c, 0x9f, 0x71, 0xe2, 0x09, 0x1b, 0xe3, 0x88, 0x09, 0x67, 0x14, 0xac, 0x84, 0xb5, 0x5f, 0x7f, + 0xfe, 0xa2, 0x3e, 0xf3, 0xf1, 0x8b, 0xfa, 0xcc, 0xdf, 0x5e, 0xd4, 0x67, 0x3e, 0xb8, 0xa8, 0x1b, + 0xcf, 0x2f, 0xea, 0xc6, 0xc7, 0x17, 0x75, 0xe3, 0x1f, 0x17, 0x75, 0xe3, 0xe9, 0x3f, 0xeb, 0x33, + 0xef, 0xe5, 0x86, 0xeb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x99, 0xeb, 0x4a, 0xdd, 0xf4, 0x1a, + 0x00, 0x00, } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto index 730a165552816..60049067bda2c 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto @@ -21,10 +21,9 @@ syntax = 'proto2'; package k8s.io.apimachinery.pkg.apis.meta.v1; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/runtime/generated.pb.go index cd37f4ab1f9e3..9947bd8e1af77 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/generated.pb.go @@ -738,31 +738,30 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 406 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xbf, 0x8f, 0xd3, 0x30, - 0x1c, 0xc5, 0x93, 0x6b, 0xa5, 0x1e, 0x6e, 0xa5, 0x43, 0x66, 0x20, 0x74, 0x70, 0x4e, 0x9d, 0xe8, - 0x80, 0x2d, 0x4e, 0x20, 0xb1, 0x5e, 0x4e, 0x27, 0x81, 0x10, 0x12, 0xb2, 0xf8, 0x21, 0x31, 0xe1, - 0x26, 0x26, 0x67, 0x85, 0x7e, 0x1d, 0x39, 0x0e, 0xe1, 0x36, 0xfe, 0x04, 0xfe, 0xac, 0x8e, 0x37, - 0x32, 0x55, 0x34, 0xfc, 0x11, 0xac, 0x28, 0xae, 0x5b, 0x4a, 0x2b, 0x74, 0x5b, 0xec, 0xf7, 0x3e, - 0xcf, 0xef, 0x05, 0x3d, 0x2f, 0x9e, 0x55, 0x54, 0x69, 0x56, 0xd4, 0x33, 0x69, 0x40, 0x5a, 0x59, - 0xb1, 0x2f, 0x12, 0x32, 0x6d, 0x98, 0x17, 0x44, 0xa9, 0xe6, 0x22, 0xbd, 0x52, 0x20, 0xcd, 0x35, + // 391 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x8b, 0xd3, 0x40, + 0x18, 0xc6, 0x93, 0x6d, 0xa1, 0xeb, 0xb4, 0xb0, 0x32, 0x1e, 0x8c, 0x7b, 0x98, 0x2c, 0x3d, 0xd9, + 0x83, 0x33, 0xb0, 0x22, 0x78, 0xdd, 0x94, 0x82, 0x22, 0x82, 0x0c, 0xfe, 0x01, 0x4f, 0x4e, 0x93, + 0x31, 0x1d, 0x62, 0xdf, 0x09, 0x93, 0x89, 0xb1, 0x37, 0x3f, 0x82, 0x1f, 0xab, 0xc7, 0x1e, 0x3d, + 0x15, 0x1b, 0x3f, 0x84, 0x57, 0xe9, 0x74, 0x5a, 0x6b, 0x45, 0xf6, 0x96, 0x79, 0x9f, 0xe7, 0xf7, + 0xbc, 0xcf, 0x1b, 0xf4, 0xac, 0x78, 0x5a, 0x51, 0xa5, 0x59, 0x51, 0x4f, 0xa5, 0x01, 0x69, 0x65, + 0xc5, 0x3e, 0x4b, 0xc8, 0xb4, 0x61, 0x5e, 0x10, 0xa5, 0x9a, 0x8b, 0x74, 0xa6, 0x40, 0x9a, 0x05, 0x2b, 0x8b, 0x9c, 0x99, 0x1a, 0xac, 0x9a, 0x4b, 0x96, 0x4b, 0x90, 0x46, 0x58, 0x99, 0xd1, 0xd2, - 0x68, 0xab, 0x71, 0xbc, 0x06, 0xe8, 0x2e, 0x40, 0xcb, 0x22, 0xa7, 0x1e, 0x18, 0x3f, 0xca, 0x95, - 0xbd, 0xaa, 0x67, 0x34, 0xd5, 0x73, 0x96, 0xeb, 0x5c, 0x33, 0xc7, 0xcd, 0xea, 0x4f, 0xee, 0xe4, - 0x0e, 0xee, 0x6b, 0x9d, 0x37, 0x7e, 0xf2, 0xbf, 0x02, 0xa2, 0x54, 0xcc, 0xc8, 0x4a, 0xd7, 0x26, - 0x3d, 0x68, 0x31, 0x7e, 0x7c, 0xb8, 0xa7, 0x63, 0x6a, 0xab, 0x3e, 0x33, 0x05, 0xb6, 0xb2, 0x66, - 0x1f, 0x99, 0x4c, 0xd1, 0x88, 0x8b, 0xe6, 0xf2, 0xab, 0x95, 0x50, 0x29, 0x0d, 0xf8, 0x01, 0xea, - 0x19, 0xd1, 0x44, 0xe1, 0x69, 0xf8, 0x70, 0x94, 0x0c, 0xda, 0x65, 0xdc, 0xe3, 0xa2, 0xe1, 0xdd, - 0xdd, 0xe4, 0x23, 0x3a, 0x7e, 0x73, 0x5d, 0xca, 0x57, 0xd2, 0x0a, 0x7c, 0x86, 0x90, 0x28, 0xd5, - 0x3b, 0x69, 0x3a, 0xc8, 0xb9, 0xef, 0x24, 0x78, 0xb1, 0x8c, 0x83, 0x76, 0x19, 0xa3, 0xf3, 0xd7, - 0x2f, 0xbc, 0xc2, 0x77, 0x5c, 0xf8, 0x14, 0xf5, 0x0b, 0x05, 0x59, 0x74, 0xe4, 0xdc, 0x23, 0xef, - 0xee, 0xbf, 0x54, 0x90, 0x71, 0xa7, 0x4c, 0x7e, 0x87, 0x68, 0xf0, 0x16, 0x0a, 0xd0, 0x0d, 0xe0, - 0xf7, 0xe8, 0xd8, 0xfa, 0xd7, 0x5c, 0xfe, 0xf0, 0x6c, 0x4a, 0x6f, 0xf9, 0xc9, 0x74, 0x53, 0x2f, - 0xb9, 0xeb, 0xc3, 0xb7, 0x85, 0xf9, 0x36, 0x6c, 0xb3, 0xf0, 0xe8, 0x70, 0x21, 0x3e, 0x47, 0x27, - 0xa9, 0x06, 0x2b, 0xc1, 0x5e, 0x42, 0xaa, 0x33, 0x05, 0x79, 0xd4, 0x73, 0x65, 0xef, 0xfb, 0xbc, - 0x93, 0x8b, 0x7f, 0x65, 0xbe, 0xef, 0xc7, 0x4f, 0xd1, 0xd0, 0x5f, 0x75, 0x4f, 0x47, 0x7d, 0x87, - 0xdf, 0xf3, 0xf8, 0xf0, 0xe2, 0xaf, 0xc4, 0x77, 0x7d, 0xc9, 0x74, 0xb1, 0x22, 0xc1, 0xcd, 0x8a, - 0x04, 0x3f, 0x56, 0x24, 0xf8, 0xd6, 0x92, 0x70, 0xd1, 0x92, 0xf0, 0xa6, 0x25, 0xe1, 0xcf, 0x96, - 0x84, 0xdf, 0x7f, 0x91, 0xe0, 0xc3, 0xc0, 0x8f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x64, 0x29, - 0x25, 0xfb, 0xb5, 0x02, 0x00, 0x00, + 0x68, 0xab, 0x71, 0xbc, 0x03, 0xe8, 0x31, 0x40, 0xcb, 0x22, 0xa7, 0x1e, 0xb8, 0x7c, 0x94, 0x2b, + 0x3b, 0xab, 0xa7, 0x34, 0xd5, 0x73, 0x96, 0xeb, 0x5c, 0x33, 0xc7, 0x4d, 0xeb, 0x8f, 0xee, 0xe5, + 0x1e, 0xee, 0x6b, 0x97, 0x77, 0xf9, 0xf8, 0x7f, 0x05, 0x6a, 0xab, 0x3e, 0x31, 0x05, 0xb6, 0xb2, + 0xe6, 0xb4, 0xc4, 0x70, 0x84, 0x06, 0x5c, 0x34, 0x93, 0x2f, 0x56, 0x42, 0xa5, 0x34, 0xe0, 0x07, + 0xa8, 0x63, 0x44, 0x13, 0x85, 0x57, 0xe1, 0xc3, 0x41, 0xd2, 0x6b, 0xd7, 0x71, 0x87, 0x8b, 0x86, + 0x6f, 0x67, 0xc3, 0x0f, 0xe8, 0xfc, 0xf5, 0xa2, 0x94, 0x2f, 0xa5, 0x15, 0xf8, 0x1a, 0x21, 0x51, + 0xaa, 0xb7, 0xd2, 0x6c, 0x21, 0xe7, 0xbe, 0x93, 0xe0, 0xe5, 0x3a, 0x0e, 0xda, 0x75, 0x8c, 0x6e, + 0x5e, 0x3d, 0xf7, 0x0a, 0x3f, 0x72, 0xe1, 0x2b, 0xd4, 0x2d, 0x14, 0x64, 0xd1, 0x99, 0x73, 0x0f, + 0xbc, 0xbb, 0xfb, 0x42, 0x41, 0xc6, 0x9d, 0x32, 0xfc, 0x15, 0xa2, 0xde, 0x1b, 0x28, 0x40, 0x37, + 0x80, 0xdf, 0xa1, 0x73, 0xeb, 0xb7, 0xb9, 0xfc, 0xfe, 0xf5, 0x88, 0xde, 0xf2, 0xc3, 0xe8, 0xbe, + 0x5e, 0x72, 0xd7, 0x87, 0x1f, 0x0a, 0xf3, 0x43, 0xd8, 0xfe, 0xc2, 0xb3, 0x7f, 0x2f, 0xc4, 0x37, + 0xe8, 0x22, 0xd5, 0x60, 0x25, 0xd8, 0x09, 0xa4, 0x3a, 0x53, 0x90, 0x47, 0x1d, 0x57, 0xf6, 0xbe, + 0xcf, 0xbb, 0x18, 0xff, 0x2d, 0xf3, 0x53, 0x3f, 0x7e, 0x82, 0xfa, 0x7e, 0xb4, 0x5d, 0x1d, 0x75, + 0x1d, 0x7e, 0xcf, 0xe3, 0xfd, 0xf1, 0x1f, 0x89, 0x1f, 0xfb, 0x92, 0xd1, 0x72, 0x43, 0x82, 0xd5, + 0x86, 0x04, 0xdf, 0x37, 0x24, 0xf8, 0xda, 0x92, 0x70, 0xd9, 0x92, 0x70, 0xd5, 0x92, 0xf0, 0x47, + 0x4b, 0xc2, 0x6f, 0x3f, 0x49, 0xf0, 0xbe, 0xe7, 0x8f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x5d, + 0x24, 0xc6, 0x1a, 0x81, 0x02, 0x00, 0x00, } diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/generated.proto b/staging/src/k8s.io/apimachinery/pkg/runtime/generated.proto index 180622f3aba36..57fc840785aa1 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/generated.proto @@ -21,8 +21,7 @@ syntax = 'proto2'; package k8s.io.apimachinery.pkg.runtime; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "runtime"; diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go index ecd3d6e1284c6..dfe4c5f53cfd7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go @@ -42,19 +42,18 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion1 var fileDescriptorGenerated = []byte{ - // 217 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0xcf, 0xb1, 0x4e, 0xc4, 0x30, - 0x0c, 0x06, 0xe0, 0x76, 0x61, 0x60, 0x64, 0xec, 0xe0, 0x11, 0xb1, 0x10, 0x0b, 0x89, 0x81, 0x99, - 0x17, 0x60, 0x67, 0x4b, 0x7b, 0x26, 0xb5, 0x4a, 0xe3, 0xc8, 0x71, 0x90, 0xd8, 0x78, 0x04, 0x1e, - 0xeb, 0xc6, 0x1b, 0x19, 0x69, 0x79, 0x11, 0x44, 0x73, 0x03, 0x3a, 0xc4, 0x96, 0x5f, 0xd1, 0x67, - 0xfd, 0xff, 0xf9, 0xc3, 0x74, 0x97, 0x1d, 0x0b, 0x4e, 0xa5, 0x27, 0x8d, 0x64, 0x94, 0xf1, 0x85, - 0xe2, 0x4e, 0x14, 0x8f, 0x1f, 0x3e, 0xf1, 0xec, 0x87, 0x91, 0x23, 0xe9, 0x2b, 0xa6, 0x29, 0xa0, - 0x96, 0x68, 0x3c, 0x13, 0xe6, 0x61, 0xa4, 0xd9, 0x63, 0xa0, 0x48, 0xea, 0x8d, 0x76, 0x2e, 0xa9, - 0x98, 0x5c, 0x5c, 0x56, 0xe7, 0x7e, 0x3b, 0x97, 0xa6, 0xe0, 0x8e, 0xce, 0x55, 0xd7, 0x5d, 0x07, - 0xb6, 0xb1, 0xf4, 0x6e, 0x90, 0x19, 0x83, 0x04, 0xc1, 0x8d, 0xf7, 0xe5, 0x69, 0x4b, 0x5b, 0xd8, - 0x5e, 0xf5, 0x6c, 0x77, 0xfb, 0x5f, 0x1d, 0x9f, 0x18, 0x95, 0xb2, 0x14, 0x1d, 0xe8, 0xb4, 0x4c, - 0x77, 0xf3, 0x77, 0xdd, 0x8f, 0x29, 0xc6, 0xcf, 0xc8, 0xd1, 0xb2, 0xe9, 0x29, 0xb9, 0xbf, 0xda, - 0x2f, 0xd0, 0x1c, 0x16, 0x68, 0x3e, 0x16, 0x68, 0xde, 0x56, 0x68, 0xf7, 0x2b, 0xb4, 0x87, 0x15, - 0xda, 0xcf, 0x15, 0xda, 0xf7, 0x2f, 0x68, 0x1e, 0xcf, 0xea, 0x82, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x8c, 0x83, 0xea, 0x6e, 0x3b, 0x01, 0x00, 0x00, + // 199 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0xce, 0x2f, 0x4e, 0x05, 0x31, + 0x10, 0xc7, 0xf1, 0xd6, 0x20, 0x90, 0xc8, 0x27, 0x46, 0x12, 0x0c, 0x1d, 0x81, 0x41, 0x73, 0x01, + 0x3c, 0xae, 0xbb, 0x6f, 0xe8, 0x36, 0xa5, 0x7f, 0xd2, 0x4e, 0x49, 0x70, 0x1c, 0x81, 0x63, 0xad, + 0x5c, 0x89, 0x64, 0xcb, 0x45, 0x48, 0xda, 0x15, 0x84, 0x04, 0xd7, 0x5f, 0x9a, 0xcf, 0xe4, 0x7b, + 0xf9, 0xe8, 0xee, 0x8b, 0xb2, 0x11, 0x5d, 0x9d, 0x28, 0x07, 0x62, 0x2a, 0xf8, 0x4a, 0xe1, 0x1c, + 0x33, 0x1e, 0x1f, 0x3a, 0x59, 0xaf, 0xe7, 0xc5, 0x06, 0xca, 0x6f, 0x98, 0x9c, 0xc1, 0x5c, 0x03, + 0x5b, 0x4f, 0x58, 0xe6, 0x85, 0xbc, 0x46, 0x43, 0x81, 0xb2, 0x66, 0x3a, 0xab, 0x94, 0x23, 0xc7, + 0xab, 0xeb, 0xe1, 0xd4, 0x6f, 0xa7, 0x92, 0x33, 0xea, 0x70, 0x6a, 0xb8, 0xd3, 0xad, 0xb1, 0xbc, + 0xd4, 0x49, 0xcd, 0xd1, 0xa3, 0x89, 0x26, 0x62, 0xe7, 0x53, 0x7d, 0xee, 0xab, 0x8f, 0xfe, 0x1a, + 0x67, 0x4f, 0x77, 0xff, 0xe5, 0x54, 0xb6, 0x2f, 0x68, 0x03, 0x17, 0xce, 0x7f, 0x5b, 0x1e, 0x6e, + 0xd6, 0x1d, 0xc4, 0xb6, 0x83, 0xf8, 0xdc, 0x41, 0xbc, 0x37, 0x90, 0x6b, 0x03, 0xb9, 0x35, 0x90, + 0x5f, 0x0d, 0xe4, 0xc7, 0x37, 0x88, 0xa7, 0x8b, 0x51, 0xf3, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd9, + 0x82, 0x09, 0xbe, 0x07, 0x01, 0x00, 0x00, } diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.proto b/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.proto index 1075813610502..ebc1a263d297a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.proto @@ -21,8 +21,7 @@ syntax = 'proto2'; package k8s.io.apimachinery.pkg.runtime.schema; -import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "schema"; diff --git a/pkg/util/intstr/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go similarity index 79% rename from pkg/util/intstr/generated.pb.go rename to staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go index f6257af63c457..7b9c554e0e50d 100644 --- a/pkg/util/intstr/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/pkg/util/intstr/generated.proto +// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto // DO NOT EDIT! /* Package intstr is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/pkg/util/intstr/generated.proto + k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto It has these top-level messages: IntOrString @@ -49,7 +49,7 @@ func (*IntOrString) ProtoMessage() {} func (*IntOrString) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} } func init() { - proto.RegisterType((*IntOrString)(nil), "k8s.io.kubernetes.pkg.util.intstr.IntOrString") + proto.RegisterType((*IntOrString)(nil), "k8s.io.apimachinery.pkg.util.intstr.IntOrString") } func (m *IntOrString) Marshal() (data []byte, err error) { size := m.Size() @@ -352,22 +352,23 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 269 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x44, 0x8f, 0x31, 0x4e, 0xc3, 0x30, - 0x18, 0x85, 0x6d, 0x5a, 0x2a, 0x08, 0x12, 0x43, 0xc4, 0x50, 0x31, 0x38, 0x81, 0x01, 0x79, 0xc1, - 0x16, 0x1b, 0x62, 0xcc, 0xd6, 0x09, 0x29, 0x45, 0x0c, 0x6c, 0x0d, 0x18, 0x63, 0xa5, 0xd8, 0x96, - 0xf3, 0x67, 0xe8, 0xd6, 0x23, 0xc0, 0xc6, 0xc8, 0x71, 0x32, 0x76, 0x64, 0x40, 0x15, 0x31, 0xb7, - 0x60, 0x42, 0x71, 0x22, 0x75, 0xb2, 0xdf, 0x7b, 0xdf, 0x67, 0xc9, 0xd1, 0x55, 0x79, 0x5d, 0x31, - 0x65, 0x78, 0x59, 0x17, 0xc2, 0x69, 0x01, 0xa2, 0xe2, 0xb6, 0x94, 0xbc, 0x06, 0xb5, 0xe4, 0x4a, - 0x43, 0x05, 0x8e, 0x4b, 0xa1, 0x85, 0x5b, 0x80, 0x78, 0x62, 0xd6, 0x19, 0x30, 0xf1, 0x59, 0xaf, - 0xb0, 0x9d, 0xc2, 0x6c, 0x29, 0x59, 0xa7, 0xb0, 0x5e, 0x39, 0xbd, 0x94, 0x0a, 0x5e, 0xea, 0x82, - 0x3d, 0x9a, 0x57, 0x2e, 0x8d, 0x34, 0x3c, 0x98, 0x45, 0xfd, 0x1c, 0x52, 0x08, 0xe1, 0xd6, 0xbf, - 0x78, 0xfe, 0x8e, 0xa3, 0xa3, 0x99, 0x86, 0x5b, 0x37, 0x07, 0xa7, 0xb4, 0x8c, 0x69, 0x34, 0x86, - 0x95, 0x15, 0x53, 0x9c, 0x62, 0x3a, 0xca, 0x4e, 0x9a, 0x6d, 0x82, 0xfc, 0x36, 0x19, 0xdf, 0xad, - 0xac, 0xf8, 0x1b, 0xce, 0x3c, 0x10, 0xf1, 0x45, 0x34, 0x51, 0x1a, 0xee, 0x17, 0xcb, 0xe9, 0x5e, - 0x8a, 0xe9, 0x7e, 0x76, 0x3c, 0xb0, 0x93, 0x59, 0x68, 0xf3, 0x61, 0xed, 0xb8, 0x0a, 0x5c, 0xc7, - 0x8d, 0x52, 0x4c, 0x0f, 0x77, 0xdc, 0x3c, 0xb4, 0xf9, 0xb0, 0xde, 0x1c, 0x7c, 0x7c, 0x26, 0x68, - 0xfd, 0x9d, 0xa2, 0x8c, 0x36, 0x2d, 0x41, 0x9b, 0x96, 0xa0, 0xaf, 0x96, 0xa0, 0xb5, 0x27, 0xb8, - 0xf1, 0x04, 0x6f, 0x3c, 0xc1, 0x3f, 0x9e, 0xe0, 0xb7, 0x5f, 0x82, 0x1e, 0x26, 0xfd, 0x67, 0xff, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x68, 0x57, 0xfb, 0xfa, 0x43, 0x01, 0x00, 0x00, + // 288 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x4b, 0xf4, 0x30, + 0x1c, 0xc6, 0x93, 0xf7, 0xee, 0x3d, 0xb4, 0x82, 0x43, 0x71, 0x38, 0x1c, 0xd2, 0xa2, 0x20, 0x5d, + 0x4c, 0x56, 0x71, 0xec, 0x76, 0x20, 0x08, 0x3d, 0x71, 0x70, 0x6b, 0xef, 0x62, 0x2e, 0xf4, 0x2e, + 0x09, 0xe9, 0xbf, 0x42, 0xb7, 0xfb, 0x08, 0xba, 0x39, 0xfa, 0x71, 0x3a, 0xde, 0xe8, 0x20, 0x87, + 0xad, 0xdf, 0xc2, 0x49, 0x9a, 0x16, 0x74, 0x4a, 0x9e, 0xe7, 0xf9, 0xfd, 0x02, 0xf1, 0x6e, 0xf2, + 0xab, 0x82, 0x4a, 0xcd, 0xf2, 0x32, 0xe3, 0x56, 0x71, 0xe0, 0x05, 0x7b, 0xe2, 0x6a, 0xa9, 0x2d, + 0x1b, 0x86, 0xd4, 0xc8, 0x4d, 0xba, 0x58, 0x49, 0xc5, 0x6d, 0xc5, 0x4c, 0x2e, 0x58, 0x09, 0x72, + 0xcd, 0xa4, 0x82, 0x02, 0x2c, 0x13, 0x5c, 0x71, 0x9b, 0x02, 0x5f, 0x52, 0x63, 0x35, 0x68, 0xff, + 0xbc, 0x97, 0xe8, 0x5f, 0x89, 0x9a, 0x5c, 0xd0, 0x4e, 0xa2, 0xbd, 0x74, 0x7a, 0x29, 0x24, 0xac, + 0xca, 0x8c, 0x2e, 0xf4, 0x86, 0x09, 0x2d, 0x34, 0x73, 0x6e, 0x56, 0x3e, 0xba, 0xe4, 0x82, 0xbb, + 0xf5, 0x6f, 0x9e, 0xbd, 0x60, 0xef, 0x68, 0xa6, 0xe0, 0xd6, 0xce, 0xc1, 0x4a, 0x25, 0xfc, 0xc8, + 0x1b, 0x43, 0x65, 0xf8, 0x14, 0x87, 0x38, 0x1a, 0xc5, 0x27, 0xf5, 0x3e, 0x40, 0xed, 0x3e, 0x18, + 0xdf, 0x55, 0x86, 0x7f, 0x0f, 0x67, 0xe2, 0x08, 0xff, 0xc2, 0x9b, 0x48, 0x05, 0xf7, 0xe9, 0x7a, + 0xfa, 0x2f, 0xc4, 0xd1, 0xff, 0xf8, 0x78, 0x60, 0x27, 0x33, 0xd7, 0x26, 0xc3, 0xda, 0x71, 0x05, + 0xd8, 0x8e, 0x1b, 0x85, 0x38, 0x3a, 0xfc, 0xe5, 0xe6, 0xae, 0x4d, 0x86, 0xf5, 0xfa, 0xe0, 0xf5, + 0x2d, 0x40, 0xdb, 0x8f, 0x10, 0xc5, 0x51, 0xdd, 0x10, 0xb4, 0x6b, 0x08, 0x7a, 0x6f, 0x08, 0xda, + 0xb6, 0x04, 0xd7, 0x2d, 0xc1, 0xbb, 0x96, 0xe0, 0xcf, 0x96, 0xe0, 0xe7, 0x2f, 0x82, 0x1e, 0x26, + 0xfd, 0x67, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x55, 0xdf, 0x2a, 0x60, 0x01, 0x00, 0x00, } diff --git a/pkg/util/intstr/generated.proto b/staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.proto similarity index 96% rename from pkg/util/intstr/generated.proto rename to staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.proto index 6ac2cfb0bfddb..cccaf6f689128 100644 --- a/pkg/util/intstr/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.proto @@ -19,7 +19,7 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kubernetes.pkg.util.intstr; +package k8s.io.apimachinery.pkg.util.intstr; // Package-wide variables from generator "generated". option go_package = "intstr"; diff --git a/pkg/util/intstr/intstr.go b/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go similarity index 100% rename from pkg/util/intstr/intstr.go rename to staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go diff --git a/pkg/util/intstr/intstr_test.go b/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr_test.go similarity index 100% rename from pkg/util/intstr/intstr_test.go rename to staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr_test.go diff --git a/staging/src/k8s.io/client-go/pkg/api/resource/generated.pb.go b/staging/src/k8s.io/client-go/pkg/api/resource/generated.pb.go index a724df07953db..888bd6036b26d 100644 --- a/staging/src/k8s.io/client-go/pkg/api/resource/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/api/resource/generated.pb.go @@ -51,20 +51,21 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 236 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x8f, 0xa1, 0x4e, 0x03, 0x41, - 0x10, 0x86, 0x67, 0x0d, 0x29, 0x27, 0x1b, 0x42, 0x48, 0xc5, 0x5e, 0x53, 0x45, 0x48, 0xd8, 0x09, - 0xa8, 0x06, 0xc9, 0x1b, 0x80, 0xc4, 0xdd, 0x95, 0x61, 0x99, 0x1c, 0xec, 0x6e, 0x76, 0x67, 0x05, - 0xae, 0x12, 0x59, 0x89, 0xec, 0xbd, 0x4d, 0x65, 0x25, 0x02, 0xc1, 0x1d, 0x2f, 0x42, 0x72, 0xa5, - 0x21, 0x21, 0xb8, 0xf9, 0xc4, 0x37, 0xf9, 0xfe, 0xe2, 0xb2, 0x99, 0x27, 0xc3, 0x1e, 0x9b, 0x5c, - 0x53, 0x74, 0x24, 0x94, 0x30, 0x34, 0x16, 0xab, 0xc0, 0x18, 0x29, 0xf9, 0x1c, 0x17, 0x84, 0x96, - 0x1c, 0xc5, 0x4a, 0xe8, 0xde, 0x84, 0xe8, 0xc5, 0x8f, 0x67, 0x3b, 0xc7, 0xfc, 0x3a, 0x26, 0x34, - 0xd6, 0x54, 0x81, 0xcd, 0xde, 0x99, 0x9c, 0x5b, 0x96, 0xc7, 0x5c, 0x9b, 0x85, 0x7f, 0x46, 0xeb, - 0xad, 0xc7, 0x41, 0xad, 0xf3, 0xc3, 0x40, 0x03, 0x0c, 0xd7, 0xee, 0xe5, 0xe4, 0xe2, 0xff, 0x8c, - 0x2c, 0xfc, 0x84, 0xec, 0x24, 0x49, 0xfc, 0x5b, 0x31, 0x9b, 0x17, 0xa3, 0x9b, 0x5c, 0x39, 0x61, - 0x79, 0x19, 0x1f, 0x17, 0x07, 0x49, 0x22, 0x3b, 0x7b, 0xa2, 0xa6, 0xea, 0xf4, 0xf0, 0xf6, 0x87, - 0xae, 0x8e, 0xde, 0xd6, 0x25, 0xbc, 0xb6, 0x25, 0xac, 0xda, 0x12, 0xd6, 0x6d, 0x09, 0xcb, 0x8f, - 0x29, 0x5c, 0x9f, 0x6d, 0x3a, 0x0d, 0xdb, 0x4e, 0xc3, 0x7b, 0xa7, 0x61, 0xd9, 0x6b, 0xb5, 0xe9, - 0xb5, 0xda, 0xf6, 0x5a, 0x7d, 0xf6, 0x5a, 0xad, 0xbe, 0x34, 0xdc, 0x8d, 0xf6, 0x3b, 0xbe, 0x03, - 0x00, 0x00, 0xff, 0xff, 0x90, 0x1c, 0x7f, 0xff, 0x20, 0x01, 0x00, 0x00, + // 245 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x8f, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x86, 0xed, 0x05, 0x95, 0x8c, 0x15, 0x42, 0xa8, 0x83, 0x53, 0x75, 0x42, 0x48, 0xd8, 0x12, + 0x2c, 0x15, 0x23, 0x6f, 0x00, 0x23, 0x9b, 0x13, 0x0e, 0xf7, 0x14, 0x6a, 0x5b, 0xf6, 0x79, 0xe8, + 0xd6, 0x91, 0xb1, 0x23, 0x63, 0xf3, 0x36, 0x1d, 0x3b, 0x32, 0x30, 0x90, 0xf0, 0x22, 0x48, 0x6e, + 0x23, 0xa4, 0x6e, 0xf7, 0x0d, 0xdf, 0xe9, 0xfb, 0x8b, 0xbb, 0x66, 0x1e, 0x25, 0x3a, 0xd5, 0xa4, + 0x0a, 0x82, 0x05, 0x82, 0xa8, 0x7c, 0x63, 0x94, 0xf6, 0xa8, 0x02, 0x44, 0x97, 0x42, 0x0d, 0xca, + 0x80, 0x85, 0xa0, 0x09, 0x5e, 0xa5, 0x0f, 0x8e, 0xdc, 0x78, 0x76, 0x70, 0xe4, 0xbf, 0x23, 0x7d, + 0x63, 0xa4, 0xf6, 0x28, 0x07, 0x67, 0x72, 0x6b, 0x90, 0x16, 0xa9, 0x92, 0xb5, 0x5b, 0x2a, 0xe3, + 0x8c, 0x53, 0x59, 0xad, 0xd2, 0x5b, 0xa6, 0x0c, 0xf9, 0x3a, 0xbc, 0x9c, 0xdc, 0x1f, 0x33, 0xb4, + 0xc7, 0xa5, 0xae, 0x17, 0x68, 0x21, 0xac, 0x72, 0x48, 0x22, 0x7c, 0x57, 0x68, 0x29, 0x52, 0x38, + 0xed, 0x98, 0xcd, 0x8b, 0xd1, 0x53, 0xd2, 0x96, 0x90, 0x56, 0xe3, 0xcb, 0xe2, 0x2c, 0x52, 0x40, + 0x6b, 0xae, 0xf8, 0x94, 0x5f, 0x9f, 0x3f, 0x1f, 0xe9, 0xe1, 0xe2, 0x73, 0x5b, 0xb2, 0x8f, 0xb6, + 0x64, 0x9b, 0xb6, 0x64, 0xdb, 0xb6, 0x64, 0xeb, 0xef, 0x29, 0x7b, 0xbc, 0xd9, 0x75, 0x82, 0xed, + 0x3b, 0xc1, 0xbe, 0x3a, 0xc1, 0xd6, 0xbd, 0xe0, 0xbb, 0x5e, 0xf0, 0x7d, 0x2f, 0xf8, 0x4f, 0x2f, + 0xf8, 0xe6, 0x57, 0xb0, 0x97, 0xd1, 0xb0, 0xe4, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x55, 0x28, 0xd5, + 0x78, 0x22, 0x01, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/api/resource/generated.proto b/staging/src/k8s.io/client-go/pkg/api/resource/generated.proto index 8dffa518a7986..0fb8d3317fda6 100644 --- a/staging/src/k8s.io/client-go/pkg/api/resource/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/api/resource/generated.proto @@ -21,7 +21,7 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.api.resource; -import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "resource"; diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 4f62b91b1c863..dba90f87ca9e4 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -139,7 +139,6 @@ go_library( "//pkg/security/apparmor:go_default_library", "//pkg/util:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/util/system:go_default_library", "//pkg/util/version:go_default_library", @@ -180,6 +179,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/json", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", diff --git a/test/e2e/autoscaling_utils.go b/test/e2e/autoscaling_utils.go index 4c58c012c329d..913d02278ab01 100644 --- a/test/e2e/autoscaling_utils.go +++ b/test/e2e/autoscaling_utils.go @@ -23,10 +23,10 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index e8debd94fb542..dad63ee727aff 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -38,7 +38,6 @@ go_library( "//pkg/kubelet:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/sysctl:go_default_library", - "//pkg/util/intstr:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", "//vendor:github.com/golang/glog", @@ -49,6 +48,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go index 19f7fce3a36d4..8bf1eddb4e795 100644 --- a/test/e2e/common/container_probe.go +++ b/test/e2e/common/container_probe.go @@ -21,9 +21,9 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index d850c2d61c88d..a90f369ceac62 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -28,12 +28,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubelet" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 105bcae4fcff8..7501dd5748231 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/pkg/api/annotations" @@ -39,7 +40,6 @@ import ( deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/dns_configmap.go b/test/e2e/dns_configmap.go index 8f03a5db5a07b..6e31c07904581 100644 --- a/test/e2e/dns_configmap.go +++ b/test/e2e/dns_configmap.go @@ -24,10 +24,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/empty_dir_wrapper.go b/test/e2e/empty_dir_wrapper.go index 91a992ab60631..2d0ad6d0d649b 100644 --- a/test/e2e/empty_dir_wrapper.go +++ b/test/e2e/empty_dir_wrapper.go @@ -19,9 +19,9 @@ package e2e import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" "fmt" diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 4515aed5ef1d9..835a7a8fb6f94 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -65,7 +65,6 @@ go_library( "//pkg/metrics:go_default_library", "//pkg/ssh:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", "//pkg/util/system:go_default_library", "//pkg/util/version:go_default_library", @@ -95,6 +94,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/runtime", diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 34300e10f2864..b30a05a16fac2 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -30,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" @@ -41,7 +42,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/metrics" - "k8s.io/kubernetes/pkg/util/intstr" testutils "k8s.io/kubernetes/test/utils" . "github.com/onsi/ginkgo" diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index 3be398151c717..c0abe8e9cb284 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -31,6 +31,7 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/sets" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" - "k8s.io/kubernetes/pkg/util/intstr" ) const ( diff --git a/test/e2e/framework/service_util.go b/test/e2e/framework/service_util.go index 595aacd5883a0..6a57107ab690d 100644 --- a/test/e2e/framework/service_util.go +++ b/test/e2e/framework/service_util.go @@ -28,6 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/api/v1/service" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/util/intstr" testutils "k8s.io/kubernetes/test/utils" . "github.com/onsi/ginkgo" diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index 9d807009a815e..687edf2d42109 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -23,13 +23,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" clientv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/load.go b/test/e2e/load.go index 2939934728d02..f4b63ac73229d 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -30,6 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" restclient "k8s.io/client-go/rest" "k8s.io/client-go/transport" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go index 2e609d31eb0c9..c63c6b375d8e4 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/namespace.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index fb57c6f63a461..f2269c5baee3d 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/net" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index e15841cd07404..62b43b64429b2 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -24,9 +24,9 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" "github.com/aws/aws-sdk-go/aws/session" diff --git a/test/e2e/resource_quota.go b/test/e2e/resource_quota.go index f0f1d469574e9..3b612691a877a 100644 --- a/test/e2e/resource_quota.go +++ b/test/e2e/resource_quota.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/quota/evaluator/core" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/service.go b/test/e2e/service.go index 48a8741273854..ab80ffc6b884c 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -25,6 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/service" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/endpoint" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/statefulset.go b/test/e2e/statefulset.go index 90f0eb4d7c2c0..08b4c84ca413b 100644 --- a/test/e2e/statefulset.go +++ b/test/e2e/statefulset.go @@ -35,6 +35,7 @@ import ( klabels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" utilyaml "k8s.io/apimachinery/pkg/util/yaml" @@ -44,7 +45,6 @@ import ( apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller/statefulset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/ubernetes_lite.go index e6480ab6876da..4a4e29d02207c 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/ubernetes_lite.go @@ -24,11 +24,11 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" ) diff --git a/test/e2e_federation/BUILD b/test/e2e_federation/BUILD index aac855eeb5a38..1fdeb3e2e2285 100644 --- a/test/e2e_federation/BUILD +++ b/test/e2e_federation/BUILD @@ -32,7 +32,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/util/intstr:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e_federation/framework:go_default_library", @@ -40,6 +39,7 @@ go_library( "//vendor:github.com/onsi/gomega", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", diff --git a/test/e2e_federation/federated-ingress.go b/test/e2e_federation/federated-ingress.go index 42541d32633d7..7271f715d0756 100644 --- a/test/e2e_federation/federated-ingress.go +++ b/test/e2e_federation/federated-ingress.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" fedframework "k8s.io/kubernetes/test/e2e_federation/framework" diff --git a/test/e2e_federation/federation-util.go b/test/e2e_federation/federation-util.go index 6b21644c5cdba..01ef6921527e7 100644 --- a/test/e2e_federation/federation-util.go +++ b/test/e2e_federation/federation-util.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index d7c8b1f241f8f..783ebc8a1184f 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -87,7 +87,6 @@ go_test( "//pkg/kubelet/metrics:go_default_library", "//pkg/metrics:go_default_library", "//pkg/security/apparmor:go_default_library", - "//pkg/util/intstr:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e_node/services:go_default_library", @@ -111,6 +110,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/tools/cache", diff --git a/test/e2e_node/lifecycle_hook_test.go b/test/e2e_node/lifecycle_hook_test.go index ebd559aaff5bd..093d3983c700c 100644 --- a/test/e2e_node/lifecycle_hook_test.go +++ b/test/e2e_node/lifecycle_hook_test.go @@ -21,9 +21,9 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go index 5fa6c689c8ef5..2d5fabe4fbd58 100644 --- a/test/integration/evictions/evictions_test.go +++ b/test/integration/evictions/evictions_test.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" @@ -37,7 +38,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller/disruption" "k8s.io/kubernetes/pkg/controller/informers" - "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/soak/cauldron/BUILD b/test/soak/cauldron/BUILD index abfdb52457116..788251aab4185 100644 --- a/test/soak/cauldron/BUILD +++ b/test/soak/cauldron/BUILD @@ -21,10 +21,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/util/intstr:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index cfe73f329d36e..2856bc61ca8ba 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -32,10 +32,10 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/util/intstr" ) var ( diff --git a/test/soak/serve_hostnames/BUILD b/test/soak/serve_hostnames/BUILD index 337b7d396fab4..caf604bb4570a 100644 --- a/test/soak/serve_hostnames/BUILD +++ b/test/soak/serve_hostnames/BUILD @@ -22,12 +22,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/util/intstr:go_default_library", "//test/e2e/framework:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", ], diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 90ca2fecd89b5..7b0e46e34e88c 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -32,12 +32,12 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/util/intstr" e2e "k8s.io/kubernetes/test/e2e/framework" "github.com/golang/glog" diff --git a/vendor/BUILD b/vendor/BUILD index ca484fa87f926..2db8dc8ed7058 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13963,3 +13963,27 @@ go_test( tags = ["automanaged"], deps = ["//vendor:k8s.io/client-go/util/workqueue"], ) + +go_test( + name = "k8s.io/apimachinery/pkg/util/intstr_test", + srcs = ["k8s.io/apimachinery/pkg/util/intstr/intstr_test.go"], + library = ":k8s.io/apimachinery/pkg/util/intstr", + tags = ["automanaged"], + deps = ["//vendor:github.com/ghodss/yaml"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/util/intstr", + srcs = [ + "k8s.io/apimachinery/pkg/util/intstr/generated.pb.go", + "k8s.io/apimachinery/pkg/util/intstr/intstr.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/gogo/protobuf/proto", + "//vendor:github.com/golang/glog", + "//vendor:github.com/google/gofuzz", + "//vendor:k8s.io/apimachinery/pkg/openapi", + ], +)