From 48d76edc744ea2f8857717b51e6a564a4d49544b Mon Sep 17 00:00:00 2001 From: Anirudh Date: Tue, 23 May 2017 07:35:35 -0700 Subject: [PATCH] PDB MaxUnavailable: Generated --- api/openapi-spec/swagger.json | 4 + api/swagger-spec/policy_v1beta1.json | 4 + .../policy/v1beta1/definitions.html | 9 +- pkg/apis/apps/v1beta1/generated.pb.go | 198 ++++----- pkg/apis/apps/v1beta1/generated.proto | 2 +- pkg/apis/extensions/v1beta1/generated.pb.go | 387 +++++++++--------- pkg/apis/extensions/v1beta1/generated.proto | 1 + pkg/apis/policy/v1beta1/generated.pb.go | 183 ++++++--- pkg/apis/policy/v1beta1/generated.proto | 6 + pkg/apis/policy/v1beta1/types.generated.go | 222 +++++++--- .../v1beta1/types_swagger_doc_generated.go | 7 +- .../policy/v1beta1/zz_generated.conversion.go | 7 +- .../policy/v1beta1/zz_generated.deepcopy.go | 11 + pkg/apis/policy/zz_generated.deepcopy.go | 11 + pkg/controller/disruption/BUILD | 1 + .../pkg/apis/apps/v1beta1/generated.pb.go | 198 ++++----- .../pkg/apis/apps/v1beta1/generated.proto | 2 +- .../apis/extensions/v1beta1/generated.pb.go | 387 +++++++++--------- .../apis/extensions/v1beta1/generated.proto | 1 + .../k8s.io/client-go/pkg/apis/policy/types.go | 9 +- .../pkg/apis/policy/v1beta1/generated.pb.go | 183 ++++++--- .../pkg/apis/policy/v1beta1/generated.proto | 6 + .../apis/policy/v1beta1/types.generated.go | 222 +++++++--- .../pkg/apis/policy/v1beta1/types.go | 8 +- .../v1beta1/types_swagger_doc_generated.go | 7 +- .../policy/v1beta1/zz_generated.conversion.go | 7 +- .../policy/v1beta1/zz_generated.deepcopy.go | 11 + .../pkg/apis/policy/zz_generated.deepcopy.go | 11 + 28 files changed, 1262 insertions(+), 843 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 651e471644..b3aeda73c3 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -50491,6 +50491,10 @@ "io.k8s.kubernetes.pkg.apis.policy.v1beta1.PodDisruptionBudgetSpec": { "description": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.", "properties": { + "maxUnavailable": { + "description": "An eviction is allowed if at most \"maxUnavailable\" pods selected by \"selector\" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with \"minAvailable\".", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" + }, "minAvailable": { "description": "An eviction is allowed if at least \"minAvailable\" pods selected by \"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%\".", "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" diff --git a/api/swagger-spec/policy_v1beta1.json b/api/swagger-spec/policy_v1beta1.json index 9e643d5631..7a7dad8e36 100644 --- a/api/swagger-spec/policy_v1beta1.json +++ b/api/swagger-spec/policy_v1beta1.json @@ -1373,6 +1373,10 @@ "selector": { "$ref": "v1.LabelSelector", "description": "Label query over pods whose evictions are managed by the disruption budget." + }, + "maxUnavailable": { + "type": "string", + "description": "An eviction is allowed if at most \"maxUnavailable\" pods selected by \"selector\" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with \"minAvailable\"." } } }, diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html index 1057636904..da179dc1bb 100755 --- a/docs/api-reference/policy/v1beta1/definitions.html +++ b/docs/api-reference/policy/v1beta1/definitions.html @@ -1517,6 +1517,13 @@ Examples:

v1.LabelSelector

+ +

maxUnavailable

+

An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".

+

false

+

string

+ + @@ -1532,7 +1539,7 @@ Examples:
diff --git a/pkg/apis/apps/v1beta1/generated.pb.go b/pkg/apis/apps/v1beta1/generated.pb.go index 9ce331b5b6..16fe69f1eb 100644 --- a/pkg/apis/apps/v1beta1/generated.pb.go +++ b/pkg/apis/apps/v1beta1/generated.pb.go @@ -3891,103 +3891,103 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1563 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcb, 0x6f, 0x1b, 0x37, - 0x13, 0xf7, 0xda, 0x92, 0x2d, 0xd3, 0xb1, 0x1c, 0xd3, 0xfe, 0x62, 0x7d, 0xce, 0x07, 0x39, 0xd0, - 0x21, 0x8f, 0x0f, 0xc9, 0xaa, 0x71, 0xd2, 0xbc, 0xdc, 0x06, 0xb5, 0x92, 0x34, 0x4d, 0x61, 0x37, - 0x06, 0x65, 0x07, 0x4d, 0x9a, 0x02, 0xa5, 0x24, 0x66, 0xcd, 0x78, 0x5f, 0x58, 0x52, 0x82, 0x75, - 0xeb, 0xa5, 0x87, 0x02, 0x3d, 0xf4, 0xd4, 0x5b, 0xd1, 0x9e, 0x8b, 0x02, 0xfd, 0x37, 0x8c, 0xf6, - 0x92, 0x63, 0xd1, 0x83, 0x51, 0x3b, 0xff, 0x45, 0x4e, 0x05, 0xb9, 0xdc, 0x97, 0x76, 0x65, 0xcb, - 0x2a, 0x9a, 0x4b, 0x6f, 0x5a, 0xce, 0xfc, 0x7e, 0x33, 0x24, 0x67, 0x86, 0x33, 0x02, 0x37, 0x77, - 0x6e, 0x31, 0x9d, 0x3a, 0xd5, 0x9d, 0x76, 0x83, 0x78, 0x36, 0xe1, 0x84, 0x55, 0xdd, 0x1d, 0xa3, - 0x8a, 0x5d, 0xca, 0xaa, 0xd8, 0x75, 0x59, 0xb5, 0x73, 0xb5, 0x41, 0x38, 0xbe, 0x5a, 0x35, 0x88, - 0x4d, 0x3c, 0xcc, 0x49, 0x4b, 0x77, 0x3d, 0x87, 0x3b, 0xf0, 0x82, 0x0f, 0xd4, 0x23, 0xa0, 0xee, - 0xee, 0x18, 0xba, 0x00, 0xea, 0x02, 0xa8, 0x2b, 0xe0, 0xe2, 0x15, 0x83, 0xf2, 0xed, 0x76, 0x43, - 0x6f, 0x3a, 0x56, 0xd5, 0x70, 0x0c, 0xa7, 0x2a, 0xf1, 0x8d, 0xf6, 0x0b, 0xf9, 0x25, 0x3f, 0xe4, - 0x2f, 0x9f, 0x77, 0xf1, 0xba, 0x72, 0x08, 0xbb, 0xd4, 0xc2, 0xcd, 0x6d, 0x6a, 0x13, 0xaf, 0x1b, - 0xb9, 0x64, 0x11, 0x8e, 0xab, 0x9d, 0x94, 0x37, 0x8b, 0xd5, 0x7e, 0x28, 0xaf, 0x6d, 0x73, 0x6a, - 0x91, 0x14, 0xe0, 0xc6, 0x71, 0x00, 0xd6, 0xdc, 0x26, 0x16, 0x4e, 0xe1, 0xae, 0xf5, 0xc3, 0xb5, - 0x39, 0x35, 0xab, 0xd4, 0xe6, 0x8c, 0x7b, 0x29, 0x50, 0x6c, 0x4f, 0x8c, 0x78, 0x1d, 0xe2, 0x45, - 0x1b, 0x22, 0xbb, 0xd8, 0x72, 0x4d, 0x92, 0xb5, 0xa7, 0xcb, 0x7d, 0xaf, 0x26, 0x4b, 0xfb, 0xfd, - 0x23, 0x2e, 0x92, 0xec, 0x72, 0x62, 0x33, 0xea, 0xd8, 0x7d, 0xaf, 0xb3, 0xf2, 0xf3, 0x28, 0x00, - 0xf7, 0x89, 0x6b, 0x3a, 0x5d, 0x8b, 0xd8, 0x1c, 0x7e, 0x01, 0x0a, 0xe2, 0xa8, 0x5b, 0x98, 0xe3, - 0x92, 0x76, 0x4e, 0xbb, 0x38, 0xb5, 0xfc, 0x8e, 0xae, 0x2e, 0x3c, 0xbe, 0xf3, 0xe8, 0xca, 0x85, - 0xb6, 0xde, 0xb9, 0xaa, 0x3f, 0x6e, 0xbc, 0x24, 0x4d, 0xbe, 0x4e, 0x38, 0xae, 0xc1, 0xbd, 0xfd, - 0xa5, 0x91, 0xc3, 0xfd, 0x25, 0x10, 0xad, 0xa1, 0x90, 0x15, 0x3e, 0x05, 0x39, 0xe6, 0x92, 0x66, - 0x69, 0x54, 0xb2, 0xdf, 0xd4, 0x07, 0x0c, 0x27, 0x3d, 0x72, 0xb2, 0xee, 0x92, 0x66, 0xed, 0x94, - 0x32, 0x92, 0x13, 0x5f, 0x48, 0x52, 0x42, 0x0c, 0xc6, 0x19, 0xc7, 0xbc, 0xcd, 0x4a, 0x63, 0x92, - 0xfc, 0xf6, 0x30, 0xe4, 0x92, 0xa0, 0x56, 0x54, 0xf4, 0xe3, 0xfe, 0x37, 0x52, 0xc4, 0x95, 0x83, - 0x31, 0x30, 0x17, 0x29, 0xdf, 0x73, 0xec, 0x16, 0xe5, 0xd4, 0xb1, 0xe1, 0x0a, 0xc8, 0xf1, 0xae, - 0x4b, 0xe4, 0x99, 0x4d, 0xd6, 0x2e, 0x04, 0xce, 0x6d, 0x76, 0x5d, 0xf2, 0x66, 0x7f, 0x69, 0x21, - 0x03, 0x22, 0x44, 0x48, 0x82, 0xe0, 0x93, 0xd0, 0xef, 0x51, 0x09, 0xbf, 0x9b, 0x34, 0xfe, 0x66, - 0x7f, 0xe9, 0xc8, 0x90, 0xd0, 0x43, 0xce, 0xa4, 0xb3, 0xf0, 0x3c, 0x18, 0xf7, 0x08, 0x66, 0x8e, - 0x5d, 0xca, 0x49, 0xde, 0x70, 0x53, 0x48, 0xae, 0x22, 0x25, 0x85, 0x97, 0xc0, 0x84, 0x45, 0x18, - 0xc3, 0x06, 0x29, 0xe5, 0xa5, 0xe2, 0x8c, 0x52, 0x9c, 0x58, 0xf7, 0x97, 0x51, 0x20, 0x87, 0x2f, - 0x41, 0xd1, 0xc4, 0x8c, 0x6f, 0xb9, 0x2d, 0xcc, 0xc9, 0x26, 0xb5, 0x48, 0x69, 0x5c, 0x1e, 0xf5, - 0xff, 0x07, 0x8b, 0x12, 0x81, 0xa8, 0x9d, 0x51, 0xec, 0xc5, 0xb5, 0x04, 0x13, 0xea, 0x61, 0x86, - 0x1d, 0x00, 0xc5, 0xca, 0xa6, 0x87, 0x6d, 0xe6, 0x1f, 0x99, 0xb0, 0x37, 0x71, 0x62, 0x7b, 0x8b, - 0xca, 0x1e, 0x5c, 0x4b, 0xb1, 0xa1, 0x0c, 0x0b, 0x95, 0x3d, 0x0d, 0x14, 0xa3, 0x0b, 0x5b, 0xa3, - 0x8c, 0xc3, 0xe7, 0xa9, 0xb4, 0xd0, 0x07, 0x73, 0x40, 0xa0, 0x65, 0x52, 0x9c, 0x56, 0x4e, 0x14, - 0x82, 0x95, 0x58, 0x4a, 0x7c, 0x0a, 0xf2, 0x94, 0x13, 0x4b, 0x5c, 0xff, 0xd8, 0xc5, 0xa9, 0xe5, - 0x6b, 0x43, 0x84, 0x6d, 0x6d, 0x5a, 0xf1, 0xe7, 0x1f, 0x09, 0x26, 0xe4, 0x13, 0x56, 0xbe, 0x19, - 0x03, 0x30, 0x52, 0x42, 0x8e, 0x69, 0x36, 0x70, 0x73, 0x07, 0x9e, 0x03, 0x39, 0x1b, 0x5b, 0x41, - 0xb4, 0x86, 0xa9, 0xf4, 0x09, 0xb6, 0x08, 0x92, 0x12, 0xf8, 0x83, 0x06, 0x60, 0x5b, 0x5e, 0x45, - 0x6b, 0xd5, 0xb6, 0x1d, 0x8e, 0xc5, 0xe9, 0x04, 0x0e, 0xd6, 0x87, 0x70, 0x30, 0xb0, 0xad, 0x6f, - 0xa5, 0x58, 0x1f, 0xd8, 0xdc, 0xeb, 0x46, 0xb7, 0x94, 0x56, 0x40, 0x19, 0xae, 0xc0, 0x1d, 0x00, - 0x3c, 0xc5, 0xb9, 0xe9, 0xa8, 0x84, 0x1f, 0xbc, 0x9a, 0x04, 0xee, 0xdc, 0x73, 0xec, 0x17, 0xd4, - 0x88, 0x4a, 0x16, 0x0a, 0x29, 0x51, 0x8c, 0x7e, 0xf1, 0x01, 0x58, 0xe8, 0xe3, 0x37, 0x3c, 0x0d, - 0xc6, 0x76, 0x48, 0xd7, 0x3f, 0x4a, 0x24, 0x7e, 0xc2, 0x79, 0x90, 0xef, 0x60, 0xb3, 0x4d, 0xfc, - 0x6c, 0x46, 0xfe, 0xc7, 0x9d, 0xd1, 0x5b, 0x5a, 0xe5, 0x8f, 0x7c, 0x3c, 0xb2, 0x44, 0xe5, 0x82, - 0x17, 0x41, 0xc1, 0x23, 0xae, 0x49, 0x9b, 0x98, 0x49, 0x8e, 0x7c, 0xed, 0x94, 0x88, 0x12, 0xa4, - 0xd6, 0x50, 0x28, 0x85, 0x9f, 0x83, 0x02, 0x23, 0x26, 0x69, 0x72, 0xc7, 0x53, 0xc5, 0xf3, 0xda, - 0x80, 0x31, 0x88, 0x1b, 0xc4, 0xac, 0x2b, 0xa8, 0x4f, 0x1f, 0x7c, 0xa1, 0x90, 0x12, 0x7e, 0x06, - 0x0a, 0x9c, 0x58, 0xae, 0x89, 0x39, 0x51, 0xa7, 0x79, 0xa5, 0xff, 0x69, 0x0a, 0xda, 0x0d, 0xa7, - 0xb5, 0xa9, 0x00, 0xb2, 0x22, 0x87, 0x11, 0x1e, 0xac, 0xa2, 0x90, 0x10, 0x52, 0x50, 0x60, 0x5c, - 0x3c, 0x3b, 0x46, 0x57, 0xd6, 0xa2, 0xa9, 0xe5, 0x95, 0xa1, 0x6a, 0xb3, 0x4f, 0x11, 0x99, 0x0a, - 0x56, 0x50, 0x48, 0x0f, 0x57, 0xc1, 0x8c, 0x45, 0x6d, 0x44, 0x70, 0xab, 0x5b, 0x27, 0x4d, 0xc7, - 0x6e, 0x31, 0x59, 0xd4, 0xf2, 0xb5, 0x05, 0x05, 0x9a, 0x59, 0x4f, 0x8a, 0x51, 0xaf, 0x3e, 0x5c, - 0x03, 0xf3, 0x1e, 0xe9, 0x50, 0xf1, 0x70, 0x7e, 0x44, 0x19, 0x77, 0xbc, 0xee, 0x1a, 0xb5, 0x28, - 0x97, 0xa5, 0x2e, 0x5f, 0x2b, 0x1d, 0xee, 0x2f, 0xcd, 0xa3, 0x0c, 0x39, 0xca, 0x44, 0x89, 0x2a, - 0xec, 0xe2, 0x36, 0x23, 0x2d, 0x59, 0xba, 0x0a, 0x51, 0x15, 0xde, 0x90, 0xab, 0x48, 0x49, 0xa1, - 0x91, 0x08, 0xe8, 0xc2, 0xdf, 0x0b, 0xe8, 0x62, 0xff, 0x60, 0x86, 0x5b, 0x60, 0xc1, 0xf5, 0x1c, - 0xc3, 0x23, 0x8c, 0xdd, 0x27, 0xb8, 0x65, 0x52, 0x9b, 0x04, 0x27, 0x35, 0x29, 0x77, 0x78, 0xf6, - 0x70, 0x7f, 0x69, 0x61, 0x23, 0x5b, 0x05, 0xf5, 0xc3, 0x56, 0xbe, 0xcb, 0x81, 0xd3, 0xbd, 0xef, - 0x28, 0xfc, 0x18, 0x40, 0xa7, 0x21, 0x7b, 0x9f, 0xd6, 0x43, 0xbf, 0xf3, 0xa0, 0x8e, 0x2d, 0x03, - 0x7d, 0x2c, 0xca, 0xf8, 0xc7, 0x29, 0x0d, 0x94, 0x81, 0x82, 0x97, 0x63, 0xa9, 0x32, 0x2a, 0x1d, - 0x0d, 0xe3, 0x20, 0x23, 0x5d, 0x56, 0xc1, 0x8c, 0xaa, 0x1a, 0x81, 0x50, 0x86, 0x75, 0x2c, 0x0e, - 0xb6, 0x92, 0x62, 0xd4, 0xab, 0x0f, 0x1f, 0x82, 0x59, 0xdc, 0xc1, 0xd4, 0xc4, 0x0d, 0x93, 0x84, - 0x24, 0x39, 0x49, 0xf2, 0x5f, 0x45, 0x32, 0xbb, 0xda, 0xab, 0x80, 0xd2, 0x18, 0xb8, 0x0e, 0xe6, - 0xda, 0x76, 0x9a, 0xca, 0x8f, 0xcb, 0xb3, 0x8a, 0x6a, 0x6e, 0x2b, 0xad, 0x82, 0xb2, 0x70, 0xd0, - 0x05, 0xa0, 0x19, 0x3c, 0xf9, 0xac, 0x34, 0x2e, 0x6b, 0xf2, 0x7b, 0x43, 0xe4, 0x53, 0xd8, 0x37, - 0x44, 0xf5, 0x2f, 0x5c, 0x62, 0x28, 0x66, 0x03, 0xae, 0x80, 0x69, 0x4f, 0x64, 0x48, 0xe8, 0xfa, - 0x84, 0x74, 0xfd, 0x3f, 0x0a, 0x36, 0x8d, 0xe2, 0x42, 0x94, 0xd4, 0xad, 0xfc, 0xa6, 0xc5, 0x1f, - 0xa1, 0x20, 0x65, 0xe1, 0x9d, 0x44, 0xcb, 0x74, 0xbe, 0xa7, 0x65, 0x3a, 0x93, 0x46, 0xc4, 0x3a, - 0xa6, 0x2e, 0x98, 0x16, 0x01, 0x4d, 0x6d, 0xc3, 0xbf, 0x44, 0x55, 0x10, 0x3f, 0x38, 0x51, 0xba, - 0x84, 0xe8, 0xd8, 0x33, 0x3a, 0x2b, 0x77, 0x13, 0x17, 0xa2, 0xa4, 0xa5, 0xca, 0x5d, 0x50, 0x4c, - 0xe6, 0x9a, 0x1f, 0x97, 0x7e, 0xe2, 0xab, 0xc8, 0x8e, 0xc5, 0xa5, 0xbf, 0x8e, 0x42, 0x8d, 0xca, - 0x6b, 0x0d, 0x2c, 0xf4, 0xb1, 0x0e, 0x4d, 0x50, 0xb4, 0xf0, 0x6e, 0x2c, 0x0e, 0x8e, 0xed, 0xc1, - 0xc5, 0xf4, 0xa1, 0xfb, 0xd3, 0x87, 0xfe, 0xc8, 0xe6, 0x8f, 0xbd, 0x3a, 0xf7, 0xa8, 0x6d, 0xd4, - 0xa0, 0xe8, 0xaf, 0xd6, 0x13, 0x5c, 0xa8, 0x87, 0x1b, 0x3e, 0x03, 0x05, 0x0b, 0xef, 0xd6, 0xdb, - 0x9e, 0x11, 0x9c, 0xdf, 0xc9, 0xed, 0xc8, 0xd7, 0x64, 0x5d, 0xb1, 0xa0, 0x90, 0xaf, 0xf2, 0xfd, - 0x28, 0xc8, 0xd7, 0x9b, 0xd8, 0x24, 0x6f, 0x61, 0xa2, 0xd8, 0x4c, 0x4c, 0x14, 0xcb, 0x03, 0xc7, - 0x80, 0xf4, 0xaf, 0xef, 0x30, 0xf1, 0xbc, 0x67, 0x98, 0xb8, 0x7e, 0x42, 0xde, 0xa3, 0xe7, 0x88, - 0xdb, 0x60, 0x32, 0x34, 0x9f, 0x28, 0x6c, 0xda, 0x71, 0x85, 0xad, 0xf2, 0xd3, 0x28, 0x98, 0x8a, - 0x99, 0x38, 0x19, 0x1a, 0xba, 0x89, 0x2e, 0x42, 0x54, 0x8e, 0xda, 0x30, 0x1b, 0xd3, 0x83, 0x0e, - 0xc2, 0x6f, 0xde, 0xa2, 0x07, 0x39, 0xdd, 0x58, 0xdc, 0x05, 0x45, 0x8e, 0x3d, 0x83, 0xf0, 0x40, - 0x26, 0x0f, 0x74, 0x32, 0x1a, 0x03, 0x36, 0x13, 0x52, 0xd4, 0xa3, 0xbd, 0xb8, 0x02, 0xa6, 0x13, - 0xc6, 0x4e, 0xd4, 0x71, 0xfd, 0x22, 0x0e, 0x8b, 0x63, 0x4e, 0x5e, 0xb4, 0xcd, 0x3a, 0x79, 0x1b, - 0xf3, 0xed, 0xb3, 0x44, 0x34, 0xde, 0x1a, 0xfc, 0x70, 0x23, 0x2f, 0xfb, 0xc6, 0x64, 0xa3, 0x27, - 0x26, 0xef, 0x0c, 0xc5, 0x7e, 0x74, 0x64, 0xfe, 0xaa, 0x81, 0x99, 0x98, 0xf6, 0x5b, 0x18, 0x7f, - 0x9e, 0x26, 0xc7, 0x9f, 0xeb, 0xc3, 0x6c, 0xaa, 0xcf, 0xfc, 0xf3, 0x63, 0x2e, 0xb1, 0x99, 0x7f, - 0x51, 0xc7, 0xfd, 0x95, 0x06, 0xe6, 0x3b, 0x8e, 0xd9, 0xb6, 0xc8, 0x3d, 0x13, 0x53, 0x2b, 0xd0, - 0x10, 0xfd, 0xcb, 0x31, 0x33, 0xa6, 0xb4, 0x44, 0x3c, 0x46, 0x19, 0x27, 0x36, 0x7f, 0x12, 0x71, - 0xd4, 0xfe, 0xa7, 0xec, 0xcd, 0x3f, 0xc9, 0x20, 0x46, 0x99, 0xe6, 0xe0, 0xbb, 0x60, 0x4a, 0x34, - 0x72, 0xb4, 0x49, 0xc4, 0x74, 0xa9, 0xfe, 0x5f, 0x98, 0x53, 0x44, 0x53, 0xf5, 0x48, 0x84, 0xe2, - 0x7a, 0x70, 0x1b, 0xcc, 0xb9, 0x4e, 0x6b, 0x1d, 0xdb, 0xd8, 0x20, 0xe2, 0x69, 0xdc, 0x70, 0x4c, - 0xda, 0xec, 0xca, 0x0e, 0x7c, 0xb2, 0x76, 0x23, 0xe8, 0x98, 0x36, 0xd2, 0x2a, 0x6f, 0x44, 0xeb, - 0x9a, 0x5e, 0x96, 0xbd, 0x43, 0x16, 0x65, 0xe5, 0x6b, 0x0d, 0xcc, 0xa6, 0xb2, 0x03, 0x7e, 0x78, - 0x44, 0xdf, 0x7a, 0xe6, 0x9f, 0xea, 0x59, 0x6b, 0x97, 0xf6, 0x0e, 0xca, 0x23, 0xaf, 0x0e, 0xca, - 0x23, 0xbf, 0x1f, 0x94, 0x47, 0xbe, 0x3c, 0x2c, 0x6b, 0x7b, 0x87, 0x65, 0xed, 0xd5, 0x61, 0x59, - 0xfb, 0xf3, 0xb0, 0xac, 0x7d, 0xfb, 0xba, 0x3c, 0xf2, 0x6c, 0x42, 0xc5, 0xfe, 0x5f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xdf, 0x80, 0xf3, 0x34, 0xc0, 0x15, 0x00, 0x00, + // 1561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x6f, 0x1b, 0xb7, + 0x12, 0xf7, 0xda, 0x92, 0x2d, 0xd3, 0xb1, 0x1c, 0xd3, 0x7e, 0xb1, 0x9e, 0xf3, 0x20, 0x07, 0x3a, + 0xe4, 0xe3, 0x21, 0x59, 0xbd, 0x38, 0x79, 0xf9, 0x72, 0x11, 0xd4, 0x4a, 0xd2, 0x34, 0x85, 0xdd, + 0x18, 0x94, 0x1d, 0x34, 0x69, 0x0a, 0x94, 0x5a, 0x31, 0x6b, 0xc6, 0xfb, 0x85, 0x25, 0x25, 0x44, + 0xb7, 0x5e, 0x7a, 0x28, 0xd0, 0x43, 0x4f, 0xbd, 0x15, 0xed, 0xb9, 0x28, 0xd0, 0x7f, 0xc3, 0x68, + 0x2f, 0x39, 0x16, 0x3d, 0x18, 0xb5, 0xf3, 0x5f, 0xe4, 0x54, 0x90, 0xcb, 0xfd, 0xd2, 0xae, 0xfc, + 0xa1, 0xa2, 0xb9, 0xf4, 0xa6, 0xe5, 0xcc, 0xef, 0x37, 0x43, 0x72, 0x66, 0x38, 0x23, 0x70, 0x73, + 0xe7, 0x16, 0xd3, 0xa9, 0x5b, 0xdf, 0xe9, 0xb4, 0x88, 0xef, 0x10, 0x4e, 0x58, 0xdd, 0xdb, 0x31, + 0xeb, 0xd8, 0xa3, 0xac, 0x8e, 0x3d, 0x8f, 0xd5, 0xbb, 0x57, 0x5b, 0x84, 0xe3, 0xab, 0x75, 0x93, + 0x38, 0xc4, 0xc7, 0x9c, 0xb4, 0x75, 0xcf, 0x77, 0xb9, 0x0b, 0x2f, 0x04, 0x40, 0x3d, 0x06, 0xea, + 0xde, 0x8e, 0xa9, 0x0b, 0xa0, 0x2e, 0x80, 0xba, 0x02, 0x2e, 0x5e, 0x31, 0x29, 0xdf, 0xee, 0xb4, + 0x74, 0xc3, 0xb5, 0xeb, 0xa6, 0x6b, 0xba, 0x75, 0x89, 0x6f, 0x75, 0x5e, 0xc8, 0x2f, 0xf9, 0x21, + 0x7f, 0x05, 0xbc, 0x8b, 0xd7, 0x95, 0x43, 0xd8, 0xa3, 0x36, 0x36, 0xb6, 0xa9, 0x43, 0xfc, 0x5e, + 0xec, 0x92, 0x4d, 0x38, 0xae, 0x77, 0x33, 0xde, 0x2c, 0xd6, 0x07, 0xa1, 0xfc, 0x8e, 0xc3, 0xa9, + 0x4d, 0x32, 0x80, 0x1b, 0x47, 0x01, 0x98, 0xb1, 0x4d, 0x6c, 0x9c, 0xc1, 0x5d, 0x1b, 0x84, 0xeb, + 0x70, 0x6a, 0xd5, 0xa9, 0xc3, 0x19, 0xf7, 0x33, 0xa0, 0xc4, 0x9e, 0x18, 0xf1, 0xbb, 0xc4, 0x8f, + 0x37, 0x44, 0x5e, 0x61, 0xdb, 0xb3, 0x48, 0xde, 0x9e, 0x2e, 0x0f, 0xbc, 0x9a, 0x3c, 0xed, 0xdb, + 0x87, 0x5c, 0xa4, 0xe7, 0x5a, 0xd4, 0xe8, 0x0d, 0xba, 0xca, 0xda, 0x4f, 0xa3, 0x00, 0xdc, 0x27, + 0x9e, 0xe5, 0xf6, 0x6c, 0xe2, 0x70, 0xf8, 0x39, 0x28, 0x89, 0x63, 0x6e, 0x63, 0x8e, 0x2b, 0xda, + 0x39, 0xed, 0xe2, 0xd4, 0xf2, 0xff, 0x74, 0x75, 0xd9, 0xc9, 0x5d, 0xc7, 0xd7, 0x2d, 0xb4, 0xf5, + 0xee, 0x55, 0xfd, 0x71, 0xeb, 0x25, 0x31, 0xf8, 0x3a, 0xe1, 0xb8, 0x01, 0x77, 0xf7, 0x96, 0x46, + 0x0e, 0xf6, 0x96, 0x40, 0xbc, 0x86, 0x22, 0x56, 0xf8, 0x14, 0x14, 0x98, 0x47, 0x8c, 0xca, 0xa8, + 0x64, 0xbf, 0xa9, 0x1f, 0x33, 0x94, 0xf4, 0xd8, 0xc9, 0xa6, 0x47, 0x8c, 0xc6, 0x29, 0x65, 0xa4, + 0x20, 0xbe, 0x90, 0xa4, 0x84, 0x18, 0x8c, 0x33, 0x8e, 0x79, 0x87, 0x55, 0xc6, 0x24, 0xf9, 0xed, + 0x61, 0xc8, 0x25, 0x41, 0xa3, 0xac, 0xe8, 0xc7, 0x83, 0x6f, 0xa4, 0x88, 0x6b, 0xfb, 0x63, 0x60, + 0x2e, 0x56, 0xbe, 0xe7, 0x3a, 0x6d, 0xca, 0xa9, 0xeb, 0xc0, 0x15, 0x50, 0xe0, 0x3d, 0x8f, 0xc8, + 0x33, 0x9b, 0x6c, 0x5c, 0x08, 0x9d, 0xdb, 0xec, 0x79, 0xe4, 0xed, 0xde, 0xd2, 0x42, 0x0e, 0x44, + 0x88, 0x90, 0x04, 0xc1, 0x27, 0x91, 0xdf, 0xa3, 0x12, 0x7e, 0x37, 0x6d, 0xfc, 0xed, 0xde, 0xd2, + 0xa1, 0xe1, 0xa0, 0x47, 0x9c, 0x69, 0x67, 0xe1, 0x79, 0x30, 0xee, 0x13, 0xcc, 0x5c, 0xa7, 0x52, + 0x90, 0xbc, 0xd1, 0xa6, 0x90, 0x5c, 0x45, 0x4a, 0x0a, 0x2f, 0x81, 0x09, 0x9b, 0x30, 0x86, 0x4d, + 0x52, 0x29, 0x4a, 0xc5, 0x19, 0xa5, 0x38, 0xb1, 0x1e, 0x2c, 0xa3, 0x50, 0x0e, 0x5f, 0x82, 0xb2, + 0x85, 0x19, 0xdf, 0xf2, 0xda, 0x98, 0x93, 0x4d, 0x6a, 0x93, 0xca, 0xb8, 0x3c, 0xea, 0xff, 0x1e, + 0x2f, 0x4a, 0x04, 0xa2, 0x71, 0x46, 0xb1, 0x97, 0xd7, 0x52, 0x4c, 0xa8, 0x8f, 0x19, 0x76, 0x01, + 0x14, 0x2b, 0x9b, 0x3e, 0x76, 0x58, 0x70, 0x64, 0xc2, 0xde, 0xc4, 0x89, 0xed, 0x2d, 0x2a, 0x7b, + 0x70, 0x2d, 0xc3, 0x86, 0x72, 0x2c, 0xd4, 0x76, 0x35, 0x50, 0x8e, 0x2f, 0x6c, 0x8d, 0x32, 0x0e, + 0x9f, 0x67, 0xd2, 0x42, 0x3f, 0x9e, 0x03, 0x02, 0x2d, 0x93, 0xe2, 0xb4, 0x72, 0xa2, 0x14, 0xae, + 0x24, 0x52, 0xe2, 0x13, 0x50, 0xa4, 0x9c, 0xd8, 0xe2, 0xfa, 0xc7, 0x2e, 0x4e, 0x2d, 0x5f, 0x1b, + 0x22, 0x6c, 0x1b, 0xd3, 0x8a, 0xbf, 0xf8, 0x48, 0x30, 0xa1, 0x80, 0xb0, 0xf6, 0xf5, 0x18, 0x80, + 0xb1, 0x12, 0x72, 0x2d, 0xab, 0x85, 0x8d, 0x1d, 0x78, 0x0e, 0x14, 0x1c, 0x6c, 0x87, 0xd1, 0x1a, + 0xa5, 0xd2, 0xc7, 0xd8, 0x26, 0x48, 0x4a, 0xe0, 0xf7, 0x1a, 0x80, 0x1d, 0x79, 0x15, 0xed, 0x55, + 0xc7, 0x71, 0x39, 0x16, 0xa7, 0x13, 0x3a, 0xd8, 0x1c, 0xc2, 0xc1, 0xd0, 0xb6, 0xbe, 0x95, 0x61, + 0x7d, 0xe0, 0x70, 0xbf, 0x17, 0xdf, 0x52, 0x56, 0x01, 0xe5, 0xb8, 0x02, 0x77, 0x00, 0xf0, 0x15, + 0xe7, 0xa6, 0xab, 0x12, 0xfe, 0xf8, 0xd5, 0x24, 0x74, 0xe7, 0x9e, 0xeb, 0xbc, 0xa0, 0x66, 0x5c, + 0xb2, 0x50, 0x44, 0x89, 0x12, 0xf4, 0x8b, 0x0f, 0xc0, 0xc2, 0x00, 0xbf, 0xe1, 0x69, 0x30, 0xb6, + 0x43, 0x7a, 0xc1, 0x51, 0x22, 0xf1, 0x13, 0xce, 0x83, 0x62, 0x17, 0x5b, 0x1d, 0x12, 0x64, 0x33, + 0x0a, 0x3e, 0xee, 0x8c, 0xde, 0xd2, 0x6a, 0xbf, 0x17, 0x93, 0x91, 0x25, 0x2a, 0x17, 0xbc, 0x08, + 0x4a, 0x3e, 0xf1, 0x2c, 0x6a, 0x60, 0x26, 0x39, 0x8a, 0x8d, 0x53, 0x22, 0x4a, 0x90, 0x5a, 0x43, + 0x91, 0x14, 0x7e, 0x06, 0x4a, 0x8c, 0x58, 0xc4, 0xe0, 0xae, 0xaf, 0x8a, 0xe7, 0xb5, 0x63, 0xc6, + 0x20, 0x6e, 0x11, 0xab, 0xa9, 0xa0, 0x01, 0x7d, 0xf8, 0x85, 0x22, 0x4a, 0xf8, 0x29, 0x28, 0x71, + 0x62, 0x7b, 0x16, 0xe6, 0x44, 0x9d, 0xe6, 0x95, 0xc1, 0xa7, 0x29, 0x68, 0x37, 0xdc, 0xf6, 0xa6, + 0x02, 0xc8, 0x8a, 0x1c, 0x45, 0x78, 0xb8, 0x8a, 0x22, 0x42, 0x48, 0x41, 0x89, 0x71, 0xf1, 0xec, + 0x98, 0x3d, 0x59, 0x8b, 0xa6, 0x96, 0x57, 0x86, 0xaa, 0xcd, 0x01, 0x45, 0x6c, 0x2a, 0x5c, 0x41, + 0x11, 0x3d, 0x5c, 0x05, 0x33, 0x36, 0x75, 0x10, 0xc1, 0xed, 0x5e, 0x93, 0x18, 0xae, 0xd3, 0x66, + 0xb2, 0xa8, 0x15, 0x1b, 0x0b, 0x0a, 0x34, 0xb3, 0x9e, 0x16, 0xa3, 0x7e, 0x7d, 0xb8, 0x06, 0xe6, + 0x7d, 0xd2, 0xa5, 0x8c, 0xba, 0xce, 0x87, 0x94, 0x71, 0xd7, 0xef, 0xad, 0x51, 0x9b, 0x72, 0x59, + 0xea, 0x8a, 0x8d, 0xca, 0xc1, 0xde, 0xd2, 0x3c, 0xca, 0x91, 0xa3, 0x5c, 0x94, 0xa8, 0xc2, 0x1e, + 0xee, 0x30, 0xd2, 0x96, 0xa5, 0xab, 0x14, 0x57, 0xe1, 0x0d, 0xb9, 0x8a, 0x94, 0x14, 0x9a, 0xa9, + 0x80, 0x2e, 0xfd, 0xb5, 0x80, 0x2e, 0x0f, 0x0e, 0x66, 0xb8, 0x05, 0x16, 0x3c, 0xdf, 0x35, 0x7d, + 0xc2, 0xd8, 0x7d, 0x82, 0xdb, 0x16, 0x75, 0x48, 0x78, 0x52, 0x93, 0x72, 0x87, 0x67, 0x0f, 0xf6, + 0x96, 0x16, 0x36, 0xf2, 0x55, 0xd0, 0x20, 0x6c, 0xed, 0xdb, 0x02, 0x38, 0xdd, 0xff, 0x8e, 0xc2, + 0x8f, 0x00, 0x74, 0x5b, 0xb2, 0xef, 0x69, 0x3f, 0x0c, 0x3a, 0x0f, 0xea, 0x3a, 0x32, 0xd0, 0xc7, + 0xe2, 0x8c, 0x7f, 0x9c, 0xd1, 0x40, 0x39, 0x28, 0x78, 0x39, 0x91, 0x2a, 0xa3, 0xd2, 0xd1, 0x28, + 0x0e, 0x72, 0xd2, 0x65, 0x15, 0xcc, 0xa8, 0xaa, 0x11, 0x0a, 0x65, 0x58, 0x27, 0xe2, 0x60, 0x2b, + 0x2d, 0x46, 0xfd, 0xfa, 0xf0, 0x21, 0x98, 0xc5, 0x5d, 0x4c, 0x2d, 0xdc, 0xb2, 0x48, 0x44, 0x52, + 0x90, 0x24, 0xff, 0x56, 0x24, 0xb3, 0xab, 0xfd, 0x0a, 0x28, 0x8b, 0x81, 0xeb, 0x60, 0xae, 0xe3, + 0x64, 0xa9, 0x82, 0xb8, 0x3c, 0xab, 0xa8, 0xe6, 0xb6, 0xb2, 0x2a, 0x28, 0x0f, 0x07, 0x3d, 0x00, + 0x8c, 0xf0, 0xc9, 0x67, 0x95, 0x71, 0x59, 0x93, 0xdf, 0x1b, 0x22, 0x9f, 0xa2, 0xbe, 0x21, 0xae, + 0x7f, 0xd1, 0x12, 0x43, 0x09, 0x1b, 0x70, 0x05, 0x4c, 0xfb, 0x22, 0x43, 0x22, 0xd7, 0x27, 0xa4, + 0xeb, 0xff, 0x52, 0xb0, 0x69, 0x94, 0x14, 0xa2, 0xb4, 0x6e, 0xed, 0x57, 0x2d, 0xf9, 0x08, 0x85, + 0x29, 0x0b, 0xef, 0xa4, 0x5a, 0xa6, 0xf3, 0x7d, 0x2d, 0xd3, 0x99, 0x2c, 0x22, 0xd1, 0x31, 0xf5, + 0xc0, 0xb4, 0x08, 0x68, 0xea, 0x98, 0xc1, 0x25, 0xaa, 0x82, 0xf8, 0xfe, 0x89, 0xd2, 0x25, 0x42, + 0x27, 0x9e, 0xd1, 0x59, 0xb9, 0x9b, 0xa4, 0x10, 0xa5, 0x2d, 0xd5, 0xee, 0x82, 0x72, 0x3a, 0xd7, + 0x82, 0xb8, 0x0c, 0x12, 0x5f, 0x45, 0x76, 0x22, 0x2e, 0x83, 0x75, 0x14, 0x69, 0xd4, 0xde, 0x68, + 0x60, 0x61, 0x80, 0x75, 0x68, 0x81, 0xb2, 0x8d, 0x5f, 0x25, 0xe2, 0xe0, 0xc8, 0x1e, 0x5c, 0x4c, + 0x1e, 0x7a, 0x30, 0x79, 0xe8, 0x8f, 0x1c, 0xfe, 0xd8, 0x6f, 0x72, 0x9f, 0x3a, 0x66, 0x03, 0x8a, + 0xfe, 0x6a, 0x3d, 0xc5, 0x85, 0xfa, 0xb8, 0xe1, 0x33, 0x50, 0xb2, 0xf1, 0xab, 0x66, 0xc7, 0x37, + 0xc3, 0xf3, 0x3b, 0xb9, 0x1d, 0xf9, 0x9a, 0xac, 0x2b, 0x16, 0x14, 0xf1, 0xd5, 0xbe, 0x1b, 0x05, + 0xc5, 0xa6, 0x81, 0x2d, 0xf2, 0x0e, 0x26, 0x8a, 0xcd, 0xd4, 0x44, 0xb1, 0x7c, 0xec, 0x18, 0x90, + 0xfe, 0x0d, 0x1c, 0x26, 0x9e, 0xf7, 0x0d, 0x13, 0xd7, 0x4f, 0xc8, 0x7b, 0xf8, 0x1c, 0x71, 0x1b, + 0x4c, 0x46, 0xe6, 0x53, 0x85, 0x4d, 0x3b, 0xaa, 0xb0, 0xd5, 0x7e, 0x1c, 0x05, 0x53, 0x09, 0x13, + 0x27, 0x43, 0x43, 0x2f, 0xd5, 0x45, 0x88, 0xca, 0xd1, 0x18, 0x66, 0x63, 0x7a, 0xd8, 0x41, 0x04, + 0xcd, 0x5b, 0xfc, 0x20, 0x67, 0x1b, 0x8b, 0xbb, 0xa0, 0xcc, 0xb1, 0x6f, 0x12, 0x1e, 0xca, 0xe4, + 0x81, 0x4e, 0xc6, 0x63, 0xc0, 0x66, 0x4a, 0x8a, 0xfa, 0xb4, 0x17, 0x57, 0xc0, 0x74, 0xca, 0xd8, + 0x89, 0x3a, 0xae, 0x9f, 0xc5, 0x61, 0x71, 0xcc, 0xc9, 0x8b, 0x8e, 0xd5, 0x24, 0xef, 0x62, 0xbe, + 0x7d, 0x96, 0x8a, 0xc6, 0x5b, 0xc7, 0x3f, 0xdc, 0xd8, 0xcb, 0x81, 0x31, 0xd9, 0xea, 0x8b, 0xc9, + 0x3b, 0x43, 0xb1, 0x1f, 0x1e, 0x99, 0xbf, 0x68, 0x60, 0x26, 0xa1, 0xfd, 0x0e, 0xc6, 0x9f, 0xa7, + 0xe9, 0xf1, 0xe7, 0xfa, 0x30, 0x9b, 0x1a, 0x30, 0xff, 0xfc, 0x50, 0x48, 0x6d, 0xe6, 0x1f, 0xd4, + 0x71, 0x7f, 0xa9, 0x81, 0xf9, 0xae, 0x6b, 0x75, 0x6c, 0x72, 0xcf, 0xc2, 0xd4, 0x0e, 0x35, 0x44, + 0xff, 0x72, 0xc4, 0x8c, 0x29, 0x2d, 0x11, 0x9f, 0x51, 0xc6, 0x89, 0xc3, 0x9f, 0xc4, 0x1c, 0x8d, + 0xff, 0x28, 0x7b, 0xf3, 0x4f, 0x72, 0x88, 0x51, 0xae, 0x39, 0xf8, 0x7f, 0x30, 0x25, 0x1a, 0x39, + 0x6a, 0x10, 0x31, 0x5d, 0xaa, 0xff, 0x17, 0xe6, 0x14, 0xd1, 0x54, 0x33, 0x16, 0xa1, 0xa4, 0x1e, + 0xdc, 0x06, 0x73, 0x9e, 0xdb, 0x5e, 0xc7, 0x0e, 0x36, 0x89, 0x78, 0x1a, 0x37, 0xe4, 0xbf, 0x58, + 0xb2, 0x03, 0x9f, 0x6c, 0xdc, 0x08, 0x3b, 0xa6, 0x8d, 0xac, 0xca, 0x5b, 0xd1, 0xba, 0x66, 0x97, + 0x65, 0xef, 0x90, 0x47, 0x59, 0xfb, 0x4a, 0x03, 0xb3, 0x99, 0xec, 0x80, 0x1f, 0x1c, 0xd2, 0xb7, + 0x9e, 0xf9, 0xbb, 0x7a, 0xd6, 0xc6, 0xa5, 0xdd, 0xfd, 0xea, 0xc8, 0xeb, 0xfd, 0xea, 0xc8, 0x6f, + 0xfb, 0xd5, 0x91, 0x2f, 0x0e, 0xaa, 0xda, 0xee, 0x41, 0x55, 0x7b, 0x7d, 0x50, 0xd5, 0xfe, 0x38, + 0xa8, 0x6a, 0xdf, 0xbc, 0xa9, 0x8e, 0x3c, 0x9b, 0x50, 0xb1, 0xff, 0x67, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xdb, 0x8b, 0x00, 0x6d, 0xbc, 0x15, 0x00, 0x00, } diff --git a/pkg/apis/apps/v1beta1/generated.proto b/pkg/apis/apps/v1beta1/generated.proto index 8699197886..ad1d271464 100644 --- a/pkg/apis/apps/v1beta1/generated.proto +++ b/pkg/apis/apps/v1beta1/generated.proto @@ -27,7 +27,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/policy/v1beta1/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/extensions/v1beta1/generated.pb.go b/pkg/apis/extensions/v1beta1/generated.pb.go index fcdcc3fd46..8f2cb49842 100644 --- a/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/pkg/apis/extensions/v1beta1/generated.pb.go @@ -11794,7 +11794,7 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 3369 bytes of a gzipped FileDescriptorProto + // 3379 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xdb, 0x6f, 0x1b, 0xc7, 0xd5, 0xf7, 0x8a, 0xa4, 0x45, 0x1d, 0x59, 0x92, 0x35, 0x72, 0x64, 0x46, 0x49, 0x44, 0x67, 0x3f, 0x7c, 0x89, 0xf3, 0x7d, 0x09, 0xf5, 0xc5, 0xf9, 0x9c, 0x26, 0x4e, 0xe2, 0x44, 0x94, 0x7c, 0x51, @@ -11814,196 +11814,197 @@ var fileDescriptorGenerated = []byte{ 0x59, 0x32, 0xb7, 0x90, 0xc7, 0x65, 0xbb, 0x06, 0x55, 0xf5, 0xb4, 0x98, 0x67, 0xef, 0xc4, 0xe0, 0xb4, 0xb7, 0x89, 0xae, 0xa4, 0xf8, 0x9e, 0xc9, 0xe3, 0x73, 0xa9, 0xaa, 0x2d, 0xa8, 0x06, 0x75, 0xa8, 0x7d, 0x90, 0x4d, 0x0e, 0xb1, 0x77, 0x88, 0x1d, 0x1d, 0x25, 0x45, 0xb7, 0x34, 0x92, 0x65, - 0xd3, 0x93, 0xb9, 0x83, 0x9b, 0x41, 0x2d, 0xd7, 0x00, 0x16, 0x1b, 0x2b, 0x57, 0x89, 0xcd, 0xc6, - 0x0c, 0x9d, 0x82, 0xa2, 0xa1, 0xe8, 0xa4, 0x22, 0x9d, 0x92, 0x4e, 0x8f, 0xd5, 0x8f, 0xdd, 0xdc, - 0xab, 0x1e, 0xd9, 0xdf, 0xab, 0x16, 0xd7, 0x15, 0x9d, 0x60, 0xde, 0x23, 0xff, 0x58, 0x82, 0x07, - 0x97, 0x5c, 0x87, 0x9a, 0xfa, 0x1a, 0xa1, 0xb6, 0xda, 0x5e, 0x72, 0x6d, 0x9b, 0x18, 0xb4, 0x49, - 0x15, 0xea, 0x3a, 0x77, 0xe6, 0x47, 0xd7, 0xa0, 0xb4, 0xa3, 0x68, 0x2e, 0xa9, 0x8c, 0x9c, 0x92, - 0x4e, 0x8f, 0x9f, 0xa9, 0xd5, 0x44, 0x2c, 0x45, 0x1d, 0xe3, 0x47, 0x53, 0xcd, 0x1f, 0xed, 0xda, - 0xab, 0xae, 0x62, 0x50, 0x95, 0xf6, 0xea, 0x27, 0x04, 0xe4, 0x31, 0x21, 0xf7, 0x2a, 0xc3, 0xc2, - 0x1e, 0xa4, 0xfc, 0x7d, 0x09, 0x1e, 0xc9, 0xd5, 0x6d, 0x55, 0x75, 0x28, 0xd2, 0xa1, 0xa4, 0x52, - 0xa2, 0x3b, 0x15, 0xe9, 0x54, 0xe1, 0xf4, 0xf8, 0x99, 0xcb, 0xb5, 0xbe, 0x22, 0xb9, 0x96, 0x0b, - 0x5e, 0x9f, 0x10, 0x7a, 0x95, 0x56, 0x18, 0x3c, 0xf6, 0xa4, 0xc8, 0x3f, 0x94, 0x00, 0x45, 0x79, - 0x5a, 0x8a, 0xdd, 0x25, 0xf4, 0x2e, 0xbc, 0xf4, 0xda, 0xe1, 0xbc, 0x34, 0x23, 0x20, 0xc7, 0x3d, - 0x81, 0x31, 0x27, 0xbd, 0x2f, 0xc1, 0x6c, 0x5a, 0x27, 0xee, 0x9d, 0xad, 0xb8, 0x77, 0x16, 0x0f, - 0xe1, 0x1d, 0x0f, 0x35, 0xc7, 0x2d, 0xbf, 0x1c, 0x81, 0xb1, 0x65, 0x85, 0xe8, 0xa6, 0xd1, 0x24, - 0x14, 0x7d, 0x13, 0xca, 0x6c, 0x7a, 0x76, 0x14, 0xaa, 0x70, 0x8f, 0x8c, 0x9f, 0xf9, 0xbf, 0x83, - 0xcc, 0x75, 0x6a, 0x8c, 0xba, 0xb6, 0xf3, 0x74, 0xed, 0xca, 0xe6, 0x75, 0xd2, 0xa6, 0x6b, 0x84, - 0x2a, 0x75, 0x24, 0xe4, 0x40, 0xd8, 0x86, 0x03, 0x54, 0xf4, 0x16, 0x14, 0x1d, 0x8b, 0xb4, 0x85, - 0x33, 0x5f, 0xec, 0xd3, 0xac, 0x40, 0xd3, 0xa6, 0x45, 0xda, 0xe1, 0x68, 0xb1, 0x2f, 0xcc, 0x71, - 0xd1, 0x16, 0x1c, 0x75, 0x78, 0x18, 0x54, 0x0a, 0x5c, 0xc2, 0xf9, 0x81, 0x25, 0x78, 0xc1, 0x34, - 0x29, 0x64, 0x1c, 0xf5, 0xbe, 0xb1, 0x40, 0x97, 0x7f, 0x27, 0xc1, 0x44, 0x40, 0xcb, 0x47, 0xec, - 0x8d, 0x94, 0xef, 0x6a, 0x77, 0xe7, 0x3b, 0xc6, 0xcd, 0x3d, 0x77, 0x5c, 0xc8, 0x2a, 0xfb, 0x2d, - 0x11, 0xbf, 0xbd, 0xe9, 0xc7, 0xc3, 0x08, 0x8f, 0x87, 0xe7, 0x06, 0x35, 0x2b, 0x27, 0x0c, 0xbe, - 0x28, 0x44, 0xcc, 0x61, 0xee, 0x44, 0x6f, 0x42, 0xd9, 0x21, 0x1a, 0x69, 0x53, 0xd3, 0x16, 0xe6, - 0x3c, 0x73, 0x97, 0xe6, 0x28, 0x9b, 0x44, 0x6b, 0x0a, 0xd6, 0xfa, 0x31, 0x66, 0x8f, 0xff, 0x85, - 0x03, 0x48, 0xf4, 0x3a, 0x94, 0x29, 0xd1, 0x2d, 0x4d, 0xa1, 0xfe, 0xc4, 0x7a, 0x2a, 0xdf, 0x24, - 0x06, 0xdb, 0x30, 0x3b, 0x2d, 0xc1, 0xc0, 0x07, 0x3f, 0x70, 0x96, 0xdf, 0x8a, 0x03, 0x40, 0xf4, - 0x81, 0x04, 0x93, 0xae, 0xd5, 0x61, 0xa4, 0x94, 0x25, 0xd8, 0x6e, 0x4f, 0x44, 0xc3, 0xc5, 0x41, - 0xdd, 0xb6, 0x11, 0x43, 0xab, 0xcf, 0x0a, 0xe1, 0x93, 0xf1, 0x76, 0x9c, 0x90, 0x8a, 0x16, 0x61, - 0x4a, 0x57, 0x0d, 0x4c, 0x94, 0x4e, 0xaf, 0x49, 0xda, 0xa6, 0xd1, 0x71, 0x2a, 0xc5, 0x53, 0xd2, - 0xe9, 0x52, 0xfd, 0xa4, 0x00, 0x98, 0x5a, 0x8b, 0x77, 0xe3, 0x24, 0x3d, 0xfa, 0x3a, 0x20, 0xdf, - 0xae, 0x4b, 0xde, 0x7a, 0xa1, 0x9a, 0x46, 0xa5, 0x74, 0x4a, 0x3a, 0x5d, 0xa8, 0xcf, 0x09, 0x14, - 0xd4, 0x4a, 0x51, 0xe0, 0x0c, 0x2e, 0xf9, 0x9f, 0x45, 0x98, 0x4a, 0x04, 0x38, 0xba, 0x0a, 0xb3, - 0x6d, 0x2f, 0x7d, 0xae, 0xbb, 0xfa, 0x26, 0xb1, 0x9b, 0xed, 0x6d, 0xd2, 0x71, 0x35, 0xd2, 0xe1, - 0xa3, 0x5e, 0xaa, 0xcf, 0x0b, 0x19, 0xb3, 0x4b, 0x99, 0x54, 0x38, 0x87, 0x9b, 0xe9, 0x6d, 0xf0, - 0xa6, 0x35, 0xd5, 0x71, 0x02, 0xcc, 0x11, 0x8e, 0x19, 0xe8, 0xbd, 0x9e, 0xa2, 0xc0, 0x19, 0x5c, - 0x4c, 0xc7, 0x0e, 0x71, 0x54, 0x9b, 0x74, 0x92, 0x3a, 0x16, 0xe2, 0x3a, 0x2e, 0x67, 0x52, 0xe1, - 0x1c, 0x6e, 0x74, 0x16, 0xc6, 0x3d, 0x69, 0xdc, 0xe3, 0x62, 0x68, 0x82, 0x84, 0xbd, 0x1e, 0x76, - 0xe1, 0x28, 0x1d, 0x33, 0xcd, 0xdc, 0xe4, 0x55, 0x40, 0x27, 0x7f, 0x48, 0xae, 0xa4, 0x28, 0x70, - 0x06, 0x17, 0x33, 0xcd, 0x8b, 0x99, 0x94, 0x69, 0x47, 0xe3, 0xa6, 0x6d, 0x64, 0x52, 0xe1, 0x1c, - 0x6e, 0x16, 0x79, 0x9e, 0xca, 0x8b, 0x3b, 0x8a, 0xaa, 0x29, 0x9b, 0x1a, 0xa9, 0x8c, 0xc6, 0x23, - 0x6f, 0x3d, 0xde, 0x8d, 0x93, 0xf4, 0xe8, 0x12, 0x4c, 0x7b, 0x4d, 0x1b, 0x86, 0x12, 0x80, 0x94, - 0x39, 0xc8, 0x83, 0x02, 0x64, 0x7a, 0x3d, 0x49, 0x80, 0xd3, 0x3c, 0xf2, 0x5f, 0x24, 0x38, 0x99, - 0x33, 0x93, 0xd0, 0xcb, 0x50, 0xa4, 0x3d, 0xcb, 0x5f, 0x7f, 0xff, 0xd7, 0xcf, 0xe8, 0xad, 0x9e, - 0x45, 0x6e, 0xef, 0x55, 0x1f, 0xca, 0x61, 0x63, 0xdd, 0x98, 0x33, 0xa2, 0x6f, 0xc3, 0x84, 0x6d, - 0x6a, 0x9a, 0x6a, 0x74, 0x3d, 0x12, 0x91, 0x4d, 0x2e, 0xf4, 0x39, 0xd3, 0x71, 0x14, 0x23, 0xcc, - 0x96, 0xd3, 0xfb, 0x7b, 0xd5, 0x89, 0x58, 0x1f, 0x8e, 0x8b, 0x93, 0x7f, 0x3d, 0x02, 0xb0, 0x4c, - 0x2c, 0xcd, 0xec, 0xe9, 0xc4, 0x18, 0xc6, 0x0a, 0xfa, 0x76, 0x6c, 0x05, 0x7d, 0xa9, 0xdf, 0x8c, - 0x16, 0xa8, 0x9a, 0xbb, 0x84, 0x76, 0x13, 0x4b, 0xe8, 0xcb, 0x83, 0x8b, 0x38, 0x78, 0x0d, 0xbd, - 0x55, 0x80, 0x99, 0x90, 0x78, 0xc9, 0x34, 0x3a, 0x2a, 0x9f, 0x13, 0x2f, 0xc4, 0x62, 0xe2, 0xf1, - 0x44, 0x4c, 0x9c, 0xcc, 0x60, 0x89, 0xc4, 0xc3, 0xd5, 0x40, 0xfb, 0x11, 0xce, 0x7e, 0x3e, 0x2e, - 0xfc, 0xf6, 0x5e, 0xf5, 0xc0, 0xa2, 0xbc, 0x16, 0x60, 0xc6, 0x95, 0x45, 0x8f, 0xc1, 0x51, 0x9b, - 0x28, 0x8e, 0x69, 0xf0, 0x34, 0x31, 0x16, 0x1a, 0x85, 0x79, 0x2b, 0x16, 0xbd, 0xe8, 0x09, 0x18, - 0xd5, 0x89, 0xe3, 0x28, 0x5d, 0xc2, 0x33, 0xc2, 0x58, 0x7d, 0x4a, 0x10, 0x8e, 0xae, 0x79, 0xcd, - 0xd8, 0xef, 0x47, 0xd7, 0x61, 0x52, 0x53, 0x1c, 0x11, 0xda, 0x2d, 0x55, 0x27, 0x7c, 0xce, 0x8f, - 0x9f, 0xf9, 0x9f, 0xbb, 0x8b, 0x18, 0xc6, 0x11, 0xae, 0x44, 0xab, 0x31, 0x24, 0x9c, 0x40, 0x46, - 0x3b, 0x80, 0x58, 0x4b, 0xcb, 0x56, 0x0c, 0xc7, 0x73, 0x19, 0x93, 0x37, 0xda, 0xb7, 0xbc, 0x20, - 0xbf, 0xad, 0xa6, 0xd0, 0x70, 0x86, 0x04, 0xf9, 0xf7, 0x12, 0x4c, 0x86, 0x03, 0x36, 0x84, 0x42, - 0xe9, 0xad, 0x78, 0xa1, 0xf4, 0xfc, 0xc0, 0xc1, 0x9b, 0x53, 0x29, 0x7d, 0x58, 0x00, 0x14, 0x12, - 0xb1, 0xd4, 0xb0, 0xa9, 0xb4, 0x6f, 0xdc, 0xc5, 0x3e, 0xe2, 0xa7, 0x12, 0x20, 0x91, 0xac, 0x17, - 0x0d, 0xc3, 0xa4, 0x3c, 0xff, 0xfb, 0x6a, 0xbe, 0x36, 0xb0, 0x9a, 0xbe, 0x06, 0xb5, 0x8d, 0x14, - 0xf6, 0x05, 0x83, 0xda, 0xbd, 0x70, 0xc4, 0xd2, 0x04, 0x38, 0x43, 0x21, 0xf4, 0x0e, 0x80, 0x2d, - 0x30, 0x5b, 0xa6, 0x48, 0x01, 0x2f, 0x0d, 0x90, 0x4d, 0x19, 0xc0, 0x92, 0x69, 0x6c, 0xa9, 0xdd, - 0x30, 0xa1, 0xe1, 0x00, 0x18, 0x47, 0x84, 0xcc, 0x5d, 0x80, 0x93, 0x39, 0xda, 0xa3, 0xe3, 0x50, - 0xb8, 0x41, 0x7a, 0x9e, 0x5b, 0x31, 0xfb, 0x89, 0x4e, 0x44, 0xf7, 0x63, 0x63, 0x62, 0x2b, 0x75, - 0x6e, 0xe4, 0x39, 0x49, 0xfe, 0xb2, 0x14, 0x8d, 0x35, 0x5e, 0xc5, 0x9e, 0x86, 0xb2, 0x4d, 0x2c, - 0x4d, 0x6d, 0x2b, 0x8e, 0xa8, 0x67, 0x78, 0x41, 0x8a, 0x45, 0x1b, 0x0e, 0x7a, 0x63, 0xf5, 0xee, - 0xc8, 0xfd, 0xad, 0x77, 0x0b, 0xf7, 0xba, 0xde, 0x35, 0xa1, 0xec, 0xf8, 0x85, 0x6e, 0x91, 0x83, - 0x2f, 0x1e, 0x22, 0x67, 0x8b, 0x1a, 0x37, 0x10, 0x18, 0x54, 0xb7, 0x81, 0x90, 0xac, 0xba, 0xb6, - 0xd4, 0x67, 0x5d, 0xbb, 0x0a, 0x27, 0x6c, 0xb2, 0xa3, 0x32, 0x35, 0x2e, 0xab, 0x0e, 0x35, 0xed, - 0xde, 0xaa, 0xaa, 0xab, 0x54, 0x94, 0x3d, 0x95, 0xfd, 0xbd, 0xea, 0x09, 0x9c, 0xd1, 0x8f, 0x33, - 0xb9, 0x58, 0x76, 0xb6, 0x14, 0xd7, 0x21, 0x1d, 0x9e, 0xd2, 0xca, 0x61, 0x76, 0x6e, 0xf0, 0x56, - 0x2c, 0x7a, 0x91, 0x1e, 0x0b, 0xee, 0xf2, 0xbd, 0x08, 0xee, 0xc9, 0xfc, 0xc0, 0x46, 0x1b, 0x70, - 0xd2, 0xb2, 0xcd, 0xae, 0x4d, 0x1c, 0x67, 0x99, 0x28, 0x1d, 0x4d, 0x35, 0x88, 0xef, 0xaf, 0x31, - 0x6e, 0xe7, 0x43, 0xfb, 0x7b, 0xd5, 0x93, 0x8d, 0x6c, 0x12, 0x9c, 0xc7, 0x2b, 0x7f, 0x54, 0x84, - 0xe3, 0xc9, 0x55, 0x36, 0xa7, 0x2a, 0x95, 0x06, 0xaa, 0x4a, 0x9f, 0x8c, 0x4c, 0x1b, 0xaf, 0x64, - 0x0f, 0xa2, 0x21, 0x63, 0xea, 0x2c, 0xc2, 0x94, 0xc8, 0x23, 0x7e, 0xa7, 0xa8, 0xcb, 0x83, 0x68, - 0xd8, 0x88, 0x77, 0xe3, 0x24, 0x3d, 0xab, 0x35, 0xc3, 0x12, 0xd2, 0x07, 0x29, 0xc6, 0x6b, 0xcd, - 0xc5, 0x24, 0x01, 0x4e, 0xf3, 0xa0, 0x35, 0x98, 0x71, 0x8d, 0x34, 0x94, 0x17, 0x9d, 0x0f, 0x09, - 0xa8, 0x99, 0x8d, 0x34, 0x09, 0xce, 0xe2, 0x43, 0x3b, 0x00, 0x6d, 0xbf, 0x20, 0x70, 0x2a, 0x47, - 0x79, 0xae, 0xae, 0x0f, 0x3c, 0xb7, 0x82, 0xda, 0x22, 0xcc, 0x88, 0x41, 0x93, 0x83, 0x23, 0x92, - 0xd0, 0x0b, 0x30, 0x61, 0xf3, 0x8d, 0x87, 0x6f, 0x80, 0x57, 0xbc, 0x3f, 0x20, 0xd8, 0x26, 0x70, - 0xb4, 0x13, 0xc7, 0x69, 0xe5, 0x3f, 0x48, 0xd1, 0x25, 0x2a, 0x28, 0xb5, 0xcf, 0xc5, 0xca, 0xaa, - 0xc7, 0x12, 0x65, 0xd5, 0x6c, 0x9a, 0x23, 0x52, 0x55, 0x7d, 0x27, 0xbb, 0xca, 0xbe, 0x78, 0xa8, - 0x2a, 0x3b, 0x5c, 0x6a, 0xef, 0x5c, 0x66, 0x7f, 0x22, 0xc1, 0xec, 0xc5, 0xe6, 0x25, 0xdb, 0x74, - 0x2d, 0x5f, 0xbd, 0x2b, 0x96, 0xe7, 0xab, 0xaf, 0x41, 0xd1, 0x76, 0x35, 0xdf, 0xae, 0xff, 0xf2, - 0xed, 0xc2, 0xae, 0xc6, 0xec, 0x9a, 0x49, 0x70, 0x79, 0x46, 0x31, 0x06, 0xf4, 0x16, 0x1c, 0xb5, - 0x15, 0xa3, 0x4b, 0xfc, 0x45, 0xf8, 0xd9, 0x3e, 0xad, 0x59, 0x59, 0xc6, 0x8c, 0x3d, 0x52, 0x0a, - 0x72, 0x34, 0x2c, 0x50, 0xe5, 0x9f, 0x48, 0x30, 0x75, 0xb9, 0xd5, 0x6a, 0xac, 0x18, 0x7c, 0x16, - 0x37, 0x14, 0xba, 0xcd, 0xea, 0x04, 0x4b, 0xa1, 0xdb, 0xc9, 0x3a, 0x81, 0xf5, 0x61, 0xde, 0x83, - 0xb6, 0x61, 0x94, 0x65, 0x0f, 0x62, 0x74, 0x06, 0x2c, 0xf1, 0x85, 0xb8, 0xba, 0x07, 0x12, 0xd6, - 0x9f, 0xa2, 0x01, 0xfb, 0xf0, 0xf2, 0x7b, 0x70, 0x22, 0xa2, 0x1e, 0xf3, 0x17, 0x3f, 0x9d, 0x44, - 0x6d, 0x28, 0x31, 0x4d, 0xfc, 0xb3, 0xc7, 0x7e, 0x8f, 0xd0, 0x12, 0x26, 0x87, 0x75, 0x14, 0xfb, - 0x72, 0xb0, 0x87, 0x2d, 0xaf, 0xc1, 0xc4, 0x65, 0xd3, 0xa1, 0x0d, 0xd3, 0xa6, 0xdc, 0x6d, 0xe8, - 0x11, 0x28, 0xe8, 0xaa, 0x21, 0x56, 0xe9, 0x71, 0xc1, 0x53, 0x60, 0xeb, 0x08, 0x6b, 0xe7, 0xdd, - 0xca, 0xae, 0xc8, 0x46, 0x61, 0xb7, 0xb2, 0x8b, 0x59, 0xbb, 0x7c, 0x09, 0x46, 0xc5, 0x70, 0x44, - 0x81, 0x0a, 0x07, 0x03, 0x15, 0x32, 0x80, 0x7e, 0x31, 0x02, 0xa3, 0x42, 0xfb, 0x21, 0x6c, 0xe6, - 0xde, 0x88, 0x6d, 0xe6, 0xce, 0x0d, 0x36, 0xd2, 0xb9, 0x3b, 0xb9, 0x4e, 0x62, 0x27, 0xf7, 0xe2, - 0x80, 0xf8, 0x07, 0x6f, 0xe3, 0x3e, 0x96, 0x60, 0x32, 0x1e, 0x73, 0xe8, 0x2c, 0x8c, 0xb3, 0x35, - 0x45, 0x6d, 0x93, 0xf5, 0xb0, 0x28, 0x0e, 0x0e, 0x56, 0x9a, 0x61, 0x17, 0x8e, 0xd2, 0xa1, 0x6e, - 0xc0, 0xc6, 0xc2, 0x42, 0x38, 0x25, 0xdf, 0xe5, 0x2e, 0x55, 0xb5, 0x9a, 0x77, 0x5f, 0x53, 0x5b, - 0x31, 0xe8, 0x15, 0xbb, 0x49, 0x6d, 0xd5, 0xe8, 0xa6, 0x04, 0xf1, 0x18, 0x8b, 0x22, 0xcb, 0x37, - 0x25, 0x18, 0x17, 0x2a, 0x0f, 0x61, 0x4b, 0xf2, 0x7a, 0x7c, 0x4b, 0xf2, 0xec, 0x80, 0xf3, 0x39, - 0x7b, 0x3f, 0xf2, 0x69, 0x68, 0x0a, 0x9b, 0xc1, 0x2c, 0xc1, 0x6c, 0x9b, 0x0e, 0x4d, 0x26, 0x18, - 0x36, 0xd7, 0x30, 0xef, 0x41, 0xdf, 0x93, 0xe0, 0xb8, 0x9a, 0x98, 0xf3, 0xc2, 0xd7, 0x2f, 0x0f, - 0xa6, 0x5a, 0x00, 0x53, 0xaf, 0x08, 0x79, 0xc7, 0x93, 0x3d, 0x38, 0x25, 0x52, 0x76, 0x21, 0x45, - 0x85, 0x14, 0x28, 0x6e, 0x53, 0x6a, 0x89, 0x41, 0x58, 0x1a, 0x3c, 0xf3, 0x84, 0x2a, 0x95, 0xb9, - 0xf9, 0xad, 0x56, 0x03, 0x73, 0x68, 0xf9, 0xe7, 0x23, 0x81, 0xc3, 0x9a, 0xde, 0x24, 0x09, 0xf2, - 0xad, 0x74, 0x2f, 0xf2, 0xed, 0x78, 0x56, 0xae, 0x45, 0xdf, 0x80, 0x02, 0xd5, 0x06, 0xdd, 0x94, - 0x0a, 0x09, 0xad, 0xd5, 0x66, 0x98, 0xb0, 0x5a, 0xab, 0x4d, 0xcc, 0x20, 0xd1, 0xdb, 0x50, 0x62, - 0xab, 0x19, 0x9b, 0xe3, 0x85, 0xc1, 0x73, 0x08, 0xf3, 0x57, 0x18, 0x61, 0xec, 0xcb, 0xc1, 0x1e, - 0xae, 0xfc, 0x1e, 0x4c, 0xc4, 0x12, 0x01, 0xba, 0x0e, 0xc7, 0x34, 0x53, 0xe9, 0xd4, 0x15, 0x4d, - 0x31, 0xda, 0xc4, 0x4e, 0xa6, 0xc6, 0xec, 0xfd, 0xcc, 0x6a, 0x84, 0x43, 0x24, 0x94, 0xe0, 0x02, - 0x31, 0xda, 0x87, 0x63, 0xd8, 0xb2, 0x02, 0x10, 0x5a, 0x8f, 0xaa, 0x50, 0x62, 0x21, 0xec, 0xad, - 0x4c, 0x63, 0xf5, 0x31, 0xa6, 0x2b, 0x8b, 0x6c, 0x07, 0x7b, 0xed, 0xe8, 0x0c, 0x80, 0x43, 0xda, - 0x36, 0xa1, 0x3c, 0xef, 0x78, 0x27, 0x40, 0x41, 0x06, 0x6e, 0x06, 0x3d, 0x38, 0x42, 0x25, 0xff, - 0x49, 0x82, 0x89, 0x75, 0x42, 0xdf, 0x35, 0xed, 0x1b, 0x0d, 0x53, 0x53, 0xdb, 0xbd, 0x21, 0xe4, - 0xfd, 0xcd, 0x58, 0xde, 0x7f, 0xa5, 0xcf, 0x31, 0x8b, 0x69, 0x9b, 0x97, 0xfd, 0xe5, 0xbf, 0x4b, - 0x50, 0x89, 0x51, 0x46, 0xd3, 0x04, 0x81, 0x92, 0x65, 0xda, 0xd4, 0x5f, 0xe3, 0x0f, 0xa5, 0x01, - 0x4b, 0xa9, 0x91, 0x55, 0x9e, 0xc1, 0x62, 0x0f, 0x9d, 0xd9, 0xb9, 0x65, 0x9b, 0xba, 0x88, 0xfb, - 0xc3, 0x49, 0x21, 0xc4, 0x0e, 0xed, 0xbc, 0x68, 0x9b, 0x3a, 0xe6, 0xd8, 0xf2, 0x1f, 0x25, 0x98, - 0x8e, 0x51, 0x0e, 0x21, 0xa5, 0x2b, 0xf1, 0x94, 0xfe, 0xe2, 0x61, 0x0c, 0xcb, 0x49, 0xec, 0x5f, - 0x25, 0xcd, 0x62, 0x0e, 0x40, 0x5b, 0x30, 0x6e, 0x99, 0x9d, 0xe6, 0x3d, 0xb8, 0x99, 0x9b, 0x62, - 0x2b, 0x64, 0x23, 0xc4, 0xc2, 0x51, 0x60, 0xb4, 0x0b, 0xd3, 0x86, 0xa2, 0x13, 0xc7, 0x52, 0xda, - 0xa4, 0x79, 0x0f, 0xce, 0x45, 0x1e, 0xe0, 0xb7, 0x05, 0x49, 0x44, 0x9c, 0x16, 0x22, 0xff, 0x2a, - 0x65, 0xb7, 0x69, 0x53, 0xf4, 0x2a, 0x94, 0xf9, 0x23, 0x89, 0xb6, 0xa9, 0x89, 0xa5, 0xed, 0x2c, - 0x1b, 0x9a, 0x86, 0x68, 0xbb, 0xbd, 0x57, 0xfd, 0xef, 0x03, 0x8f, 0x75, 0x7d, 0x42, 0x1c, 0xc0, - 0xa0, 0x75, 0x28, 0x5a, 0x87, 0x29, 0x33, 0xf8, 0xc2, 0xc2, 0x6b, 0x0b, 0x8e, 0x23, 0xff, 0x23, - 0xa9, 0x38, 0x5f, 0x5e, 0xae, 0xdf, 0xb3, 0x01, 0x0b, 0xca, 0x9a, 0xdc, 0x41, 0xb3, 0x61, 0x54, - 0xac, 0xb2, 0x22, 0x2e, 0x2f, 0x1d, 0x26, 0x2e, 0xa3, 0x2b, 0x43, 0xb0, 0x89, 0xf0, 0x1b, 0x7d, - 0x41, 0xf2, 0x5f, 0x25, 0x98, 0xe6, 0x0a, 0xb5, 0x5d, 0x5b, 0xa5, 0xbd, 0xa1, 0x65, 0xd0, 0xad, - 0x58, 0x06, 0x5d, 0xee, 0xd3, 0xd0, 0x94, 0xc6, 0xb9, 0x59, 0xf4, 0x73, 0x09, 0x1e, 0x48, 0x51, - 0x0f, 0x21, 0xc3, 0x90, 0x78, 0x86, 0x79, 0xe5, 0xb0, 0x06, 0xe6, 0x64, 0x99, 0x9b, 0x90, 0x61, - 0x1e, 0x0f, 0xdc, 0x33, 0x00, 0x96, 0xad, 0xee, 0xa8, 0x1a, 0xe9, 0x8a, 0xcb, 0xe0, 0x72, 0x38, - 0x24, 0x8d, 0xa0, 0x07, 0x47, 0xa8, 0xd0, 0xb7, 0x60, 0xb6, 0x43, 0xb6, 0x14, 0x57, 0xa3, 0x8b, - 0x9d, 0xce, 0x92, 0x62, 0x29, 0x9b, 0xaa, 0xa6, 0x52, 0x55, 0xec, 0xb0, 0xc7, 0xea, 0x17, 0xbc, - 0x4b, 0xda, 0x2c, 0x8a, 0xdb, 0x7b, 0xd5, 0xc7, 0x0f, 0xbe, 0x98, 0xf1, 0x89, 0x7b, 0x38, 0x47, - 0x08, 0xfa, 0xae, 0x04, 0x15, 0x9b, 0xbc, 0xe3, 0xaa, 0x36, 0xe9, 0x2c, 0xdb, 0xa6, 0x15, 0xd3, - 0xa0, 0xc0, 0x35, 0xb8, 0xb4, 0xbf, 0x57, 0xad, 0xe0, 0x1c, 0x9a, 0x7e, 0x74, 0xc8, 0x15, 0x84, - 0x28, 0xcc, 0x28, 0x9a, 0x66, 0xbe, 0x4b, 0xe2, 0x1e, 0x28, 0x72, 0xf9, 0xf5, 0xfd, 0xbd, 0xea, - 0xcc, 0x62, 0xba, 0xbb, 0x1f, 0xd1, 0x59, 0xf0, 0x68, 0x01, 0x46, 0x77, 0x4c, 0xcd, 0xd5, 0x89, - 0x53, 0x29, 0x71, 0x49, 0x2c, 0xe3, 0x8e, 0x5e, 0xf5, 0x9a, 0x6e, 0xef, 0x55, 0x8f, 0x5e, 0x6c, - 0xf2, 0xa3, 0x0f, 0x9f, 0x8a, 0xed, 0xd1, 0x58, 0xcd, 0x24, 0xa6, 0x3c, 0x3f, 0x77, 0x2d, 0x87, - 0x39, 0xe6, 0x72, 0xd8, 0x85, 0xa3, 0x74, 0x48, 0x87, 0xb1, 0x6d, 0xb1, 0x6f, 0x77, 0x2a, 0xa3, - 0x03, 0xad, 0x7e, 0xb1, 0x7d, 0x7f, 0x7d, 0x5a, 0x88, 0x1c, 0xf3, 0x9b, 0x1d, 0x1c, 0x4a, 0x40, - 0x4f, 0xc0, 0x28, 0xff, 0x58, 0x59, 0xe6, 0xa7, 0xb5, 0xe5, 0x30, 0x13, 0x5d, 0xf6, 0x9a, 0xb1, - 0xdf, 0xef, 0x93, 0xae, 0x34, 0x96, 0xf8, 0xe1, 0x6a, 0x82, 0x74, 0xa5, 0xb1, 0x84, 0xfd, 0x7e, - 0x64, 0xc1, 0xa8, 0x43, 0x56, 0x55, 0xc3, 0xdd, 0xad, 0xc0, 0x40, 0xd7, 0xc5, 0xcd, 0x0b, 0x9c, - 0x3b, 0x71, 0x14, 0x15, 0x4a, 0x14, 0xfd, 0xd8, 0x17, 0x83, 0x76, 0x61, 0xcc, 0x76, 0x8d, 0x45, - 0x67, 0xc3, 0x21, 0x76, 0x65, 0x9c, 0xcb, 0xec, 0x37, 0x39, 0x63, 0x9f, 0x3f, 0x29, 0x35, 0xf0, - 0x60, 0x40, 0x81, 0x43, 0x61, 0xe8, 0x23, 0x09, 0x90, 0xe3, 0x5a, 0x96, 0x46, 0x74, 0x62, 0x50, - 0x45, 0xe3, 0xa7, 0x61, 0x4e, 0xe5, 0x18, 0xd7, 0xa1, 0xd1, 0xaf, 0xdd, 0x29, 0xa0, 0xa4, 0x32, - 0xc1, 0x51, 0x73, 0x9a, 0x14, 0x67, 0xe8, 0xc1, 0x86, 0x62, 0xcb, 0xe1, 0xbf, 0x2b, 0x13, 0x03, - 0x0d, 0x45, 0xf6, 0xa9, 0x60, 0x38, 0x14, 0xa2, 0x1f, 0xfb, 0x62, 0xd0, 0x55, 0x98, 0xb5, 0x89, - 0xd2, 0xb9, 0x62, 0x68, 0x3d, 0x6c, 0x9a, 0xf4, 0xa2, 0xaa, 0x11, 0xa7, 0xe7, 0x50, 0xa2, 0x57, - 0x26, 0x79, 0xd8, 0x04, 0x4f, 0x2e, 0x70, 0x26, 0x15, 0xce, 0xe1, 0xe6, 0x2f, 0x01, 0xc4, 0x19, - 0xec, 0x70, 0xde, 0xd2, 0x1d, 0xee, 0x25, 0x40, 0xa8, 0xea, 0x7d, 0x7b, 0x09, 0x10, 0x11, 0x71, - 0xf0, 0x11, 0xd2, 0x57, 0x23, 0x30, 0x13, 0x12, 0xdf, 0xf5, 0x4b, 0x80, 0x0c, 0x96, 0x21, 0xbc, - 0x04, 0xc8, 0xbe, 0x4a, 0x2f, 0xdc, 0xef, 0xab, 0xf4, 0xfb, 0xf0, 0x02, 0x81, 0xdf, 0xce, 0x87, - 0x4e, 0xfc, 0xf7, 0xbf, 0x9d, 0x0f, 0x75, 0xcd, 0x29, 0x67, 0x7e, 0x33, 0x12, 0x35, 0xe8, 0x3f, - 0xe8, 0x0a, 0xf8, 0xf0, 0x2f, 0x0d, 0xe5, 0xcf, 0x0b, 0x70, 0x3c, 0x39, 0x63, 0x63, 0x37, 0x81, - 0xd2, 0x1d, 0x6f, 0x02, 0x1b, 0x70, 0x62, 0xcb, 0xd5, 0xb4, 0x1e, 0x77, 0x48, 0xe4, 0x3a, 0xd0, - 0x3b, 0xb5, 0x7f, 0x58, 0x70, 0x9e, 0xb8, 0x98, 0x41, 0x83, 0x33, 0x39, 0x73, 0x6e, 0x35, 0x0b, - 0x03, 0xdd, 0x6a, 0xa6, 0x2e, 0xd5, 0x8a, 0x77, 0x7f, 0xa9, 0x96, 0x7d, 0x43, 0x59, 0x1a, 0xe0, - 0x86, 0xf2, 0x5e, 0x5c, 0x29, 0x66, 0x24, 0xbe, 0x3b, 0x5d, 0x29, 0xca, 0x0f, 0xc3, 0x9c, 0x60, - 0x63, 0xdf, 0x4b, 0xa6, 0x41, 0x6d, 0x53, 0xd3, 0x88, 0xbd, 0xec, 0xea, 0x7a, 0x4f, 0x3e, 0x0f, - 0x93, 0xf1, 0x7b, 0x6d, 0x6f, 0xe4, 0xbd, 0xab, 0x76, 0x71, 0x97, 0x12, 0x19, 0x79, 0xaf, 0x1d, - 0x07, 0x14, 0xf2, 0x07, 0x12, 0xcc, 0x66, 0xbf, 0xa1, 0x43, 0x1a, 0x4c, 0xea, 0xca, 0x6e, 0xf4, - 0x11, 0xa1, 0x34, 0xe0, 0x8e, 0x1b, 0xed, 0xef, 0x55, 0x27, 0xd7, 0x62, 0x58, 0x38, 0x81, 0x2d, - 0x7f, 0x21, 0xc1, 0xc9, 0x9c, 0x6b, 0xc6, 0xe1, 0x6a, 0x82, 0xae, 0x41, 0x59, 0x57, 0x76, 0x9b, - 0xae, 0xdd, 0x25, 0x03, 0x9f, 0x31, 0xf0, 0x5c, 0xb2, 0x26, 0x50, 0x70, 0x80, 0x27, 0x7f, 0x22, - 0x41, 0x25, 0xaf, 0x1e, 0x44, 0x67, 0x63, 0x17, 0xa2, 0x8f, 0x26, 0x2e, 0x44, 0xa7, 0x53, 0x7c, - 0x43, 0xba, 0x0e, 0xfd, 0x54, 0x82, 0xd9, 0xec, 0xba, 0x19, 0x3d, 0x13, 0xd3, 0xb8, 0x9a, 0xd0, - 0x78, 0x2a, 0xc1, 0x25, 0xf4, 0xdd, 0x86, 0x49, 0x51, 0x5d, 0x0b, 0x18, 0xe1, 0xe5, 0x27, 0x0f, - 0xce, 0xaa, 0x02, 0xcc, 0xaf, 0x13, 0xf9, 0x48, 0xc6, 0xdb, 0x70, 0x02, 0x57, 0xfe, 0xd9, 0x08, - 0x94, 0x9a, 0x6d, 0x45, 0x23, 0x43, 0x28, 0xea, 0xae, 0xc5, 0x8a, 0xba, 0x7e, 0xdf, 0xf9, 0x73, - 0x2d, 0x73, 0xeb, 0xb9, 0xcd, 0x44, 0x3d, 0x77, 0x6e, 0x20, 0xf4, 0x83, 0x4b, 0xb9, 0xe7, 0x61, - 0x2c, 0x50, 0xa2, 0xbf, 0xd5, 0x43, 0xfe, 0x78, 0x04, 0xc6, 0x23, 0x22, 0xfa, 0x5c, 0x7b, 0x76, - 0x62, 0xab, 0xf7, 0x20, 0x7f, 0x29, 0x8a, 0xc8, 0xae, 0xf9, 0xeb, 0xb7, 0xf7, 0x86, 0x2e, 0x7c, - 0x0b, 0x95, 0x5e, 0xd6, 0xcf, 0xc3, 0x24, 0xe5, 0xff, 0xb0, 0x09, 0xce, 0xf8, 0x0a, 0x3c, 0x8a, - 0x83, 0x97, 0x99, 0xad, 0x58, 0x2f, 0x4e, 0x50, 0xcf, 0xbd, 0x00, 0x13, 0x31, 0x61, 0x7d, 0x3d, - 0x79, 0xfb, 0xad, 0x04, 0x8f, 0xde, 0x71, 0x4f, 0x86, 0xea, 0xb1, 0xe9, 0x55, 0x4b, 0x4c, 0xaf, - 0xf9, 0x7c, 0x80, 0x21, 0x3e, 0x96, 0xf8, 0xd1, 0x08, 0xa0, 0xd6, 0xb6, 0x6a, 0x77, 0x1a, 0x8a, - 0x4d, 0x7b, 0x58, 0xfc, 0x8f, 0x6a, 0x08, 0x13, 0xee, 0x2c, 0x8c, 0x77, 0x88, 0xd3, 0xb6, 0x55, - 0xee, 0x2c, 0xb1, 0x57, 0x08, 0xce, 0x41, 0x96, 0xc3, 0x2e, 0x1c, 0xa5, 0x43, 0x5d, 0x28, 0xef, - 0x78, 0xff, 0xd4, 0xf3, 0x6f, 0xde, 0xfa, 0x2d, 0x66, 0xc3, 0xff, 0xfa, 0x85, 0xf1, 0x25, 0x1a, - 0x1c, 0x1c, 0x80, 0xcb, 0x1f, 0x4a, 0x30, 0x9b, 0x76, 0xcc, 0x32, 0x53, 0xfd, 0xfe, 0x3b, 0xe7, - 0x61, 0x28, 0x72, 0x74, 0xe6, 0x95, 0x63, 0xde, 0x89, 0x37, 0x93, 0x8c, 0x79, 0xab, 0xfc, 0xa5, - 0x04, 0x73, 0xd9, 0xaa, 0x0d, 0x61, 0x2b, 0x71, 0x3d, 0xbe, 0x95, 0xe8, 0xf7, 0xd8, 0x20, 0x5b, - 0xef, 0x9c, 0x6d, 0xc5, 0x5e, 0xe6, 0x18, 0x0c, 0xc1, 0xc8, 0xad, 0xb8, 0x91, 0x8b, 0x87, 0x36, - 0x32, 0xdb, 0xc0, 0xfa, 0x13, 0x37, 0x6f, 0xcd, 0x1f, 0xf9, 0xec, 0xd6, 0xfc, 0x91, 0x3f, 0xdf, - 0x9a, 0x3f, 0xf2, 0xfe, 0xfe, 0xbc, 0x74, 0x73, 0x7f, 0x5e, 0xfa, 0x6c, 0x7f, 0x5e, 0xfa, 0xdb, - 0xfe, 0xbc, 0xf4, 0x83, 0x2f, 0xe6, 0x8f, 0x5c, 0x1b, 0x15, 0x98, 0xff, 0x0a, 0x00, 0x00, 0xff, - 0xff, 0x56, 0x18, 0xbd, 0xf5, 0xb1, 0x3c, 0x00, 0x00, + 0xd3, 0x93, 0xb9, 0x83, 0x9b, 0x45, 0xfd, 0xfc, 0x01, 0xa1, 0x60, 0x99, 0x9a, 0xda, 0xee, 0xe5, + 0x85, 0x81, 0x5c, 0x03, 0x58, 0x6c, 0xac, 0x5c, 0x25, 0x36, 0x1b, 0x6e, 0x74, 0x0a, 0x8a, 0x86, + 0xa2, 0x93, 0x8a, 0x74, 0x4a, 0x3a, 0x3d, 0x56, 0x3f, 0x76, 0x73, 0xaf, 0x7a, 0x64, 0x7f, 0xaf, + 0x5a, 0x5c, 0x57, 0x74, 0x82, 0x79, 0x8f, 0xfc, 0x63, 0x09, 0x1e, 0x5c, 0x72, 0x1d, 0x6a, 0xea, + 0x6b, 0x84, 0xda, 0x6a, 0x7b, 0xc9, 0xb5, 0x6d, 0x62, 0xd0, 0x26, 0x55, 0xa8, 0xeb, 0xdc, 0x99, + 0x1f, 0x5d, 0x83, 0xd2, 0x8e, 0xa2, 0xb9, 0xa4, 0x32, 0x72, 0x4a, 0x3a, 0x3d, 0x7e, 0xa6, 0x56, + 0x13, 0x61, 0x18, 0xf5, 0xa9, 0x1f, 0x88, 0x35, 0x3f, 0x50, 0x6a, 0xaf, 0xba, 0x8a, 0x41, 0x55, + 0xda, 0xab, 0x9f, 0x10, 0x90, 0xc7, 0x84, 0xdc, 0xab, 0x0c, 0x0b, 0x7b, 0x90, 0xf2, 0xf7, 0x25, + 0x78, 0x24, 0x57, 0xb7, 0x55, 0xd5, 0xa1, 0x48, 0x87, 0x92, 0x4a, 0x89, 0xee, 0x54, 0xa4, 0x53, + 0x85, 0xd3, 0xe3, 0x67, 0x2e, 0xd7, 0xfa, 0x9a, 0x04, 0xb5, 0x5c, 0xf0, 0xfa, 0x84, 0xd0, 0xab, + 0xb4, 0xc2, 0xe0, 0xb1, 0x27, 0x45, 0xfe, 0xa1, 0x04, 0x28, 0xca, 0xd3, 0x52, 0xec, 0x2e, 0xa1, + 0x77, 0xe1, 0xa5, 0xd7, 0x0e, 0xe7, 0xa5, 0x19, 0x01, 0x39, 0xee, 0x09, 0x8c, 0x39, 0xe9, 0x7d, + 0x09, 0x66, 0xd3, 0x3a, 0x71, 0xef, 0x6c, 0xc5, 0xbd, 0xb3, 0x78, 0x08, 0xef, 0x78, 0xa8, 0x39, + 0x6e, 0xf9, 0xe5, 0x08, 0x8c, 0x2d, 0x2b, 0x44, 0x37, 0x8d, 0x26, 0xa1, 0xe8, 0x9b, 0x50, 0x66, + 0x33, 0xbb, 0xa3, 0x50, 0x85, 0x7b, 0x64, 0xfc, 0xcc, 0xff, 0x1d, 0x64, 0xae, 0x53, 0x63, 0xd4, + 0xb5, 0x9d, 0xa7, 0x6b, 0x57, 0x36, 0xaf, 0x93, 0x36, 0x5d, 0x23, 0x54, 0xa9, 0x23, 0x21, 0x07, + 0xc2, 0x36, 0x1c, 0xa0, 0xa2, 0xb7, 0xa0, 0xe8, 0x58, 0xa4, 0x2d, 0x9c, 0xf9, 0x62, 0x9f, 0x66, + 0x05, 0x9a, 0x36, 0x2d, 0xd2, 0x0e, 0x47, 0x8b, 0x7d, 0x61, 0x8e, 0x8b, 0xb6, 0xe0, 0xa8, 0xc3, + 0xc3, 0xa0, 0x52, 0xe0, 0x12, 0xce, 0x0f, 0x2c, 0xc1, 0x0b, 0xa6, 0x49, 0x21, 0xe3, 0xa8, 0xf7, + 0x8d, 0x05, 0xba, 0xfc, 0x3b, 0x09, 0x26, 0x02, 0x5a, 0x3e, 0x62, 0x6f, 0xa4, 0x7c, 0x57, 0xbb, + 0x3b, 0xdf, 0x31, 0x6e, 0xee, 0xb9, 0xe3, 0x42, 0x56, 0xd9, 0x6f, 0x89, 0xf8, 0xed, 0x4d, 0x3f, + 0x1e, 0x46, 0x78, 0x3c, 0x3c, 0x37, 0xa8, 0x59, 0x39, 0x61, 0xf0, 0x45, 0x21, 0x62, 0x0e, 0x73, + 0x27, 0x7a, 0x13, 0xca, 0x0e, 0xd1, 0x48, 0x9b, 0x9a, 0xb6, 0x30, 0xe7, 0x99, 0xbb, 0x34, 0x47, + 0xd9, 0x24, 0x5a, 0x53, 0xb0, 0xd6, 0x8f, 0x31, 0x7b, 0xfc, 0x2f, 0x1c, 0x40, 0xa2, 0xd7, 0xa1, + 0x4c, 0x89, 0x6e, 0x69, 0x0a, 0xf5, 0x27, 0xd6, 0x53, 0xf9, 0x26, 0x31, 0xd8, 0x86, 0xd9, 0x69, + 0x09, 0x06, 0x3e, 0xf8, 0x81, 0xb3, 0xfc, 0x56, 0x1c, 0x00, 0xa2, 0x0f, 0x24, 0x98, 0x74, 0xad, + 0x0e, 0x23, 0xa5, 0x2c, 0xc1, 0x76, 0x7b, 0x22, 0x1a, 0x2e, 0x0e, 0xea, 0xb6, 0x8d, 0x18, 0x5a, + 0x7d, 0x56, 0x08, 0x9f, 0x8c, 0xb7, 0xe3, 0x84, 0x54, 0xb4, 0x08, 0x53, 0xba, 0x6a, 0x60, 0xa2, + 0x74, 0x7a, 0x4d, 0xd2, 0x36, 0x8d, 0x8e, 0x53, 0x29, 0x9e, 0x92, 0x4e, 0x97, 0xea, 0x27, 0x05, + 0xc0, 0xd4, 0x5a, 0xbc, 0x1b, 0x27, 0xe9, 0xd1, 0xd7, 0x01, 0xf9, 0x76, 0x5d, 0xf2, 0xd6, 0x0b, + 0xd5, 0x34, 0x2a, 0xa5, 0x53, 0xd2, 0xe9, 0x42, 0x7d, 0x4e, 0xa0, 0xa0, 0x56, 0x8a, 0x02, 0x67, + 0x70, 0xc9, 0xff, 0x2c, 0xc2, 0x54, 0x22, 0xc0, 0xd1, 0x55, 0x98, 0x6d, 0x7b, 0xe9, 0x73, 0xdd, + 0xd5, 0x37, 0x89, 0xdd, 0x6c, 0x6f, 0x93, 0x8e, 0xab, 0x91, 0x0e, 0x1f, 0xf5, 0x52, 0x7d, 0x5e, + 0xc8, 0x98, 0x5d, 0xca, 0xa4, 0xc2, 0x39, 0xdc, 0x4c, 0x6f, 0x83, 0x37, 0xad, 0xa9, 0x8e, 0x13, + 0x60, 0x8e, 0x70, 0xcc, 0x40, 0xef, 0xf5, 0x14, 0x05, 0xce, 0xe0, 0x62, 0x3a, 0x76, 0x88, 0xa3, + 0xda, 0xa4, 0x93, 0xd4, 0xb1, 0x10, 0xd7, 0x71, 0x39, 0x93, 0x0a, 0xe7, 0x70, 0xa3, 0xb3, 0x30, + 0xee, 0x49, 0xe3, 0x1e, 0x17, 0x43, 0x13, 0x24, 0xec, 0xf5, 0xb0, 0x0b, 0x47, 0xe9, 0x98, 0x69, + 0xe6, 0x26, 0x2f, 0x20, 0x3a, 0xf9, 0x43, 0x72, 0x25, 0x45, 0x81, 0x33, 0xb8, 0x98, 0x69, 0x5e, + 0xcc, 0xa4, 0x4c, 0x3b, 0x1a, 0x37, 0x6d, 0x23, 0x93, 0x0a, 0xe7, 0x70, 0xb3, 0xc8, 0xf3, 0x54, + 0x5e, 0xdc, 0x51, 0x54, 0x4d, 0xd9, 0xd4, 0x48, 0x65, 0x34, 0x1e, 0x79, 0xeb, 0xf1, 0x6e, 0x9c, + 0xa4, 0x47, 0x97, 0x60, 0xda, 0x6b, 0xda, 0x30, 0x94, 0x00, 0xa4, 0xcc, 0x41, 0x1e, 0x14, 0x20, + 0xd3, 0xeb, 0x49, 0x02, 0x9c, 0xe6, 0x91, 0xff, 0x22, 0xc1, 0xc9, 0x9c, 0x99, 0x84, 0x5e, 0x86, + 0x22, 0xed, 0x59, 0xfe, 0xfa, 0xfb, 0xbf, 0x7e, 0x46, 0x6f, 0xf5, 0x2c, 0x72, 0x7b, 0xaf, 0xfa, + 0x50, 0x0e, 0x1b, 0xeb, 0xc6, 0x9c, 0x11, 0x7d, 0x1b, 0x26, 0x6c, 0x53, 0xd3, 0x54, 0xa3, 0xeb, + 0x91, 0x88, 0x6c, 0x72, 0xa1, 0xcf, 0x99, 0x8e, 0xa3, 0x18, 0x61, 0xb6, 0x9c, 0xde, 0xdf, 0xab, + 0x4e, 0xc4, 0xfa, 0x70, 0x5c, 0x9c, 0xfc, 0xeb, 0x11, 0x80, 0x65, 0x62, 0x69, 0x66, 0x4f, 0x27, + 0xc6, 0x30, 0x56, 0xd0, 0xb7, 0x63, 0x2b, 0xe8, 0x4b, 0xfd, 0x66, 0xb4, 0x40, 0xd5, 0xdc, 0x25, + 0xb4, 0x9b, 0x58, 0x42, 0x5f, 0x1e, 0x5c, 0xc4, 0xc1, 0x6b, 0xe8, 0xad, 0x02, 0xcc, 0x84, 0xc4, + 0x4b, 0xa6, 0xd1, 0x51, 0xf9, 0x9c, 0x78, 0x21, 0x16, 0x13, 0x8f, 0x27, 0x62, 0xe2, 0x64, 0x06, + 0x4b, 0x24, 0x1e, 0xae, 0x06, 0xda, 0x8f, 0x70, 0xf6, 0xf3, 0x71, 0xe1, 0xb7, 0xf7, 0xaa, 0x07, + 0xd6, 0xf3, 0xb5, 0x00, 0x33, 0xae, 0x2c, 0x7a, 0x0c, 0x8e, 0xda, 0x44, 0x71, 0x4c, 0x83, 0xa7, + 0x89, 0xb1, 0xd0, 0x28, 0xcc, 0x5b, 0xb1, 0xe8, 0x45, 0x4f, 0xc0, 0xa8, 0x4e, 0x1c, 0x47, 0xe9, + 0x12, 0x9e, 0x11, 0xc6, 0xea, 0x53, 0x82, 0x70, 0x74, 0xcd, 0x6b, 0xc6, 0x7e, 0x3f, 0xba, 0x0e, + 0x93, 0x9a, 0xe2, 0x88, 0xd0, 0x6e, 0xa9, 0x3a, 0xe1, 0x73, 0x7e, 0xfc, 0xcc, 0xff, 0xdc, 0x5d, + 0xc4, 0x30, 0x8e, 0x70, 0x25, 0x5a, 0x8d, 0x21, 0xe1, 0x04, 0x32, 0xda, 0x01, 0xc4, 0x5a, 0x5a, + 0xb6, 0x62, 0x38, 0x9e, 0xcb, 0x98, 0xbc, 0xd1, 0xbe, 0xe5, 0x05, 0xf9, 0x6d, 0x35, 0x85, 0x86, + 0x33, 0x24, 0xc8, 0xbf, 0x97, 0x60, 0x32, 0x1c, 0xb0, 0x21, 0x14, 0x4a, 0x6f, 0xc5, 0x0b, 0xa5, + 0xe7, 0x07, 0x0e, 0xde, 0x9c, 0x4a, 0xe9, 0xc3, 0x02, 0xa0, 0x90, 0x88, 0xa5, 0x86, 0x4d, 0xa5, + 0x7d, 0xe3, 0x2e, 0xf6, 0x11, 0x3f, 0x95, 0x00, 0x89, 0x64, 0xbd, 0x68, 0x18, 0x26, 0xe5, 0xf9, + 0xdf, 0x57, 0xf3, 0xb5, 0x81, 0xd5, 0xf4, 0x35, 0xa8, 0x6d, 0xa4, 0xb0, 0x2f, 0x18, 0xd4, 0xee, + 0x85, 0x23, 0x96, 0x26, 0xc0, 0x19, 0x0a, 0xa1, 0x77, 0x00, 0x6c, 0x81, 0xd9, 0x32, 0x45, 0x0a, + 0x78, 0x69, 0x80, 0x6c, 0xca, 0x00, 0x96, 0x4c, 0x63, 0x4b, 0xed, 0x86, 0x09, 0x0d, 0x07, 0xc0, + 0x38, 0x22, 0x64, 0xee, 0x02, 0x9c, 0xcc, 0xd1, 0x1e, 0x1d, 0x87, 0xc2, 0x0d, 0xd2, 0xf3, 0xdc, + 0x8a, 0xd9, 0x4f, 0x74, 0x22, 0xba, 0x1f, 0x1b, 0x13, 0x5b, 0xa9, 0x73, 0x23, 0xcf, 0x49, 0xf2, + 0x97, 0xa5, 0x68, 0xac, 0xf1, 0x2a, 0xf6, 0x34, 0x94, 0x6d, 0x62, 0x69, 0x6a, 0x5b, 0x71, 0x44, + 0x3d, 0xc3, 0x0b, 0x52, 0x2c, 0xda, 0x70, 0xd0, 0x1b, 0xab, 0x77, 0x47, 0xee, 0x6f, 0xbd, 0x5b, + 0xb8, 0xd7, 0xf5, 0xae, 0x09, 0x65, 0xc7, 0x2f, 0x74, 0x8b, 0x1c, 0x7c, 0xf1, 0x10, 0x39, 0x5b, + 0xd4, 0xb8, 0x81, 0xc0, 0xa0, 0xba, 0x0d, 0x84, 0x64, 0xd5, 0xb5, 0xa5, 0x3e, 0xeb, 0xda, 0x55, + 0x38, 0x61, 0x93, 0x1d, 0x95, 0xa9, 0x71, 0x59, 0x75, 0xa8, 0x69, 0xf7, 0x56, 0x55, 0x5d, 0xa5, + 0xa2, 0xec, 0xa9, 0xec, 0xef, 0x55, 0x4f, 0xe0, 0x8c, 0x7e, 0x9c, 0xc9, 0xc5, 0xb2, 0xb3, 0xa5, + 0xb8, 0x0e, 0xe9, 0xf0, 0x94, 0x56, 0x0e, 0xb3, 0x73, 0x83, 0xb7, 0x62, 0xd1, 0x8b, 0xf4, 0x58, + 0x70, 0x97, 0xef, 0x45, 0x70, 0x4f, 0xe6, 0x07, 0x36, 0xda, 0x80, 0x93, 0x96, 0x6d, 0x76, 0x6d, + 0xe2, 0x38, 0xcb, 0x44, 0xe9, 0x68, 0xaa, 0x41, 0x7c, 0x7f, 0x8d, 0x71, 0x3b, 0x1f, 0xda, 0xdf, + 0xab, 0x9e, 0x6c, 0x64, 0x93, 0xe0, 0x3c, 0x5e, 0xf9, 0xa3, 0x22, 0x1c, 0x4f, 0xae, 0xb2, 0x39, + 0x55, 0xa9, 0x34, 0x50, 0x55, 0xfa, 0x64, 0x64, 0xda, 0x78, 0x25, 0x7b, 0x10, 0x0d, 0x19, 0x53, + 0x67, 0x11, 0xa6, 0x44, 0x1e, 0xf1, 0x3b, 0x45, 0x5d, 0x1e, 0x44, 0xc3, 0x46, 0xbc, 0x1b, 0x27, + 0xe9, 0x59, 0xad, 0x19, 0x96, 0x90, 0x3e, 0x48, 0x31, 0x5e, 0x6b, 0x2e, 0x26, 0x09, 0x70, 0x9a, + 0x07, 0xad, 0xc1, 0x8c, 0x6b, 0xa4, 0xa1, 0xbc, 0xe8, 0x7c, 0x48, 0x40, 0xcd, 0x6c, 0xa4, 0x49, + 0x70, 0x16, 0x1f, 0xda, 0x01, 0x68, 0xfb, 0x05, 0x81, 0x53, 0x39, 0xca, 0x73, 0x75, 0x7d, 0xe0, + 0xb9, 0x15, 0xd4, 0x16, 0x61, 0x46, 0x0c, 0x9a, 0x1c, 0x1c, 0x91, 0x84, 0x5e, 0x80, 0x09, 0x9b, + 0x6f, 0x3c, 0x7c, 0x03, 0xbc, 0xe2, 0xfd, 0x01, 0xc1, 0x36, 0x81, 0xa3, 0x9d, 0x38, 0x4e, 0x2b, + 0xff, 0x41, 0x8a, 0x2e, 0x51, 0x41, 0xa9, 0x7d, 0x2e, 0x56, 0x56, 0x3d, 0x96, 0x28, 0xab, 0x66, + 0xd3, 0x1c, 0x91, 0xaa, 0xea, 0x3b, 0xd9, 0x55, 0xf6, 0xc5, 0x43, 0x55, 0xd9, 0xe1, 0x52, 0x7b, + 0xe7, 0x32, 0xfb, 0x13, 0x09, 0x66, 0x2f, 0x36, 0x2f, 0xd9, 0xa6, 0x6b, 0xf9, 0xea, 0x5d, 0xb1, + 0x3c, 0x5f, 0x7d, 0x0d, 0x8a, 0xb6, 0xab, 0xf9, 0x76, 0xfd, 0x97, 0x6f, 0x17, 0x76, 0x35, 0x66, + 0xd7, 0x4c, 0x82, 0xcb, 0x33, 0x8a, 0x31, 0xa0, 0xb7, 0xe0, 0xa8, 0xad, 0x18, 0x5d, 0xe2, 0x2f, + 0xc2, 0xcf, 0xf6, 0x69, 0xcd, 0xca, 0x32, 0x66, 0xec, 0x91, 0x52, 0x90, 0xa3, 0x61, 0x81, 0x2a, + 0xff, 0x44, 0x82, 0xa9, 0xcb, 0xad, 0x56, 0x63, 0xc5, 0xe0, 0xb3, 0xb8, 0xa1, 0xd0, 0x6d, 0x56, + 0x27, 0x58, 0x0a, 0xdd, 0x4e, 0xd6, 0x09, 0xac, 0x0f, 0xf3, 0x1e, 0xb4, 0x0d, 0xa3, 0x2c, 0x7b, + 0x10, 0xa3, 0x33, 0x60, 0x89, 0x2f, 0xc4, 0xd5, 0x3d, 0x90, 0xb0, 0xfe, 0x14, 0x0d, 0xd8, 0x87, + 0x97, 0xdf, 0x83, 0x13, 0x11, 0xf5, 0x98, 0xbf, 0xf8, 0xe9, 0x24, 0x6a, 0x43, 0x89, 0x69, 0xe2, + 0x9f, 0x3d, 0xf6, 0x7b, 0x84, 0x96, 0x30, 0x39, 0xac, 0xa3, 0xd8, 0x97, 0x83, 0x3d, 0x6c, 0x79, + 0x0d, 0x26, 0x2e, 0x9b, 0x0e, 0x6d, 0x98, 0x36, 0xe5, 0x6e, 0x43, 0x8f, 0x40, 0x41, 0x57, 0x0d, + 0xb1, 0x4a, 0x8f, 0x0b, 0x9e, 0x02, 0x5b, 0x47, 0x58, 0x3b, 0xef, 0x56, 0x76, 0x45, 0x36, 0x0a, + 0xbb, 0x95, 0x5d, 0xcc, 0xda, 0xe5, 0x4b, 0x30, 0x2a, 0x86, 0x23, 0x0a, 0x54, 0x38, 0x18, 0xa8, + 0x90, 0x01, 0xf4, 0x8b, 0x11, 0x18, 0x15, 0xda, 0x0f, 0x61, 0x33, 0xf7, 0x46, 0x6c, 0x33, 0x77, + 0x6e, 0xb0, 0x91, 0xce, 0xdd, 0xc9, 0x75, 0x12, 0x3b, 0xb9, 0x17, 0x07, 0xc4, 0x3f, 0x78, 0x1b, + 0xf7, 0xb1, 0x04, 0x93, 0xf1, 0x98, 0x43, 0x67, 0x61, 0x9c, 0xad, 0x29, 0x6a, 0x9b, 0xac, 0x87, + 0x45, 0x71, 0x70, 0xb0, 0xd2, 0x0c, 0xbb, 0x70, 0x94, 0x0e, 0x75, 0x03, 0x36, 0x16, 0x16, 0xc2, + 0x29, 0xf9, 0x2e, 0x77, 0xa9, 0xaa, 0xd5, 0xbc, 0xab, 0x9e, 0xda, 0x8a, 0x41, 0xaf, 0xd8, 0x4d, + 0x6a, 0xab, 0x46, 0x37, 0x25, 0x88, 0xc7, 0x58, 0x14, 0x59, 0xbe, 0x29, 0xc1, 0xb8, 0x50, 0x79, + 0x08, 0x5b, 0x92, 0xd7, 0xe3, 0x5b, 0x92, 0x67, 0x07, 0x9c, 0xcf, 0xd9, 0xfb, 0x91, 0x4f, 0x43, + 0x53, 0xd8, 0x0c, 0x66, 0x09, 0x66, 0xdb, 0x74, 0x68, 0x32, 0xc1, 0xb0, 0xb9, 0x86, 0x79, 0x0f, + 0xfa, 0x9e, 0x04, 0xc7, 0xd5, 0xc4, 0x9c, 0x17, 0xbe, 0x7e, 0x79, 0x30, 0xd5, 0x02, 0x98, 0x7a, + 0x45, 0xc8, 0x3b, 0x9e, 0xec, 0xc1, 0x29, 0x91, 0xb2, 0x0b, 0x29, 0x2a, 0xa4, 0x40, 0x71, 0x9b, + 0x52, 0x4b, 0x0c, 0xc2, 0xd2, 0xe0, 0x99, 0x27, 0x54, 0xa9, 0xcc, 0xcd, 0x6f, 0xb5, 0x1a, 0x98, + 0x43, 0xcb, 0x3f, 0x1f, 0x09, 0x1c, 0xd6, 0xf4, 0x26, 0x49, 0x90, 0x6f, 0xa5, 0x7b, 0x91, 0x6f, + 0xc7, 0xb3, 0x72, 0x2d, 0xfa, 0x06, 0x14, 0xa8, 0x36, 0xe8, 0xa6, 0x54, 0x48, 0x68, 0xad, 0x36, + 0xc3, 0x84, 0xd5, 0x5a, 0x6d, 0x62, 0x06, 0x89, 0xde, 0x86, 0x12, 0x5b, 0xcd, 0xd8, 0x1c, 0x2f, + 0x0c, 0x9e, 0x43, 0x98, 0xbf, 0xc2, 0x08, 0x63, 0x5f, 0x0e, 0xf6, 0x70, 0xe5, 0xf7, 0x60, 0x22, + 0x96, 0x08, 0xd0, 0x75, 0x38, 0xa6, 0x99, 0x4a, 0xa7, 0xae, 0x68, 0x8a, 0xd1, 0x26, 0x76, 0x32, + 0x35, 0x66, 0xef, 0x67, 0x56, 0x23, 0x1c, 0x22, 0xa1, 0x04, 0x17, 0x88, 0xd1, 0x3e, 0x1c, 0xc3, + 0x96, 0x15, 0x80, 0xd0, 0x7a, 0x54, 0x85, 0x12, 0x0b, 0x61, 0x6f, 0x65, 0x1a, 0xab, 0x8f, 0x31, + 0x5d, 0x59, 0x64, 0x3b, 0xd8, 0x6b, 0x47, 0x67, 0x00, 0x1c, 0xd2, 0xb6, 0x09, 0xe5, 0x79, 0xc7, + 0x3b, 0x01, 0x0a, 0x32, 0x70, 0x33, 0xe8, 0xc1, 0x11, 0x2a, 0xf9, 0x4f, 0x12, 0x4c, 0xac, 0x13, + 0xfa, 0xae, 0x69, 0xdf, 0x68, 0xf0, 0x0b, 0xda, 0x21, 0xe4, 0xfd, 0xcd, 0x58, 0xde, 0x7f, 0xa5, + 0xcf, 0x31, 0x8b, 0x69, 0x9b, 0x97, 0xfd, 0xe5, 0xbf, 0x4b, 0x50, 0x89, 0x51, 0x46, 0xd3, 0x04, + 0x81, 0x92, 0x65, 0xda, 0xd4, 0x5f, 0xe3, 0x0f, 0xa5, 0x01, 0x4b, 0xa9, 0x91, 0x55, 0x9e, 0xc1, + 0x62, 0x0f, 0x9d, 0xd9, 0xb9, 0x65, 0x9b, 0xba, 0x88, 0xfb, 0xc3, 0x49, 0x21, 0xc4, 0x0e, 0xed, + 0xbc, 0x68, 0x9b, 0x3a, 0xe6, 0xd8, 0xf2, 0x1f, 0x25, 0x98, 0x8e, 0x51, 0x0e, 0x21, 0xa5, 0x2b, + 0xf1, 0x94, 0xfe, 0xe2, 0x61, 0x0c, 0xcb, 0x49, 0xec, 0x5f, 0x25, 0xcd, 0x62, 0x0e, 0x40, 0x5b, + 0x30, 0x6e, 0x99, 0x9d, 0xe6, 0x3d, 0xb8, 0x99, 0x9b, 0x62, 0x2b, 0x64, 0x23, 0xc4, 0xc2, 0x51, + 0x60, 0xb4, 0x0b, 0xd3, 0x86, 0xa2, 0x13, 0xc7, 0x52, 0xda, 0xa4, 0x79, 0x0f, 0xce, 0x45, 0x1e, + 0xe0, 0xb7, 0x05, 0x49, 0x44, 0x9c, 0x16, 0x22, 0xff, 0x2a, 0x65, 0xb7, 0x69, 0x53, 0xf4, 0x2a, + 0x94, 0xf9, 0x23, 0x89, 0xb6, 0xa9, 0x89, 0xa5, 0xed, 0x2c, 0x1b, 0x9a, 0x86, 0x68, 0xbb, 0xbd, + 0x57, 0xfd, 0xef, 0x03, 0x8f, 0x75, 0x7d, 0x42, 0x1c, 0xc0, 0xa0, 0x75, 0x28, 0x5a, 0x87, 0x29, + 0x33, 0xf8, 0xc2, 0xc2, 0x6b, 0x0b, 0x8e, 0x23, 0xff, 0x23, 0xa9, 0x38, 0x5f, 0x5e, 0xae, 0xdf, + 0xb3, 0x01, 0x0b, 0xca, 0x9a, 0xdc, 0x41, 0xb3, 0x61, 0x54, 0xac, 0xb2, 0x22, 0x2e, 0x2f, 0x1d, + 0x26, 0x2e, 0xa3, 0x2b, 0x43, 0xb0, 0x89, 0xf0, 0x1b, 0x7d, 0x41, 0xf2, 0x5f, 0x25, 0x98, 0xe6, + 0x0a, 0xb5, 0x5d, 0x5b, 0xa5, 0xbd, 0xa1, 0x65, 0xd0, 0xad, 0x58, 0x06, 0x5d, 0xee, 0xd3, 0xd0, + 0x94, 0xc6, 0xb9, 0x59, 0xf4, 0x73, 0x09, 0x1e, 0x48, 0x51, 0x0f, 0x21, 0xc3, 0x90, 0x78, 0x86, + 0x79, 0xe5, 0xb0, 0x06, 0xe6, 0x64, 0x99, 0x9b, 0x90, 0x61, 0x1e, 0x0f, 0xdc, 0x33, 0x00, 0x96, + 0xad, 0xee, 0xa8, 0x1a, 0xe9, 0x8a, 0xcb, 0xe0, 0x72, 0x38, 0x24, 0x8d, 0xa0, 0x07, 0x47, 0xa8, + 0xd0, 0xb7, 0x60, 0xb6, 0x43, 0xb6, 0x14, 0x57, 0xa3, 0x8b, 0x9d, 0xce, 0x92, 0x62, 0x29, 0x9b, + 0xaa, 0xa6, 0x52, 0x55, 0xec, 0xb0, 0xc7, 0xea, 0x17, 0xbc, 0x4b, 0xda, 0x2c, 0x8a, 0xdb, 0x7b, + 0xd5, 0xc7, 0x0f, 0xbe, 0x98, 0xf1, 0x89, 0x7b, 0x38, 0x47, 0x08, 0xfa, 0xae, 0x04, 0x15, 0x9b, + 0xbc, 0xe3, 0xaa, 0x36, 0xe9, 0x2c, 0xdb, 0xa6, 0x15, 0xd3, 0xa0, 0xc0, 0x35, 0xb8, 0xb4, 0xbf, + 0x57, 0xad, 0xe0, 0x1c, 0x9a, 0x7e, 0x74, 0xc8, 0x15, 0x84, 0x28, 0xcc, 0x28, 0x9a, 0x66, 0xbe, + 0x4b, 0xe2, 0x1e, 0x28, 0x72, 0xf9, 0xf5, 0xfd, 0xbd, 0xea, 0xcc, 0x62, 0xba, 0xbb, 0x1f, 0xd1, + 0x59, 0xf0, 0x68, 0x01, 0x46, 0x77, 0x4c, 0xcd, 0xd5, 0x89, 0x53, 0x29, 0x71, 0x49, 0x2c, 0xe3, + 0x8e, 0x5e, 0xf5, 0x9a, 0x6e, 0xef, 0x55, 0x8f, 0x5e, 0x6c, 0xf2, 0xa3, 0x0f, 0x9f, 0x8a, 0xed, + 0xd1, 0x58, 0xcd, 0x24, 0xa6, 0x3c, 0x3f, 0x77, 0x2d, 0x87, 0x39, 0xe6, 0x72, 0xd8, 0x85, 0xa3, + 0x74, 0x48, 0x87, 0xb1, 0x6d, 0xb1, 0x6f, 0x77, 0x2a, 0xa3, 0x03, 0xad, 0x7e, 0xb1, 0x7d, 0x7f, + 0x7d, 0x5a, 0x88, 0x1c, 0xf3, 0x9b, 0x1d, 0x1c, 0x4a, 0x40, 0x4f, 0xc0, 0x28, 0xff, 0x58, 0x59, + 0xe6, 0xa7, 0xb5, 0xe5, 0x30, 0x13, 0x5d, 0xf6, 0x9a, 0xb1, 0xdf, 0xef, 0x93, 0xae, 0x34, 0x96, + 0xf8, 0xe1, 0x6a, 0x82, 0x74, 0xa5, 0xb1, 0x84, 0xfd, 0x7e, 0x64, 0xc1, 0xa8, 0x43, 0x56, 0x55, + 0xc3, 0xdd, 0xad, 0xc0, 0x40, 0xd7, 0xc5, 0xcd, 0x0b, 0x9c, 0x3b, 0x71, 0x14, 0x15, 0x4a, 0x14, + 0xfd, 0xd8, 0x17, 0x83, 0x76, 0x61, 0xcc, 0x76, 0x8d, 0x45, 0x67, 0xc3, 0x21, 0x76, 0x65, 0x9c, + 0xcb, 0xec, 0x37, 0x39, 0x63, 0x9f, 0x3f, 0x29, 0x35, 0xf0, 0x60, 0x40, 0x81, 0x43, 0x61, 0xe8, + 0x23, 0x09, 0x90, 0xe3, 0x5a, 0x96, 0x46, 0x74, 0x62, 0x50, 0x45, 0xe3, 0xa7, 0x61, 0x4e, 0xe5, + 0x18, 0xd7, 0xa1, 0xd1, 0xaf, 0xdd, 0x29, 0xa0, 0xa4, 0x32, 0xc1, 0x51, 0x73, 0x9a, 0x14, 0x67, + 0xe8, 0xc1, 0x86, 0x62, 0xcb, 0xe1, 0xbf, 0x2b, 0x13, 0x03, 0x0d, 0x45, 0xf6, 0xa9, 0x60, 0x38, + 0x14, 0xa2, 0x1f, 0xfb, 0x62, 0xd0, 0x55, 0x98, 0xb5, 0x89, 0xd2, 0xb9, 0x62, 0x68, 0x3d, 0x6c, + 0x9a, 0xf4, 0xa2, 0xaa, 0x11, 0xa7, 0xe7, 0x50, 0xa2, 0x57, 0x26, 0x79, 0xd8, 0x04, 0x4f, 0x2e, + 0x70, 0x26, 0x15, 0xce, 0xe1, 0xe6, 0x2f, 0x01, 0xc4, 0x19, 0xec, 0x70, 0xde, 0xd2, 0x1d, 0xee, + 0x25, 0x40, 0xa8, 0xea, 0x7d, 0x7b, 0x09, 0x10, 0x11, 0x71, 0xf0, 0x11, 0xd2, 0x57, 0x23, 0x30, + 0x13, 0x12, 0xdf, 0xf5, 0x4b, 0x80, 0x0c, 0x96, 0x21, 0xbc, 0x04, 0xc8, 0xbe, 0x4a, 0x2f, 0xdc, + 0xef, 0xab, 0xf4, 0xfb, 0xf0, 0x02, 0x81, 0xdf, 0xce, 0x87, 0x4e, 0xfc, 0xf7, 0xbf, 0x9d, 0x0f, + 0x75, 0xcd, 0x29, 0x67, 0x7e, 0x33, 0x12, 0x35, 0xe8, 0x3f, 0xe8, 0x0a, 0xf8, 0xf0, 0x2f, 0x0d, + 0xe5, 0xcf, 0x0b, 0x70, 0x3c, 0x39, 0x63, 0x63, 0x37, 0x81, 0xd2, 0x1d, 0x6f, 0x02, 0x1b, 0x70, + 0x62, 0xcb, 0xd5, 0xb4, 0x1e, 0x77, 0x48, 0xe4, 0x3a, 0xd0, 0x3b, 0xb5, 0x7f, 0x58, 0x70, 0x9e, + 0xb8, 0x98, 0x41, 0x83, 0x33, 0x39, 0x73, 0x6e, 0x35, 0x0b, 0x03, 0xdd, 0x6a, 0xa6, 0x2e, 0xd5, + 0x8a, 0x77, 0x7f, 0xa9, 0x96, 0x7d, 0x43, 0x59, 0x1a, 0xe0, 0x86, 0xf2, 0x5e, 0x5c, 0x29, 0x66, + 0x24, 0xbe, 0x3b, 0x5d, 0x29, 0xca, 0x0f, 0xc3, 0x9c, 0x60, 0x63, 0xdf, 0x4b, 0xa6, 0x41, 0x6d, + 0x53, 0xd3, 0x88, 0xbd, 0xec, 0xea, 0x7a, 0x4f, 0x3e, 0x0f, 0x93, 0xf1, 0x7b, 0x6d, 0x6f, 0xe4, + 0xbd, 0xab, 0x76, 0x71, 0x97, 0x12, 0x19, 0x79, 0xaf, 0x1d, 0x07, 0x14, 0xf2, 0x07, 0x12, 0xcc, + 0x66, 0xbf, 0xa1, 0x43, 0x1a, 0x4c, 0xea, 0xca, 0x6e, 0xf4, 0x11, 0xa1, 0x34, 0xe0, 0x8e, 0x1b, + 0xed, 0xef, 0x55, 0x27, 0xd7, 0x62, 0x58, 0x38, 0x81, 0x2d, 0x7f, 0x21, 0xc1, 0xc9, 0x9c, 0x6b, + 0xc6, 0xe1, 0x6a, 0x82, 0xae, 0x41, 0x59, 0x57, 0x76, 0x9b, 0xae, 0xdd, 0x25, 0x03, 0x9f, 0x31, + 0xf0, 0x5c, 0xb2, 0x26, 0x50, 0x70, 0x80, 0x27, 0x7f, 0x22, 0x41, 0x25, 0xaf, 0x1e, 0x44, 0x67, + 0x63, 0x17, 0xa2, 0x8f, 0x26, 0x2e, 0x44, 0xa7, 0x53, 0x7c, 0x43, 0xba, 0x0e, 0xfd, 0x54, 0x82, + 0xd9, 0xec, 0xba, 0x19, 0x3d, 0x13, 0xd3, 0xb8, 0x9a, 0xd0, 0x78, 0x2a, 0xc1, 0x25, 0xf4, 0xdd, + 0x86, 0x49, 0x51, 0x5d, 0x0b, 0x18, 0xe1, 0xe5, 0x27, 0x0f, 0xce, 0xaa, 0x02, 0xcc, 0xaf, 0x13, + 0xf9, 0x48, 0xc6, 0xdb, 0x70, 0x02, 0x57, 0xfe, 0xd9, 0x08, 0x94, 0x9a, 0x6d, 0x45, 0x23, 0x43, + 0x28, 0xea, 0xae, 0xc5, 0x8a, 0xba, 0x7e, 0xdf, 0xf9, 0x73, 0x2d, 0x73, 0xeb, 0xb9, 0xcd, 0x44, + 0x3d, 0x77, 0x6e, 0x20, 0xf4, 0x83, 0x4b, 0xb9, 0xe7, 0x61, 0x2c, 0x50, 0xa2, 0xbf, 0xd5, 0x43, + 0xfe, 0x78, 0x04, 0xc6, 0x23, 0x22, 0xfa, 0x5c, 0x7b, 0x76, 0x62, 0xab, 0xf7, 0x20, 0x7f, 0x29, + 0x8a, 0xc8, 0xae, 0xf9, 0xeb, 0xb7, 0xf7, 0x86, 0x2e, 0x7c, 0x0b, 0x95, 0x5e, 0xd6, 0xcf, 0xc3, + 0x24, 0xe5, 0xff, 0xb0, 0x09, 0xce, 0xf8, 0x0a, 0x3c, 0x8a, 0x83, 0x97, 0x99, 0xad, 0x58, 0x2f, + 0x4e, 0x50, 0xcf, 0xbd, 0x00, 0x13, 0x31, 0x61, 0x7d, 0x3d, 0x79, 0xfb, 0xad, 0x04, 0x8f, 0xde, + 0x71, 0x4f, 0x86, 0xea, 0xb1, 0xe9, 0x55, 0x4b, 0x4c, 0xaf, 0xf9, 0x7c, 0x80, 0x21, 0x3e, 0x96, + 0xf8, 0xd1, 0x08, 0xa0, 0xd6, 0xb6, 0x6a, 0x77, 0x1a, 0x8a, 0x4d, 0x7b, 0x58, 0xfc, 0x8f, 0x6a, + 0x08, 0x13, 0xee, 0x2c, 0x8c, 0x77, 0x88, 0xd3, 0xb6, 0x55, 0xee, 0x2c, 0xb1, 0x57, 0x08, 0xce, + 0x41, 0x96, 0xc3, 0x2e, 0x1c, 0xa5, 0x43, 0x5d, 0x28, 0xef, 0x78, 0xff, 0xd4, 0xf3, 0x6f, 0xde, + 0xfa, 0x2d, 0x66, 0xc3, 0xff, 0xfa, 0x85, 0xf1, 0x25, 0x1a, 0x1c, 0x1c, 0x80, 0xcb, 0x1f, 0x4a, + 0x30, 0x9b, 0x76, 0xcc, 0x32, 0x53, 0xfd, 0xfe, 0x3b, 0xe7, 0x61, 0x28, 0x72, 0x74, 0xe6, 0x95, + 0x63, 0xde, 0x89, 0x37, 0x93, 0x8c, 0x79, 0xab, 0xfc, 0xa5, 0x04, 0x73, 0xd9, 0xaa, 0x0d, 0x61, + 0x2b, 0x71, 0x3d, 0xbe, 0x95, 0xe8, 0xf7, 0xd8, 0x20, 0x5b, 0xef, 0x9c, 0x6d, 0xc5, 0x5e, 0xe6, + 0x18, 0x0c, 0xc1, 0xc8, 0xad, 0xb8, 0x91, 0x8b, 0x87, 0x36, 0x32, 0xdb, 0xc0, 0xfa, 0x13, 0x37, + 0x6f, 0xcd, 0x1f, 0xf9, 0xec, 0xd6, 0xfc, 0x91, 0x3f, 0xdf, 0x9a, 0x3f, 0xf2, 0xfe, 0xfe, 0xbc, + 0x74, 0x73, 0x7f, 0x5e, 0xfa, 0x6c, 0x7f, 0x5e, 0xfa, 0xdb, 0xfe, 0xbc, 0xf4, 0x83, 0x2f, 0xe6, + 0x8f, 0x5c, 0x1b, 0x15, 0x98, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xdb, 0xfb, 0x34, 0x4b, 0xec, + 0x3c, 0x00, 0x00, } diff --git a/pkg/apis/extensions/v1beta1/generated.proto b/pkg/apis/extensions/v1beta1/generated.proto index 861904e446..a7580703f5 100644 --- a/pkg/apis/extensions/v1beta1/generated.proto +++ b/pkg/apis/extensions/v1beta1/generated.proto @@ -28,6 +28,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/policy/v1beta1/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/pkg/apis/policy/v1beta1/generated.pb.go b/pkg/apis/policy/v1beta1/generated.pb.go index ba66b4cff6..9744516323 100644 --- a/pkg/apis/policy/v1beta1/generated.pb.go +++ b/pkg/apis/policy/v1beta1/generated.pb.go @@ -39,6 +39,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 strings "strings" import reflect "reflect" import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" @@ -216,14 +218,16 @@ func (m *PodDisruptionBudgetSpec) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintGenerated(dAtA, i, uint64(m.MinAvailable.Size())) - n7, err := m.MinAvailable.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.MinAvailable != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.MinAvailable.Size())) + n7, err := m.MinAvailable.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n7 } - i += n7 if m.Selector != nil { dAtA[i] = 0x12 i++ @@ -234,6 +238,16 @@ func (m *PodDisruptionBudgetSpec) MarshalTo(dAtA []byte) (int, error) { } i += n8 } + if m.MaxUnavailable != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.MaxUnavailable.Size())) + n9, err := m.MaxUnavailable.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n9 + } return i, nil } @@ -274,11 +288,11 @@ func (m *PodDisruptionBudgetStatus) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64((&v).Size())) - n9, err := (&v).MarshalTo(dAtA[i:]) + n10, err := (&v).MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n9 + i += n10 } } dAtA[i] = 0x18 @@ -364,12 +378,18 @@ func (m *PodDisruptionBudgetList) Size() (n int) { func (m *PodDisruptionBudgetSpec) Size() (n int) { var l int _ = l - l = m.MinAvailable.Size() - n += 1 + l + sovGenerated(uint64(l)) + if m.MinAvailable != nil { + l = m.MinAvailable.Size() + n += 1 + l + sovGenerated(uint64(l)) + } if m.Selector != nil { l = m.Selector.Size() n += 1 + l + sovGenerated(uint64(l)) } + if m.MaxUnavailable != nil { + l = m.MaxUnavailable.Size() + n += 1 + l + sovGenerated(uint64(l)) + } return n } @@ -445,8 +465,9 @@ func (this *PodDisruptionBudgetSpec) String() string { return "nil" } s := strings.Join([]string{`&PodDisruptionBudgetSpec{`, - `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `MinAvailable:` + strings.Replace(fmt.Sprintf("%v", this.MinAvailable), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_apimachinery_pkg_apis_meta_v1.LabelSelector", 1) + `,`, + `MaxUnavailable:` + strings.Replace(fmt.Sprintf("%v", this.MaxUnavailable), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, `}`, }, "") return s @@ -903,6 +924,9 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.MinAvailable == nil { + m.MinAvailable = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} + } if err := m.MinAvailable.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -940,6 +964,39 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxUnavailable", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MaxUnavailable == nil { + m.MaxUnavailable = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} + } + if err := m.MaxUnavailable.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -1337,54 +1394,56 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 773 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcb, 0x6e, 0xf3, 0x44, - 0x18, 0x86, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0xac, 0x5a, - 0x04, 0x63, 0xda, 0x22, 0x54, 0x58, 0x54, 0xd4, 0xa4, 0x82, 0xa2, 0x56, 0xa9, 0x5c, 0x24, 0x24, - 0x04, 0x12, 0x63, 0xfb, 0xc3, 0x99, 0xc6, 0x27, 0x8d, 0xc7, 0xa1, 0xd9, 0x71, 0x09, 0x2c, 0xb8, - 0xa8, 0x4a, 0x6c, 0xba, 0x44, 0x08, 0x55, 0x34, 0x70, 0x0b, 0xec, 0x91, 0xc7, 0x93, 0x83, 0x9b, - 0x44, 0x0d, 0xea, 0xaf, 0x7f, 0xe7, 0x39, 0x3c, 0xef, 0xfb, 0x9d, 0xc6, 0xe8, 0x93, 0xfe, 0x51, - 0x42, 0x58, 0x64, 0xf4, 0x53, 0x1b, 0x78, 0x08, 0x02, 0x12, 0x23, 0xee, 0x7b, 0x06, 0x8d, 0x59, - 0x62, 0xc4, 0x91, 0xcf, 0x9c, 0xa1, 0x31, 0xd8, 0xb7, 0x41, 0xd0, 0x7d, 0xc3, 0x83, 0x10, 0x38, - 0x15, 0xe0, 0x92, 0x98, 0x47, 0x22, 0xc2, 0x7b, 0x39, 0x4a, 0xa6, 0x28, 0x89, 0xfb, 0x1e, 0xc9, - 0x50, 0x92, 0xa3, 0x44, 0xa1, 0xad, 0x0f, 0x3c, 0x26, 0x7a, 0xa9, 0x4d, 0x9c, 0x28, 0x30, 0xbc, - 0xc8, 0x8b, 0x0c, 0xa9, 0x60, 0xa7, 0x3f, 0xca, 0x95, 0x5c, 0xc8, 0xaf, 0x5c, 0xb9, 0xf5, 0x91, - 0x0a, 0x8a, 0xc6, 0x2c, 0xa0, 0x4e, 0x8f, 0x85, 0xc0, 0x87, 0xd3, 0xb0, 0x02, 0x10, 0xd4, 0x18, - 0xcc, 0xc5, 0xd3, 0x32, 0x96, 0x51, 0x3c, 0x0d, 0x05, 0x0b, 0x60, 0x0e, 0xf8, 0xf8, 0x29, 0x20, - 0x71, 0x7a, 0x10, 0xd0, 0x39, 0xee, 0x70, 0x19, 0x97, 0x0a, 0xe6, 0x1b, 0x2c, 0x14, 0x89, 0xe0, - 0x73, 0xd0, 0x4c, 0x4e, 0x09, 0xf0, 0x01, 0xf0, 0x69, 0x42, 0x70, 0x43, 0x83, 0xd8, 0x87, 0x45, - 0x39, 0xbd, 0xbf, 0xb4, 0x3d, 0x0b, 0x6e, 0xb7, 0xff, 0xd0, 0x50, 0xed, 0x74, 0xc0, 0x1c, 0xc1, - 0xa2, 0x10, 0xff, 0x80, 0x6a, 0x59, 0xa5, 0x5c, 0x2a, 0x68, 0x53, 0x7b, 0x57, 0xdb, 0xdd, 0x38, - 0xf8, 0x90, 0xa8, 0x8e, 0xcd, 0x06, 0x3e, 0xed, 0x59, 0x76, 0x9b, 0x0c, 0xf6, 0x49, 0xd7, 0xbe, - 0x06, 0x47, 0x5c, 0x80, 0xa0, 0x26, 0xbe, 0xbd, 0xdf, 0x29, 0x8d, 0xee, 0x77, 0xd0, 0x74, 0xcf, - 0x9a, 0xa8, 0x62, 0x1f, 0x35, 0x5c, 0xf0, 0x41, 0x40, 0x37, 0xce, 0x1c, 0x93, 0xe6, 0x9a, 0xb4, - 0x39, 0x5c, 0xcd, 0xa6, 0x33, 0x8b, 0x9a, 0xaf, 0x8d, 0xee, 0x77, 0x1a, 0x85, 0x2d, 0xab, 0x28, - 0xde, 0xfe, 0x6d, 0x0d, 0xbd, 0x7e, 0x19, 0xb9, 0x1d, 0x96, 0xf0, 0x54, 0x6e, 0x99, 0xa9, 0xeb, - 0x81, 0x78, 0x09, 0x79, 0xba, 0xa8, 0x92, 0xc4, 0xe0, 0xa8, 0xf4, 0x4c, 0xb2, 0xf2, 0xdc, 0x93, - 0x05, 0xf1, 0x5e, 0xc5, 0xe0, 0x98, 0x75, 0xe5, 0x57, 0xc9, 0x56, 0x96, 0x54, 0xc7, 0x3e, 0x5a, - 0x4f, 0x04, 0x15, 0x69, 0xd2, 0x2c, 0x4b, 0x9f, 0xce, 0x33, 0x7d, 0xa4, 0x96, 0xb9, 0xa9, 0x9c, - 0xd6, 0xf3, 0xb5, 0xa5, 0x3c, 0xda, 0x7f, 0x6a, 0xe8, 0xad, 0x05, 0xd4, 0x39, 0x4b, 0x04, 0xfe, - 0x6e, 0xae, 0xa2, 0x64, 0xb5, 0x8a, 0x66, 0xb4, 0xac, 0xe7, 0x96, 0x72, 0xad, 0x8d, 0x77, 0x66, - 0xaa, 0xe9, 0xa0, 0x2a, 0x13, 0x10, 0x64, 0xd3, 0x52, 0xde, 0xdd, 0x38, 0x38, 0x7e, 0x5e, 0x9a, - 0x66, 0x43, 0x59, 0x55, 0xcf, 0x32, 0x51, 0x2b, 0xd7, 0x6e, 0xff, 0xb3, 0x38, 0xbd, 0xac, 0xdc, - 0xf8, 0x1a, 0xd5, 0x03, 0x16, 0x9e, 0x0c, 0x28, 0xf3, 0xa9, 0xed, 0xc3, 0x93, 0x43, 0x93, 0xbd, - 0x6a, 0x92, 0xbf, 0x6a, 0x72, 0x16, 0x8a, 0x2e, 0xbf, 0x12, 0x9c, 0x85, 0x9e, 0xf9, 0x86, 0x72, - 0xae, 0x5f, 0xcc, 0xa8, 0x59, 0x05, 0x6d, 0xfc, 0x3d, 0xaa, 0x25, 0xe0, 0x83, 0x23, 0x22, 0xfe, - 0xff, 0x5e, 0xc7, 0x39, 0xb5, 0xc1, 0xbf, 0x52, 0xa8, 0x59, 0xcf, 0x6a, 0x39, 0x5e, 0x59, 0x13, - 0xc9, 0xf6, 0xbf, 0x15, 0xf4, 0xf6, 0xd2, 0xde, 0xe3, 0xaf, 0x10, 0x8e, 0x6c, 0xf9, 0xb3, 0x71, - 0xbf, 0xc8, 0xff, 0x14, 0x2c, 0x0a, 0x65, 0xba, 0x65, 0xb3, 0xa5, 0x82, 0xc7, 0xdd, 0xb9, 0x1b, - 0xd6, 0x02, 0x0a, 0xff, 0xaa, 0xa1, 0x86, 0x9b, 0xdb, 0x80, 0x7b, 0x19, 0xb9, 0xe3, 0xf6, 0x7d, - 0xf3, 0x22, 0xa6, 0x94, 0x74, 0x66, 0x95, 0x4f, 0x43, 0xc1, 0x87, 0xe6, 0xb6, 0x0a, 0xb0, 0x51, - 0x38, 0xb3, 0x8a, 0x41, 0xe0, 0x0b, 0x84, 0xdd, 0x89, 0x64, 0x72, 0xe2, 0xfb, 0xd1, 0x4f, 0xe0, - 0xca, 0x07, 0x54, 0x35, 0xdf, 0x51, 0x0a, 0xdb, 0x05, 0xdf, 0xf1, 0x25, 0x6b, 0x01, 0x88, 0x8f, - 0xd1, 0xa6, 0x93, 0x72, 0x0e, 0xa1, 0xf8, 0x12, 0xa8, 0x2f, 0x7a, 0xc3, 0x66, 0x45, 0x4a, 0xbd, - 0xa9, 0xa4, 0x36, 0x3f, 0x2f, 0x9c, 0x5a, 0x8f, 0x6e, 0x67, 0xbc, 0x0b, 0x09, 0xe3, 0xe0, 0x8e, - 0xf9, 0x6a, 0x91, 0xef, 0x14, 0x4e, 0xad, 0x47, 0xb7, 0xf1, 0x11, 0xaa, 0xc3, 0x4d, 0x0c, 0xce, - 0xb8, 0xc6, 0xeb, 0x92, 0x9e, 0x0c, 0xda, 0xe9, 0xcc, 0x99, 0x55, 0xb8, 0xd9, 0xf2, 0x11, 0x9e, - 0x2f, 0x22, 0xde, 0x42, 0xe5, 0x3e, 0x0c, 0x65, 0xcb, 0x5f, 0xb5, 0xb2, 0x4f, 0xfc, 0x19, 0xaa, - 0x0e, 0xa8, 0x9f, 0x82, 0x9a, 0xc6, 0xf7, 0x56, 0x9b, 0xc6, 0xaf, 0x59, 0x00, 0x56, 0x0e, 0x7e, - 0xba, 0x76, 0xa4, 0x99, 0x7b, 0xb7, 0x0f, 0x7a, 0xe9, 0xee, 0x41, 0x2f, 0xfd, 0xfe, 0xa0, 0x97, - 0x7e, 0x1e, 0xe9, 0xda, 0xed, 0x48, 0xd7, 0xee, 0x46, 0xba, 0xf6, 0xd7, 0x48, 0xd7, 0x7e, 0xf9, - 0x5b, 0x2f, 0x7d, 0xfb, 0x8a, 0x6a, 0xfa, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe9, 0x2f, - 0xf1, 0x61, 0x08, 0x00, 0x00, + // 805 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xdf, 0x6e, 0xe3, 0x44, + 0x14, 0xc6, 0xe3, 0xa6, 0x29, 0x65, 0x36, 0x89, 0xca, 0xc0, 0x42, 0x89, 0x84, 0x83, 0x72, 0xb5, + 0x8b, 0x60, 0x4c, 0x77, 0x11, 0x2a, 0x5c, 0xac, 0x58, 0x93, 0x0a, 0x16, 0x6d, 0xd5, 0xd5, 0x14, + 0x84, 0x84, 0x40, 0x62, 0x6c, 0x9f, 0x75, 0x87, 0x8c, 0xff, 0x68, 0x3c, 0x0e, 0xcd, 0x1d, 0x8f, + 0xc0, 0x05, 0x0f, 0x55, 0x09, 0x09, 0xed, 0x25, 0x42, 0x28, 0xa2, 0xe6, 0x19, 0xb8, 0x47, 0x1e, + 0x4f, 0x9a, 0xb8, 0x49, 0xb4, 0x81, 0x22, 0xee, 0x3c, 0x33, 0xe7, 0xf7, 0x7d, 0xe7, 0x9c, 0x39, + 0x63, 0xf4, 0xc1, 0xe8, 0x30, 0x23, 0x3c, 0x71, 0x46, 0xb9, 0x07, 0x32, 0x06, 0x05, 0x99, 0x93, + 0x8e, 0x42, 0x87, 0xa5, 0x3c, 0x73, 0xd2, 0x44, 0x70, 0x7f, 0xe2, 0x8c, 0x0f, 0x3c, 0x50, 0xec, + 0xc0, 0x09, 0x21, 0x06, 0xc9, 0x14, 0x04, 0x24, 0x95, 0x89, 0x4a, 0xf0, 0xdd, 0x0a, 0x25, 0x73, + 0x94, 0xa4, 0xa3, 0x90, 0x94, 0x28, 0xa9, 0x50, 0x62, 0xd0, 0xde, 0x3b, 0x21, 0x57, 0x67, 0xb9, + 0x47, 0xfc, 0x24, 0x72, 0xc2, 0x24, 0x4c, 0x1c, 0xad, 0xe0, 0xe5, 0x4f, 0xf5, 0x4a, 0x2f, 0xf4, + 0x57, 0xa5, 0xdc, 0x7b, 0xcf, 0x24, 0xc5, 0x52, 0x1e, 0x31, 0xff, 0x8c, 0xc7, 0x20, 0x27, 0xf3, + 0xb4, 0x22, 0x50, 0xcc, 0x19, 0x2f, 0xe5, 0xd3, 0x73, 0xd6, 0x51, 0x32, 0x8f, 0x15, 0x8f, 0x60, + 0x09, 0x78, 0xff, 0x79, 0x40, 0xe6, 0x9f, 0x41, 0xc4, 0x96, 0xb8, 0xfb, 0xeb, 0xb8, 0x5c, 0x71, + 0xe1, 0xf0, 0x58, 0x65, 0x4a, 0x2e, 0x41, 0x0b, 0x35, 0x65, 0x20, 0xc7, 0x20, 0xe7, 0x05, 0xc1, + 0x39, 0x8b, 0x52, 0x01, 0xab, 0x6a, 0x7a, 0x7b, 0xed, 0xf5, 0xac, 0x88, 0x1e, 0xfc, 0x66, 0xa1, + 0xdd, 0xa3, 0x31, 0xf7, 0x15, 0x4f, 0x62, 0xfc, 0x2d, 0xda, 0x2d, 0x3b, 0x15, 0x30, 0xc5, 0xf6, + 0xad, 0x37, 0xad, 0x3b, 0xb7, 0xee, 0xbd, 0x4b, 0xcc, 0x8d, 0x2d, 0x26, 0x3e, 0xbf, 0xb3, 0x32, + 0x9a, 0x8c, 0x0f, 0xc8, 0x89, 0xf7, 0x1d, 0xf8, 0xea, 0x18, 0x14, 0x73, 0xf1, 0xc5, 0xb4, 0xdf, + 0x28, 0xa6, 0x7d, 0x34, 0xdf, 0xa3, 0x57, 0xaa, 0x58, 0xa0, 0x4e, 0x00, 0x02, 0x14, 0x9c, 0xa4, + 0xa5, 0x63, 0xb6, 0xbf, 0xa5, 0x6d, 0xee, 0x6f, 0x66, 0x33, 0x5c, 0x44, 0xdd, 0x97, 0x8a, 0x69, + 0xbf, 0x53, 0xdb, 0xa2, 0x75, 0xf1, 0xc1, 0xcf, 0x5b, 0xe8, 0xe5, 0x27, 0x49, 0x30, 0xe4, 0x99, + 0xcc, 0xf5, 0x96, 0x9b, 0x07, 0x21, 0xa8, 0xff, 0xa1, 0xce, 0x00, 0x6d, 0x67, 0x29, 0xf8, 0xa6, + 0x3c, 0x97, 0x6c, 0x3c, 0xf7, 0x64, 0x45, 0xbe, 0xa7, 0x29, 0xf8, 0x6e, 0xdb, 0xf8, 0x6d, 0x97, + 0x2b, 0xaa, 0xd5, 0xb1, 0x40, 0x3b, 0x99, 0x62, 0x2a, 0xcf, 0xf6, 0x9b, 0xda, 0x67, 0x78, 0x43, + 0x1f, 0xad, 0xe5, 0x76, 0x8d, 0xd3, 0x4e, 0xb5, 0xa6, 0xc6, 0x63, 0xf0, 0xbb, 0x85, 0x5e, 0x5b, + 0x41, 0x3d, 0xe6, 0x99, 0xc2, 0x5f, 0x2f, 0x75, 0x94, 0x6c, 0xd6, 0xd1, 0x92, 0xd6, 0xfd, 0xdc, + 0x33, 0xae, 0xbb, 0xb3, 0x9d, 0x85, 0x6e, 0xfa, 0xa8, 0xc5, 0x15, 0x44, 0xe5, 0xb4, 0x34, 0xef, + 0xdc, 0xba, 0xf7, 0xe0, 0x66, 0x65, 0xba, 0x1d, 0x63, 0xd5, 0x7a, 0x54, 0x8a, 0xd2, 0x4a, 0x7b, + 0xf0, 0xcb, 0xd6, 0xca, 0xf2, 0xca, 0x76, 0xe3, 0xa7, 0xa8, 0x1d, 0xf1, 0xf8, 0xe1, 0x98, 0x71, + 0xc1, 0x3c, 0x01, 0xcf, 0x1d, 0x9a, 0xf2, 0x55, 0x93, 0xea, 0x55, 0x93, 0x47, 0xb1, 0x3a, 0x91, + 0xa7, 0x4a, 0xf2, 0x38, 0x74, 0xf7, 0x8a, 0x69, 0xbf, 0x7d, 0xbc, 0xa0, 0x44, 0x6b, 0xba, 0xf8, + 0x1b, 0xb4, 0x9b, 0x81, 0x00, 0x5f, 0x25, 0xf2, 0x9f, 0xbd, 0x8c, 0xc7, 0xcc, 0x03, 0x71, 0x6a, + 0x50, 0xb7, 0x5d, 0xf6, 0x71, 0xb6, 0xa2, 0x57, 0x92, 0x58, 0xa0, 0x6e, 0xc4, 0xce, 0xbf, 0x88, + 0xd9, 0x55, 0x21, 0xcd, 0x7f, 0x59, 0x08, 0x2e, 0xa6, 0xfd, 0xee, 0x71, 0x4d, 0x8b, 0x5e, 0xd3, + 0x1e, 0xfc, 0xb5, 0x8d, 0x5e, 0x5f, 0x3b, 0x65, 0xf8, 0x33, 0x84, 0x13, 0x4f, 0xff, 0xd6, 0x82, + 0x4f, 0xaa, 0x7f, 0x12, 0x4f, 0x62, 0xdd, 0xd8, 0xa6, 0xdb, 0x33, 0x17, 0x84, 0x4f, 0x96, 0x22, + 0xe8, 0x0a, 0x0a, 0xff, 0x64, 0xa1, 0x4e, 0x50, 0xd9, 0x40, 0xf0, 0x24, 0x09, 0x66, 0x83, 0xf2, + 0xe5, 0x7f, 0xf1, 0x1e, 0xc8, 0x70, 0x51, 0xf9, 0x28, 0x56, 0x72, 0xe2, 0xde, 0x36, 0x09, 0x76, + 0x6a, 0x67, 0xb4, 0x9e, 0x04, 0x3e, 0x46, 0x38, 0xb8, 0x92, 0xcc, 0x1e, 0x0a, 0x91, 0x7c, 0x0f, + 0x81, 0x6e, 0x79, 0xcb, 0x7d, 0xc3, 0x28, 0xdc, 0xae, 0xf9, 0xce, 0x82, 0xe8, 0x0a, 0x10, 0x3f, + 0x40, 0x5d, 0x3f, 0x97, 0x12, 0x62, 0xf5, 0x29, 0x30, 0xa1, 0xce, 0x26, 0xfb, 0xdb, 0x5a, 0xea, + 0x55, 0x23, 0xd5, 0xfd, 0xb8, 0x76, 0x4a, 0xaf, 0x45, 0x97, 0x7c, 0x00, 0x19, 0x97, 0x10, 0xcc, + 0xf8, 0x56, 0x9d, 0x1f, 0xd6, 0x4e, 0xe9, 0xb5, 0x68, 0x7c, 0x88, 0xda, 0x70, 0x9e, 0x82, 0x3f, + 0xeb, 0xf1, 0x8e, 0xa6, 0x5f, 0x31, 0x74, 0xfb, 0x68, 0xe1, 0x8c, 0xd6, 0x22, 0x7b, 0x02, 0xe1, + 0xe5, 0x26, 0xe2, 0x3d, 0xd4, 0x1c, 0xc1, 0x44, 0x5f, 0xf9, 0x8b, 0xb4, 0xfc, 0xc4, 0x1f, 0xa1, + 0xd6, 0x98, 0x89, 0x1c, 0xcc, 0xec, 0xbf, 0xb5, 0xd9, 0xec, 0x7f, 0xce, 0x23, 0xa0, 0x15, 0xf8, + 0xe1, 0xd6, 0xa1, 0xe5, 0xde, 0xbd, 0xb8, 0xb4, 0x1b, 0xcf, 0x2e, 0xed, 0xc6, 0xaf, 0x97, 0x76, + 0xe3, 0x87, 0xc2, 0xb6, 0x2e, 0x0a, 0xdb, 0x7a, 0x56, 0xd8, 0xd6, 0x1f, 0x85, 0x6d, 0xfd, 0xf8, + 0xa7, 0xdd, 0xf8, 0xea, 0x05, 0x73, 0xe9, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xc0, 0x72, + 0x96, 0xcb, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/policy/v1beta1/generated.proto b/pkg/apis/policy/v1beta1/generated.proto index d14d5de30e..3350c06c39 100644 --- a/pkg/apis/policy/v1beta1/generated.proto +++ b/pkg/apis/policy/v1beta1/generated.proto @@ -71,6 +71,12 @@ message PodDisruptionBudgetSpec { // Label query over pods whose evictions are managed by the disruption // budget. optional k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector selector = 2; + + // An eviction is allowed if at most "maxUnavailable" pods selected by + // "selector" are unavailable after the eviction, i.e. even in absence of + // the evicted pod. For example, one can prevent all voluntary evictions + // by specifying 0. This is a mutually exclusive setting with "minAvailable". + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxUnavailable = 3; } // PodDisruptionBudgetStatus represents information about the status of a diff --git a/pkg/apis/policy/v1beta1/types.generated.go b/pkg/apis/policy/v1beta1/types.generated.go index 38b3afeb45..a4636a80ab 100644 --- a/pkg/apis/policy/v1beta1/types.generated.go +++ b/pkg/apis/policy/v1beta1/types.generated.go @@ -85,14 +85,15 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [2]bool + var yyq2 [3]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false - yyq2[0] = true + yyq2[0] = x.MinAvailable != nil yyq2[1] = x.Selector != nil + yyq2[2] = x.MaxUnavailable != nil var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(2) + r.EncodeArrayStart(3) } else { yynn2 = 0 for _, b := range yyq2 { @@ -106,15 +107,18 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq2[0] { - yy4 := &x.MinAvailable - yym5 := z.EncBinary() - _ = yym5 - if false { - } else if z.HasExtensions() && z.EncExt(yy4) { - } else if !yym5 && z.IsJSONHandle() { - z.EncJSONMarshal(yy4) + if x.MinAvailable == nil { + r.EncodeNil() } else { - z.EncFallback(yy4) + yym4 := z.EncBinary() + _ = yym4 + if false { + } else if z.HasExtensions() && z.EncExt(x.MinAvailable) { + } else if !yym4 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MinAvailable) + } else { + z.EncFallback(x.MinAvailable) + } } } else { r.EncodeNil() @@ -124,15 +128,18 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minAvailable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy6 := &x.MinAvailable - yym7 := z.EncBinary() - _ = yym7 - if false { - } else if z.HasExtensions() && z.EncExt(yy6) { - } else if !yym7 && z.IsJSONHandle() { - z.EncJSONMarshal(yy6) + if x.MinAvailable == nil { + r.EncodeNil() } else { - z.EncFallback(yy6) + yym5 := z.EncBinary() + _ = yym5 + if false { + } else if z.HasExtensions() && z.EncExt(x.MinAvailable) { + } else if !yym5 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MinAvailable) + } else { + z.EncFallback(x.MinAvailable) + } } } } @@ -142,8 +149,8 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Selector == nil { r.EncodeNil() } else { - yym9 := z.EncBinary() - _ = yym9 + yym7 := z.EncBinary() + _ = yym7 if false { } else if z.HasExtensions() && z.EncExt(x.Selector) { } else { @@ -161,8 +168,8 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Selector == nil { r.EncodeNil() } else { - yym10 := z.EncBinary() - _ = yym10 + yym8 := z.EncBinary() + _ = yym8 if false { } else if z.HasExtensions() && z.EncExt(x.Selector) { } else { @@ -171,6 +178,45 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[2] { + if x.MaxUnavailable == nil { + r.EncodeNil() + } else { + yym10 := z.EncBinary() + _ = yym10 + if false { + } else if z.HasExtensions() && z.EncExt(x.MaxUnavailable) { + } else if !yym10 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MaxUnavailable) + } else { + z.EncFallback(x.MaxUnavailable) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq2[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("maxUnavailable")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.MaxUnavailable == nil { + r.EncodeNil() + } else { + yym11 := z.EncBinary() + _ = yym11 + if false { + } else if z.HasExtensions() && z.EncExt(x.MaxUnavailable) { + } else if !yym11 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MaxUnavailable) + } else { + z.EncFallback(x.MaxUnavailable) + } + } + } + } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { @@ -234,17 +280,21 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec switch yys3 { case "minAvailable": if r.TryDecodeAsNil() { - x.MinAvailable = pkg1_intstr.IntOrString{} + if x.MinAvailable != nil { + x.MinAvailable = nil + } } else { - yyv4 := &x.MinAvailable + if x.MinAvailable == nil { + x.MinAvailable = new(pkg1_intstr.IntOrString) + } yym5 := z.DecBinary() _ = yym5 if false { - } else if z.HasExtensions() && z.DecExt(yyv4) { + } else if z.HasExtensions() && z.DecExt(x.MinAvailable) { } else if !yym5 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4) + z.DecJSONUnmarshal(x.MinAvailable) } else { - z.DecFallback(yyv4, false) + z.DecFallback(x.MinAvailable, false) } } case "selector": @@ -264,6 +314,25 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec z.DecFallback(x.Selector, false) } } + case "maxUnavailable": + if r.TryDecodeAsNil() { + if x.MaxUnavailable != nil { + x.MaxUnavailable = nil + } + } else { + if x.MaxUnavailable == nil { + x.MaxUnavailable = new(pkg1_intstr.IntOrString) + } + yym9 := z.DecBinary() + _ = yym9 + if false { + } else if z.HasExtensions() && z.DecExt(x.MaxUnavailable) { + } else if !yym9 && z.IsJSONHandle() { + z.DecJSONUnmarshal(x.MaxUnavailable) + } else { + z.DecFallback(x.MaxUnavailable, false) + } + } default: z.DecStructFieldNotFound(-1, yys3) } // end switch yys3 @@ -275,41 +344,45 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj8 int - var yyb8 bool - var yyhl8 bool = l >= 0 - yyj8++ - if yyhl8 { - yyb8 = yyj8 > l + var yyj10 int + var yyb10 bool + var yyhl10 bool = l >= 0 + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l } else { - yyb8 = r.CheckBreak() + yyb10 = r.CheckBreak() } - if yyb8 { + if yyb10 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinAvailable = pkg1_intstr.IntOrString{} + if x.MinAvailable != nil { + x.MinAvailable = nil + } } else { - yyv9 := &x.MinAvailable - yym10 := z.DecBinary() - _ = yym10 + if x.MinAvailable == nil { + x.MinAvailable = new(pkg1_intstr.IntOrString) + } + yym12 := z.DecBinary() + _ = yym12 if false { - } else if z.HasExtensions() && z.DecExt(yyv9) { - } else if !yym10 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv9) + } else if z.HasExtensions() && z.DecExt(x.MinAvailable) { + } else if !yym12 && z.IsJSONHandle() { + z.DecJSONUnmarshal(x.MinAvailable) } else { - z.DecFallback(yyv9, false) + z.DecFallback(x.MinAvailable, false) } } - yyj8++ - if yyhl8 { - yyb8 = yyj8 > l + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l } else { - yyb8 = r.CheckBreak() + yyb10 = r.CheckBreak() } - if yyb8 { + if yyb10 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -322,26 +395,55 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D if x.Selector == nil { x.Selector = new(pkg2_v1.LabelSelector) } - yym12 := z.DecBinary() - _ = yym12 + yym14 := z.DecBinary() + _ = yym14 if false { } else if z.HasExtensions() && z.DecExt(x.Selector) { } else { z.DecFallback(x.Selector, false) } } - for { - yyj8++ - if yyhl8 { - yyb8 = yyj8 > l - } else { - yyb8 = r.CheckBreak() + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l + } else { + yyb10 = r.CheckBreak() + } + if yyb10 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + if x.MaxUnavailable != nil { + x.MaxUnavailable = nil } - if yyb8 { + } else { + if x.MaxUnavailable == nil { + x.MaxUnavailable = new(pkg1_intstr.IntOrString) + } + yym16 := z.DecBinary() + _ = yym16 + if false { + } else if z.HasExtensions() && z.DecExt(x.MaxUnavailable) { + } else if !yym16 && z.IsJSONHandle() { + z.DecJSONUnmarshal(x.MaxUnavailable) + } else { + z.DecFallback(x.MaxUnavailable, false) + } + } + for { + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l + } else { + yyb10 = r.CheckBreak() + } + if yyb10 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj8-1, "") + z.DecStructFieldNotFound(yyj10-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -2122,7 +2224,7 @@ func (x codecSelfer1234) decSlicePodDisruptionBudget(v *[]PodDisruptionBudget, d yyrg1 := len(yyv1) > 0 yyv21 := yyv1 - yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 336) + yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 320) if yyrt1 { if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] diff --git a/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go b/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go index d919856b25..29432506df 100644 --- a/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go +++ b/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go @@ -56,9 +56,10 @@ func (PodDisruptionBudgetList) SwaggerDoc() map[string]string { } var map_PodDisruptionBudgetSpec = map[string]string{ - "": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.", - "minAvailable": "An eviction is allowed if at least \"minAvailable\" pods selected by \"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%\".", - "selector": "Label query over pods whose evictions are managed by the disruption budget.", + "": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.", + "minAvailable": "An eviction is allowed if at least \"minAvailable\" pods selected by \"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%\".", + "selector": "Label query over pods whose evictions are managed by the disruption budget.", + "maxUnavailable": "An eviction is allowed if at most \"maxUnavailable\" pods selected by \"selector\" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with \"minAvailable\".", } func (PodDisruptionBudgetSpec) SwaggerDoc() map[string]string { diff --git a/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/pkg/apis/policy/v1beta1/zz_generated.conversion.go index cc108e55ac..8f3210d0d4 100644 --- a/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/policy/v1beta1/zz_generated.conversion.go @@ -24,6 +24,7 @@ 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" policy "k8s.io/kubernetes/pkg/apis/policy" unsafe "unsafe" ) @@ -130,8 +131,9 @@ func Convert_policy_PodDisruptionBudgetList_To_v1beta1_PodDisruptionBudgetList(i } func autoConvert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(in *PodDisruptionBudgetSpec, out *policy.PodDisruptionBudgetSpec, s conversion.Scope) error { - out.MinAvailable = in.MinAvailable + out.MinAvailable = (*intstr.IntOrString)(unsafe.Pointer(in.MinAvailable)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) return nil } @@ -141,8 +143,9 @@ func Convert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(i } func autoConvert_policy_PodDisruptionBudgetSpec_To_v1beta1_PodDisruptionBudgetSpec(in *policy.PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, s conversion.Scope) error { - out.MinAvailable = in.MinAvailable + out.MinAvailable = (*intstr.IntOrString)(unsafe.Pointer(in.MinAvailable)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) return nil } diff --git a/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go index abd2cea268..cf8ddbd623 100644 --- a/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go @@ -24,6 +24,7 @@ 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" reflect "reflect" ) @@ -112,6 +113,11 @@ func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c in := in.(*PodDisruptionBudgetSpec) out := out.(*PodDisruptionBudgetSpec) *out = *in + if in.MinAvailable != nil { + in, out := &in.MinAvailable, &out.MinAvailable + *out = new(intstr.IntOrString) + **out = **in + } if in.Selector != nil { in, out := &in.Selector, &out.Selector if newVal, err := c.DeepCopy(*in); err != nil { @@ -120,6 +126,11 @@ func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *out = newVal.(*v1.LabelSelector) } } + if in.MaxUnavailable != nil { + in, out := &in.MaxUnavailable, &out.MaxUnavailable + *out = new(intstr.IntOrString) + **out = **in + } return nil } } diff --git a/pkg/apis/policy/zz_generated.deepcopy.go b/pkg/apis/policy/zz_generated.deepcopy.go index 9edd2a1e2d..ba27f9072e 100644 --- a/pkg/apis/policy/zz_generated.deepcopy.go +++ b/pkg/apis/policy/zz_generated.deepcopy.go @@ -24,6 +24,7 @@ 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" reflect "reflect" ) @@ -112,6 +113,11 @@ func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c in := in.(*PodDisruptionBudgetSpec) out := out.(*PodDisruptionBudgetSpec) *out = *in + if in.MinAvailable != nil { + in, out := &in.MinAvailable, &out.MinAvailable + *out = new(intstr.IntOrString) + **out = **in + } if in.Selector != nil { in, out := &in.Selector, &out.Selector if newVal, err := c.DeepCopy(*in); err != nil { @@ -120,6 +126,11 @@ func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *out = newVal.(*v1.LabelSelector) } } + if in.MaxUnavailable != nil { + in, out := &in.MaxUnavailable, &out.MaxUnavailable + *out = new(intstr.IntOrString) + **out = **in + } return nil } } diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index feaf20d004..b6c5d0270c 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -56,6 +56,7 @@ go_test( "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/informers/informers_generated/externalversions:go_default_library", "//pkg/controller:go_default_library", + "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go index 39b91937a3..aa8d9ad646 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go @@ -3891,103 +3891,103 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1563 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcb, 0x6f, 0x1b, 0x37, - 0x13, 0xf7, 0xda, 0x92, 0x2d, 0xd3, 0xb1, 0x1c, 0xd3, 0xfe, 0x62, 0x7d, 0xce, 0x07, 0x39, 0xd0, - 0x21, 0x8f, 0x0f, 0xc9, 0xaa, 0x71, 0xd2, 0xbc, 0xdc, 0x06, 0xb5, 0x92, 0x34, 0x4d, 0x61, 0x37, - 0x06, 0x65, 0x07, 0x4d, 0x9a, 0x02, 0xa5, 0x24, 0x66, 0xcd, 0x78, 0x5f, 0x58, 0x52, 0x82, 0x75, - 0xeb, 0xa5, 0x87, 0x02, 0x3d, 0xf4, 0xd4, 0x5b, 0xd1, 0x9e, 0x8b, 0x02, 0xfd, 0x37, 0x8c, 0xf6, - 0x92, 0x63, 0xd1, 0x83, 0x51, 0x3b, 0xff, 0x45, 0x4e, 0x05, 0xb9, 0xdc, 0x97, 0x76, 0x65, 0xcb, - 0x2a, 0x9a, 0x4b, 0x6f, 0x5a, 0xce, 0xfc, 0x7e, 0x33, 0x24, 0x67, 0x86, 0x33, 0x02, 0x37, 0x77, - 0x6e, 0x31, 0x9d, 0x3a, 0xd5, 0x9d, 0x76, 0x83, 0x78, 0x36, 0xe1, 0x84, 0x55, 0xdd, 0x1d, 0xa3, - 0x8a, 0x5d, 0xca, 0xaa, 0xd8, 0x75, 0x59, 0xb5, 0x73, 0xb5, 0x41, 0x38, 0xbe, 0x5a, 0x35, 0x88, - 0x4d, 0x3c, 0xcc, 0x49, 0x4b, 0x77, 0x3d, 0x87, 0x3b, 0xf0, 0x82, 0x0f, 0xd4, 0x23, 0xa0, 0xee, - 0xee, 0x18, 0xba, 0x00, 0xea, 0x02, 0xa8, 0x2b, 0xe0, 0xe2, 0x15, 0x83, 0xf2, 0xed, 0x76, 0x43, - 0x6f, 0x3a, 0x56, 0xd5, 0x70, 0x0c, 0xa7, 0x2a, 0xf1, 0x8d, 0xf6, 0x0b, 0xf9, 0x25, 0x3f, 0xe4, - 0x2f, 0x9f, 0x77, 0xf1, 0xba, 0x72, 0x08, 0xbb, 0xd4, 0xc2, 0xcd, 0x6d, 0x6a, 0x13, 0xaf, 0x1b, - 0xb9, 0x64, 0x11, 0x8e, 0xab, 0x9d, 0x94, 0x37, 0x8b, 0xd5, 0x7e, 0x28, 0xaf, 0x6d, 0x73, 0x6a, - 0x91, 0x14, 0xe0, 0xc6, 0x71, 0x00, 0xd6, 0xdc, 0x26, 0x16, 0x4e, 0xe1, 0xae, 0xf5, 0xc3, 0xb5, - 0x39, 0x35, 0xab, 0xd4, 0xe6, 0x8c, 0x7b, 0x29, 0x50, 0x6c, 0x4f, 0x8c, 0x78, 0x1d, 0xe2, 0x45, - 0x1b, 0x22, 0xbb, 0xd8, 0x72, 0x4d, 0x92, 0xb5, 0xa7, 0xcb, 0x7d, 0xaf, 0x26, 0x4b, 0xfb, 0xfd, - 0x23, 0x2e, 0x92, 0xec, 0x72, 0x62, 0x33, 0xea, 0xd8, 0x7d, 0xaf, 0xb3, 0xf2, 0xf3, 0x28, 0x00, - 0xf7, 0x89, 0x6b, 0x3a, 0x5d, 0x8b, 0xd8, 0x1c, 0x7e, 0x01, 0x0a, 0xe2, 0xa8, 0x5b, 0x98, 0xe3, - 0x92, 0x76, 0x4e, 0xbb, 0x38, 0xb5, 0xfc, 0x8e, 0xae, 0x2e, 0x3c, 0xbe, 0xf3, 0xe8, 0xca, 0x85, - 0xb6, 0xde, 0xb9, 0xaa, 0x3f, 0x6e, 0xbc, 0x24, 0x4d, 0xbe, 0x4e, 0x38, 0xae, 0xc1, 0xbd, 0xfd, - 0xa5, 0x91, 0xc3, 0xfd, 0x25, 0x10, 0xad, 0xa1, 0x90, 0x15, 0x3e, 0x05, 0x39, 0xe6, 0x92, 0x66, - 0x69, 0x54, 0xb2, 0xdf, 0xd4, 0x07, 0x0c, 0x27, 0x3d, 0x72, 0xb2, 0xee, 0x92, 0x66, 0xed, 0x94, - 0x32, 0x92, 0x13, 0x5f, 0x48, 0x52, 0x42, 0x0c, 0xc6, 0x19, 0xc7, 0xbc, 0xcd, 0x4a, 0x63, 0x92, - 0xfc, 0xf6, 0x30, 0xe4, 0x92, 0xa0, 0x56, 0x54, 0xf4, 0xe3, 0xfe, 0x37, 0x52, 0xc4, 0x95, 0x83, - 0x31, 0x30, 0x17, 0x29, 0xdf, 0x73, 0xec, 0x16, 0xe5, 0xd4, 0xb1, 0xe1, 0x0a, 0xc8, 0xf1, 0xae, - 0x4b, 0xe4, 0x99, 0x4d, 0xd6, 0x2e, 0x04, 0xce, 0x6d, 0x76, 0x5d, 0xf2, 0x66, 0x7f, 0x69, 0x21, - 0x03, 0x22, 0x44, 0x48, 0x82, 0xe0, 0x93, 0xd0, 0xef, 0x51, 0x09, 0xbf, 0x9b, 0x34, 0xfe, 0x66, - 0x7f, 0xe9, 0xc8, 0x90, 0xd0, 0x43, 0xce, 0xa4, 0xb3, 0xf0, 0x3c, 0x18, 0xf7, 0x08, 0x66, 0x8e, - 0x5d, 0xca, 0x49, 0xde, 0x70, 0x53, 0x48, 0xae, 0x22, 0x25, 0x85, 0x97, 0xc0, 0x84, 0x45, 0x18, - 0xc3, 0x06, 0x29, 0xe5, 0xa5, 0xe2, 0x8c, 0x52, 0x9c, 0x58, 0xf7, 0x97, 0x51, 0x20, 0x87, 0x2f, - 0x41, 0xd1, 0xc4, 0x8c, 0x6f, 0xb9, 0x2d, 0xcc, 0xc9, 0x26, 0xb5, 0x48, 0x69, 0x5c, 0x1e, 0xf5, - 0xff, 0x07, 0x8b, 0x12, 0x81, 0xa8, 0x9d, 0x51, 0xec, 0xc5, 0xb5, 0x04, 0x13, 0xea, 0x61, 0x86, - 0x1d, 0x00, 0xc5, 0xca, 0xa6, 0x87, 0x6d, 0xe6, 0x1f, 0x99, 0xb0, 0x37, 0x71, 0x62, 0x7b, 0x8b, - 0xca, 0x1e, 0x5c, 0x4b, 0xb1, 0xa1, 0x0c, 0x0b, 0x95, 0x3d, 0x0d, 0x14, 0xa3, 0x0b, 0x5b, 0xa3, - 0x8c, 0xc3, 0xe7, 0xa9, 0xb4, 0xd0, 0x07, 0x73, 0x40, 0xa0, 0x65, 0x52, 0x9c, 0x56, 0x4e, 0x14, - 0x82, 0x95, 0x58, 0x4a, 0x7c, 0x0a, 0xf2, 0x94, 0x13, 0x4b, 0x5c, 0xff, 0xd8, 0xc5, 0xa9, 0xe5, - 0x6b, 0x43, 0x84, 0x6d, 0x6d, 0x5a, 0xf1, 0xe7, 0x1f, 0x09, 0x26, 0xe4, 0x13, 0x56, 0xbe, 0x19, - 0x03, 0x30, 0x52, 0x42, 0x8e, 0x69, 0x36, 0x70, 0x73, 0x07, 0x9e, 0x03, 0x39, 0x1b, 0x5b, 0x41, - 0xb4, 0x86, 0xa9, 0xf4, 0x09, 0xb6, 0x08, 0x92, 0x12, 0xf8, 0x83, 0x06, 0x60, 0x5b, 0x5e, 0x45, - 0x6b, 0xd5, 0xb6, 0x1d, 0x8e, 0xc5, 0xe9, 0x04, 0x0e, 0xd6, 0x87, 0x70, 0x30, 0xb0, 0xad, 0x6f, - 0xa5, 0x58, 0x1f, 0xd8, 0xdc, 0xeb, 0x46, 0xb7, 0x94, 0x56, 0x40, 0x19, 0xae, 0xc0, 0x1d, 0x00, - 0x3c, 0xc5, 0xb9, 0xe9, 0xa8, 0x84, 0x1f, 0xbc, 0x9a, 0x04, 0xee, 0xdc, 0x73, 0xec, 0x17, 0xd4, - 0x88, 0x4a, 0x16, 0x0a, 0x29, 0x51, 0x8c, 0x7e, 0xf1, 0x01, 0x58, 0xe8, 0xe3, 0x37, 0x3c, 0x0d, - 0xc6, 0x76, 0x48, 0xd7, 0x3f, 0x4a, 0x24, 0x7e, 0xc2, 0x79, 0x90, 0xef, 0x60, 0xb3, 0x4d, 0xfc, - 0x6c, 0x46, 0xfe, 0xc7, 0x9d, 0xd1, 0x5b, 0x5a, 0xe5, 0x8f, 0x7c, 0x3c, 0xb2, 0x44, 0xe5, 0x82, - 0x17, 0x41, 0xc1, 0x23, 0xae, 0x49, 0x9b, 0x98, 0x49, 0x8e, 0x7c, 0xed, 0x94, 0x88, 0x12, 0xa4, - 0xd6, 0x50, 0x28, 0x85, 0x9f, 0x83, 0x02, 0x23, 0x26, 0x69, 0x72, 0xc7, 0x53, 0xc5, 0xf3, 0xda, - 0x80, 0x31, 0x88, 0x1b, 0xc4, 0xac, 0x2b, 0xa8, 0x4f, 0x1f, 0x7c, 0xa1, 0x90, 0x12, 0x7e, 0x06, - 0x0a, 0x9c, 0x58, 0xae, 0x89, 0x39, 0x51, 0xa7, 0x79, 0xa5, 0xff, 0x69, 0x0a, 0xda, 0x0d, 0xa7, - 0xb5, 0xa9, 0x00, 0xb2, 0x22, 0x87, 0x11, 0x1e, 0xac, 0xa2, 0x90, 0x10, 0x52, 0x50, 0x60, 0x5c, - 0x3c, 0x3b, 0x46, 0x57, 0xd6, 0xa2, 0xa9, 0xe5, 0x95, 0xa1, 0x6a, 0xb3, 0x4f, 0x11, 0x99, 0x0a, - 0x56, 0x50, 0x48, 0x0f, 0x57, 0xc1, 0x8c, 0x45, 0x6d, 0x44, 0x70, 0xab, 0x5b, 0x27, 0x4d, 0xc7, - 0x6e, 0x31, 0x59, 0xd4, 0xf2, 0xb5, 0x05, 0x05, 0x9a, 0x59, 0x4f, 0x8a, 0x51, 0xaf, 0x3e, 0x5c, - 0x03, 0xf3, 0x1e, 0xe9, 0x50, 0xf1, 0x70, 0x7e, 0x44, 0x19, 0x77, 0xbc, 0xee, 0x1a, 0xb5, 0x28, - 0x97, 0xa5, 0x2e, 0x5f, 0x2b, 0x1d, 0xee, 0x2f, 0xcd, 0xa3, 0x0c, 0x39, 0xca, 0x44, 0x89, 0x2a, - 0xec, 0xe2, 0x36, 0x23, 0x2d, 0x59, 0xba, 0x0a, 0x51, 0x15, 0xde, 0x90, 0xab, 0x48, 0x49, 0xa1, - 0x91, 0x08, 0xe8, 0xc2, 0xdf, 0x0b, 0xe8, 0x62, 0xff, 0x60, 0x86, 0x5b, 0x60, 0xc1, 0xf5, 0x1c, - 0xc3, 0x23, 0x8c, 0xdd, 0x27, 0xb8, 0x65, 0x52, 0x9b, 0x04, 0x27, 0x35, 0x29, 0x77, 0x78, 0xf6, - 0x70, 0x7f, 0x69, 0x61, 0x23, 0x5b, 0x05, 0xf5, 0xc3, 0x56, 0xbe, 0xcb, 0x81, 0xd3, 0xbd, 0xef, - 0x28, 0xfc, 0x18, 0x40, 0xa7, 0x21, 0x7b, 0x9f, 0xd6, 0x43, 0xbf, 0xf3, 0xa0, 0x8e, 0x2d, 0x03, - 0x7d, 0x2c, 0xca, 0xf8, 0xc7, 0x29, 0x0d, 0x94, 0x81, 0x82, 0x97, 0x63, 0xa9, 0x32, 0x2a, 0x1d, - 0x0d, 0xe3, 0x20, 0x23, 0x5d, 0x56, 0xc1, 0x8c, 0xaa, 0x1a, 0x81, 0x50, 0x86, 0x75, 0x2c, 0x0e, - 0xb6, 0x92, 0x62, 0xd4, 0xab, 0x0f, 0x1f, 0x82, 0x59, 0xdc, 0xc1, 0xd4, 0xc4, 0x0d, 0x93, 0x84, - 0x24, 0x39, 0x49, 0xf2, 0x5f, 0x45, 0x32, 0xbb, 0xda, 0xab, 0x80, 0xd2, 0x18, 0xb8, 0x0e, 0xe6, - 0xda, 0x76, 0x9a, 0xca, 0x8f, 0xcb, 0xb3, 0x8a, 0x6a, 0x6e, 0x2b, 0xad, 0x82, 0xb2, 0x70, 0xd0, - 0x05, 0xa0, 0x19, 0x3c, 0xf9, 0xac, 0x34, 0x2e, 0x6b, 0xf2, 0x7b, 0x43, 0xe4, 0x53, 0xd8, 0x37, - 0x44, 0xf5, 0x2f, 0x5c, 0x62, 0x28, 0x66, 0x03, 0xae, 0x80, 0x69, 0x4f, 0x64, 0x48, 0xe8, 0xfa, - 0x84, 0x74, 0xfd, 0x3f, 0x0a, 0x36, 0x8d, 0xe2, 0x42, 0x94, 0xd4, 0xad, 0xfc, 0xa6, 0xc5, 0x1f, - 0xa1, 0x20, 0x65, 0xe1, 0x9d, 0x44, 0xcb, 0x74, 0xbe, 0xa7, 0x65, 0x3a, 0x93, 0x46, 0xc4, 0x3a, - 0xa6, 0x2e, 0x98, 0x16, 0x01, 0x4d, 0x6d, 0xc3, 0xbf, 0x44, 0x55, 0x10, 0x3f, 0x38, 0x51, 0xba, - 0x84, 0xe8, 0xd8, 0x33, 0x3a, 0x2b, 0x77, 0x13, 0x17, 0xa2, 0xa4, 0xa5, 0xca, 0x5d, 0x50, 0x4c, - 0xe6, 0x9a, 0x1f, 0x97, 0x7e, 0xe2, 0xab, 0xc8, 0x8e, 0xc5, 0xa5, 0xbf, 0x8e, 0x42, 0x8d, 0xca, - 0x6b, 0x0d, 0x2c, 0xf4, 0xb1, 0x0e, 0x4d, 0x50, 0xb4, 0xf0, 0x6e, 0x2c, 0x0e, 0x8e, 0xed, 0xc1, - 0xc5, 0xf4, 0xa1, 0xfb, 0xd3, 0x87, 0xfe, 0xc8, 0xe6, 0x8f, 0xbd, 0x3a, 0xf7, 0xa8, 0x6d, 0xd4, - 0xa0, 0xe8, 0xaf, 0xd6, 0x13, 0x5c, 0xa8, 0x87, 0x1b, 0x3e, 0x03, 0x05, 0x0b, 0xef, 0xd6, 0xdb, - 0x9e, 0x11, 0x9c, 0xdf, 0xc9, 0xed, 0xc8, 0xd7, 0x64, 0x5d, 0xb1, 0xa0, 0x90, 0xaf, 0xf2, 0xfd, - 0x28, 0xc8, 0xd7, 0x9b, 0xd8, 0x24, 0x6f, 0x61, 0xa2, 0xd8, 0x4c, 0x4c, 0x14, 0xcb, 0x03, 0xc7, - 0x80, 0xf4, 0xaf, 0xef, 0x30, 0xf1, 0xbc, 0x67, 0x98, 0xb8, 0x7e, 0x42, 0xde, 0xa3, 0xe7, 0x88, - 0xdb, 0x60, 0x32, 0x34, 0x9f, 0x28, 0x6c, 0xda, 0x71, 0x85, 0xad, 0xf2, 0xd3, 0x28, 0x98, 0x8a, - 0x99, 0x38, 0x19, 0x1a, 0xba, 0x89, 0x2e, 0x42, 0x54, 0x8e, 0xda, 0x30, 0x1b, 0xd3, 0x83, 0x0e, - 0xc2, 0x6f, 0xde, 0xa2, 0x07, 0x39, 0xdd, 0x58, 0xdc, 0x05, 0x45, 0x8e, 0x3d, 0x83, 0xf0, 0x40, - 0x26, 0x0f, 0x74, 0x32, 0x1a, 0x03, 0x36, 0x13, 0x52, 0xd4, 0xa3, 0xbd, 0xb8, 0x02, 0xa6, 0x13, - 0xc6, 0x4e, 0xd4, 0x71, 0xfd, 0x22, 0x0e, 0x8b, 0x63, 0x4e, 0x5e, 0xb4, 0xcd, 0x3a, 0x79, 0x1b, - 0xf3, 0xed, 0xb3, 0x44, 0x34, 0xde, 0x1a, 0xfc, 0x70, 0x23, 0x2f, 0xfb, 0xc6, 0x64, 0xa3, 0x27, - 0x26, 0xef, 0x0c, 0xc5, 0x7e, 0x74, 0x64, 0xfe, 0xaa, 0x81, 0x99, 0x98, 0xf6, 0x5b, 0x18, 0x7f, - 0x9e, 0x26, 0xc7, 0x9f, 0xeb, 0xc3, 0x6c, 0xaa, 0xcf, 0xfc, 0xf3, 0x63, 0x2e, 0xb1, 0x99, 0x7f, - 0x51, 0xc7, 0xfd, 0x95, 0x06, 0xe6, 0x3b, 0x8e, 0xd9, 0xb6, 0xc8, 0x3d, 0x13, 0x53, 0x2b, 0xd0, - 0x10, 0xfd, 0xcb, 0x31, 0x33, 0xa6, 0xb4, 0x44, 0x3c, 0x46, 0x19, 0x27, 0x36, 0x7f, 0x12, 0x71, - 0xd4, 0xfe, 0xa7, 0xec, 0xcd, 0x3f, 0xc9, 0x20, 0x46, 0x99, 0xe6, 0xe0, 0xbb, 0x60, 0x4a, 0x34, - 0x72, 0xb4, 0x49, 0xc4, 0x74, 0xa9, 0xfe, 0x5f, 0x98, 0x53, 0x44, 0x53, 0xf5, 0x48, 0x84, 0xe2, - 0x7a, 0x70, 0x1b, 0xcc, 0xb9, 0x4e, 0x6b, 0x1d, 0xdb, 0xd8, 0x20, 0xe2, 0x69, 0xdc, 0x70, 0x4c, - 0xda, 0xec, 0xca, 0x0e, 0x7c, 0xb2, 0x76, 0x23, 0xe8, 0x98, 0x36, 0xd2, 0x2a, 0x6f, 0x44, 0xeb, - 0x9a, 0x5e, 0x96, 0xbd, 0x43, 0x16, 0x65, 0xe5, 0x6b, 0x0d, 0xcc, 0xa6, 0xb2, 0x03, 0x7e, 0x78, - 0x44, 0xdf, 0x7a, 0xe6, 0x9f, 0xea, 0x59, 0x6b, 0x97, 0xf6, 0x0e, 0xca, 0x23, 0xaf, 0x0e, 0xca, - 0x23, 0xbf, 0x1f, 0x94, 0x47, 0xbe, 0x3c, 0x2c, 0x6b, 0x7b, 0x87, 0x65, 0xed, 0xd5, 0x61, 0x59, - 0xfb, 0xf3, 0xb0, 0xac, 0x7d, 0xfb, 0xba, 0x3c, 0xf2, 0x6c, 0x42, 0xc5, 0xfe, 0x5f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xdf, 0x80, 0xf3, 0x34, 0xc0, 0x15, 0x00, 0x00, + // 1561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x6f, 0x1b, 0xb7, + 0x12, 0xf7, 0xda, 0x92, 0x2d, 0xd3, 0xb1, 0x1c, 0xd3, 0x7e, 0xb1, 0x9e, 0xf3, 0x20, 0x07, 0x3a, + 0xe4, 0xe3, 0x21, 0x59, 0xbd, 0x38, 0x79, 0xf9, 0x72, 0x11, 0xd4, 0x4a, 0xd2, 0x34, 0x85, 0xdd, + 0x18, 0x94, 0x1d, 0x34, 0x69, 0x0a, 0x94, 0x5a, 0x31, 0x6b, 0xc6, 0xfb, 0x85, 0x25, 0x25, 0x44, + 0xb7, 0x5e, 0x7a, 0x28, 0xd0, 0x43, 0x4f, 0xbd, 0x15, 0xed, 0xb9, 0x28, 0xd0, 0x7f, 0xc3, 0x68, + 0x2f, 0x39, 0x16, 0x3d, 0x18, 0xb5, 0xf3, 0x5f, 0xe4, 0x54, 0x90, 0xcb, 0xfd, 0xd2, 0xae, 0xfc, + 0xa1, 0xa2, 0xb9, 0xf4, 0xa6, 0xe5, 0xcc, 0xef, 0x37, 0x43, 0x72, 0x66, 0x38, 0x23, 0x70, 0x73, + 0xe7, 0x16, 0xd3, 0xa9, 0x5b, 0xdf, 0xe9, 0xb4, 0x88, 0xef, 0x10, 0x4e, 0x58, 0xdd, 0xdb, 0x31, + 0xeb, 0xd8, 0xa3, 0xac, 0x8e, 0x3d, 0x8f, 0xd5, 0xbb, 0x57, 0x5b, 0x84, 0xe3, 0xab, 0x75, 0x93, + 0x38, 0xc4, 0xc7, 0x9c, 0xb4, 0x75, 0xcf, 0x77, 0xb9, 0x0b, 0x2f, 0x04, 0x40, 0x3d, 0x06, 0xea, + 0xde, 0x8e, 0xa9, 0x0b, 0xa0, 0x2e, 0x80, 0xba, 0x02, 0x2e, 0x5e, 0x31, 0x29, 0xdf, 0xee, 0xb4, + 0x74, 0xc3, 0xb5, 0xeb, 0xa6, 0x6b, 0xba, 0x75, 0x89, 0x6f, 0x75, 0x5e, 0xc8, 0x2f, 0xf9, 0x21, + 0x7f, 0x05, 0xbc, 0x8b, 0xd7, 0x95, 0x43, 0xd8, 0xa3, 0x36, 0x36, 0xb6, 0xa9, 0x43, 0xfc, 0x5e, + 0xec, 0x92, 0x4d, 0x38, 0xae, 0x77, 0x33, 0xde, 0x2c, 0xd6, 0x07, 0xa1, 0xfc, 0x8e, 0xc3, 0xa9, + 0x4d, 0x32, 0x80, 0x1b, 0x47, 0x01, 0x98, 0xb1, 0x4d, 0x6c, 0x9c, 0xc1, 0x5d, 0x1b, 0x84, 0xeb, + 0x70, 0x6a, 0xd5, 0xa9, 0xc3, 0x19, 0xf7, 0x33, 0xa0, 0xc4, 0x9e, 0x18, 0xf1, 0xbb, 0xc4, 0x8f, + 0x37, 0x44, 0x5e, 0x61, 0xdb, 0xb3, 0x48, 0xde, 0x9e, 0x2e, 0x0f, 0xbc, 0x9a, 0x3c, 0xed, 0xdb, + 0x87, 0x5c, 0xa4, 0xe7, 0x5a, 0xd4, 0xe8, 0x0d, 0xba, 0xca, 0xda, 0x4f, 0xa3, 0x00, 0xdc, 0x27, + 0x9e, 0xe5, 0xf6, 0x6c, 0xe2, 0x70, 0xf8, 0x39, 0x28, 0x89, 0x63, 0x6e, 0x63, 0x8e, 0x2b, 0xda, + 0x39, 0xed, 0xe2, 0xd4, 0xf2, 0xff, 0x74, 0x75, 0xd9, 0xc9, 0x5d, 0xc7, 0xd7, 0x2d, 0xb4, 0xf5, + 0xee, 0x55, 0xfd, 0x71, 0xeb, 0x25, 0x31, 0xf8, 0x3a, 0xe1, 0xb8, 0x01, 0x77, 0xf7, 0x96, 0x46, + 0x0e, 0xf6, 0x96, 0x40, 0xbc, 0x86, 0x22, 0x56, 0xf8, 0x14, 0x14, 0x98, 0x47, 0x8c, 0xca, 0xa8, + 0x64, 0xbf, 0xa9, 0x1f, 0x33, 0x94, 0xf4, 0xd8, 0xc9, 0xa6, 0x47, 0x8c, 0xc6, 0x29, 0x65, 0xa4, + 0x20, 0xbe, 0x90, 0xa4, 0x84, 0x18, 0x8c, 0x33, 0x8e, 0x79, 0x87, 0x55, 0xc6, 0x24, 0xf9, 0xed, + 0x61, 0xc8, 0x25, 0x41, 0xa3, 0xac, 0xe8, 0xc7, 0x83, 0x6f, 0xa4, 0x88, 0x6b, 0xfb, 0x63, 0x60, + 0x2e, 0x56, 0xbe, 0xe7, 0x3a, 0x6d, 0xca, 0xa9, 0xeb, 0xc0, 0x15, 0x50, 0xe0, 0x3d, 0x8f, 0xc8, + 0x33, 0x9b, 0x6c, 0x5c, 0x08, 0x9d, 0xdb, 0xec, 0x79, 0xe4, 0xed, 0xde, 0xd2, 0x42, 0x0e, 0x44, + 0x88, 0x90, 0x04, 0xc1, 0x27, 0x91, 0xdf, 0xa3, 0x12, 0x7e, 0x37, 0x6d, 0xfc, 0xed, 0xde, 0xd2, + 0xa1, 0xe1, 0xa0, 0x47, 0x9c, 0x69, 0x67, 0xe1, 0x79, 0x30, 0xee, 0x13, 0xcc, 0x5c, 0xa7, 0x52, + 0x90, 0xbc, 0xd1, 0xa6, 0x90, 0x5c, 0x45, 0x4a, 0x0a, 0x2f, 0x81, 0x09, 0x9b, 0x30, 0x86, 0x4d, + 0x52, 0x29, 0x4a, 0xc5, 0x19, 0xa5, 0x38, 0xb1, 0x1e, 0x2c, 0xa3, 0x50, 0x0e, 0x5f, 0x82, 0xb2, + 0x85, 0x19, 0xdf, 0xf2, 0xda, 0x98, 0x93, 0x4d, 0x6a, 0x93, 0xca, 0xb8, 0x3c, 0xea, 0xff, 0x1e, + 0x2f, 0x4a, 0x04, 0xa2, 0x71, 0x46, 0xb1, 0x97, 0xd7, 0x52, 0x4c, 0xa8, 0x8f, 0x19, 0x76, 0x01, + 0x14, 0x2b, 0x9b, 0x3e, 0x76, 0x58, 0x70, 0x64, 0xc2, 0xde, 0xc4, 0x89, 0xed, 0x2d, 0x2a, 0x7b, + 0x70, 0x2d, 0xc3, 0x86, 0x72, 0x2c, 0xd4, 0x76, 0x35, 0x50, 0x8e, 0x2f, 0x6c, 0x8d, 0x32, 0x0e, + 0x9f, 0x67, 0xd2, 0x42, 0x3f, 0x9e, 0x03, 0x02, 0x2d, 0x93, 0xe2, 0xb4, 0x72, 0xa2, 0x14, 0xae, + 0x24, 0x52, 0xe2, 0x13, 0x50, 0xa4, 0x9c, 0xd8, 0xe2, 0xfa, 0xc7, 0x2e, 0x4e, 0x2d, 0x5f, 0x1b, + 0x22, 0x6c, 0x1b, 0xd3, 0x8a, 0xbf, 0xf8, 0x48, 0x30, 0xa1, 0x80, 0xb0, 0xf6, 0xf5, 0x18, 0x80, + 0xb1, 0x12, 0x72, 0x2d, 0xab, 0x85, 0x8d, 0x1d, 0x78, 0x0e, 0x14, 0x1c, 0x6c, 0x87, 0xd1, 0x1a, + 0xa5, 0xd2, 0xc7, 0xd8, 0x26, 0x48, 0x4a, 0xe0, 0xf7, 0x1a, 0x80, 0x1d, 0x79, 0x15, 0xed, 0x55, + 0xc7, 0x71, 0x39, 0x16, 0xa7, 0x13, 0x3a, 0xd8, 0x1c, 0xc2, 0xc1, 0xd0, 0xb6, 0xbe, 0x95, 0x61, + 0x7d, 0xe0, 0x70, 0xbf, 0x17, 0xdf, 0x52, 0x56, 0x01, 0xe5, 0xb8, 0x02, 0x77, 0x00, 0xf0, 0x15, + 0xe7, 0xa6, 0xab, 0x12, 0xfe, 0xf8, 0xd5, 0x24, 0x74, 0xe7, 0x9e, 0xeb, 0xbc, 0xa0, 0x66, 0x5c, + 0xb2, 0x50, 0x44, 0x89, 0x12, 0xf4, 0x8b, 0x0f, 0xc0, 0xc2, 0x00, 0xbf, 0xe1, 0x69, 0x30, 0xb6, + 0x43, 0x7a, 0xc1, 0x51, 0x22, 0xf1, 0x13, 0xce, 0x83, 0x62, 0x17, 0x5b, 0x1d, 0x12, 0x64, 0x33, + 0x0a, 0x3e, 0xee, 0x8c, 0xde, 0xd2, 0x6a, 0xbf, 0x17, 0x93, 0x91, 0x25, 0x2a, 0x17, 0xbc, 0x08, + 0x4a, 0x3e, 0xf1, 0x2c, 0x6a, 0x60, 0x26, 0x39, 0x8a, 0x8d, 0x53, 0x22, 0x4a, 0x90, 0x5a, 0x43, + 0x91, 0x14, 0x7e, 0x06, 0x4a, 0x8c, 0x58, 0xc4, 0xe0, 0xae, 0xaf, 0x8a, 0xe7, 0xb5, 0x63, 0xc6, + 0x20, 0x6e, 0x11, 0xab, 0xa9, 0xa0, 0x01, 0x7d, 0xf8, 0x85, 0x22, 0x4a, 0xf8, 0x29, 0x28, 0x71, + 0x62, 0x7b, 0x16, 0xe6, 0x44, 0x9d, 0xe6, 0x95, 0xc1, 0xa7, 0x29, 0x68, 0x37, 0xdc, 0xf6, 0xa6, + 0x02, 0xc8, 0x8a, 0x1c, 0x45, 0x78, 0xb8, 0x8a, 0x22, 0x42, 0x48, 0x41, 0x89, 0x71, 0xf1, 0xec, + 0x98, 0x3d, 0x59, 0x8b, 0xa6, 0x96, 0x57, 0x86, 0xaa, 0xcd, 0x01, 0x45, 0x6c, 0x2a, 0x5c, 0x41, + 0x11, 0x3d, 0x5c, 0x05, 0x33, 0x36, 0x75, 0x10, 0xc1, 0xed, 0x5e, 0x93, 0x18, 0xae, 0xd3, 0x66, + 0xb2, 0xa8, 0x15, 0x1b, 0x0b, 0x0a, 0x34, 0xb3, 0x9e, 0x16, 0xa3, 0x7e, 0x7d, 0xb8, 0x06, 0xe6, + 0x7d, 0xd2, 0xa5, 0x8c, 0xba, 0xce, 0x87, 0x94, 0x71, 0xd7, 0xef, 0xad, 0x51, 0x9b, 0x72, 0x59, + 0xea, 0x8a, 0x8d, 0xca, 0xc1, 0xde, 0xd2, 0x3c, 0xca, 0x91, 0xa3, 0x5c, 0x94, 0xa8, 0xc2, 0x1e, + 0xee, 0x30, 0xd2, 0x96, 0xa5, 0xab, 0x14, 0x57, 0xe1, 0x0d, 0xb9, 0x8a, 0x94, 0x14, 0x9a, 0xa9, + 0x80, 0x2e, 0xfd, 0xb5, 0x80, 0x2e, 0x0f, 0x0e, 0x66, 0xb8, 0x05, 0x16, 0x3c, 0xdf, 0x35, 0x7d, + 0xc2, 0xd8, 0x7d, 0x82, 0xdb, 0x16, 0x75, 0x48, 0x78, 0x52, 0x93, 0x72, 0x87, 0x67, 0x0f, 0xf6, + 0x96, 0x16, 0x36, 0xf2, 0x55, 0xd0, 0x20, 0x6c, 0xed, 0xdb, 0x02, 0x38, 0xdd, 0xff, 0x8e, 0xc2, + 0x8f, 0x00, 0x74, 0x5b, 0xb2, 0xef, 0x69, 0x3f, 0x0c, 0x3a, 0x0f, 0xea, 0x3a, 0x32, 0xd0, 0xc7, + 0xe2, 0x8c, 0x7f, 0x9c, 0xd1, 0x40, 0x39, 0x28, 0x78, 0x39, 0x91, 0x2a, 0xa3, 0xd2, 0xd1, 0x28, + 0x0e, 0x72, 0xd2, 0x65, 0x15, 0xcc, 0xa8, 0xaa, 0x11, 0x0a, 0x65, 0x58, 0x27, 0xe2, 0x60, 0x2b, + 0x2d, 0x46, 0xfd, 0xfa, 0xf0, 0x21, 0x98, 0xc5, 0x5d, 0x4c, 0x2d, 0xdc, 0xb2, 0x48, 0x44, 0x52, + 0x90, 0x24, 0xff, 0x56, 0x24, 0xb3, 0xab, 0xfd, 0x0a, 0x28, 0x8b, 0x81, 0xeb, 0x60, 0xae, 0xe3, + 0x64, 0xa9, 0x82, 0xb8, 0x3c, 0xab, 0xa8, 0xe6, 0xb6, 0xb2, 0x2a, 0x28, 0x0f, 0x07, 0x3d, 0x00, + 0x8c, 0xf0, 0xc9, 0x67, 0x95, 0x71, 0x59, 0x93, 0xdf, 0x1b, 0x22, 0x9f, 0xa2, 0xbe, 0x21, 0xae, + 0x7f, 0xd1, 0x12, 0x43, 0x09, 0x1b, 0x70, 0x05, 0x4c, 0xfb, 0x22, 0x43, 0x22, 0xd7, 0x27, 0xa4, + 0xeb, 0xff, 0x52, 0xb0, 0x69, 0x94, 0x14, 0xa2, 0xb4, 0x6e, 0xed, 0x57, 0x2d, 0xf9, 0x08, 0x85, + 0x29, 0x0b, 0xef, 0xa4, 0x5a, 0xa6, 0xf3, 0x7d, 0x2d, 0xd3, 0x99, 0x2c, 0x22, 0xd1, 0x31, 0xf5, + 0xc0, 0xb4, 0x08, 0x68, 0xea, 0x98, 0xc1, 0x25, 0xaa, 0x82, 0xf8, 0xfe, 0x89, 0xd2, 0x25, 0x42, + 0x27, 0x9e, 0xd1, 0x59, 0xb9, 0x9b, 0xa4, 0x10, 0xa5, 0x2d, 0xd5, 0xee, 0x82, 0x72, 0x3a, 0xd7, + 0x82, 0xb8, 0x0c, 0x12, 0x5f, 0x45, 0x76, 0x22, 0x2e, 0x83, 0x75, 0x14, 0x69, 0xd4, 0xde, 0x68, + 0x60, 0x61, 0x80, 0x75, 0x68, 0x81, 0xb2, 0x8d, 0x5f, 0x25, 0xe2, 0xe0, 0xc8, 0x1e, 0x5c, 0x4c, + 0x1e, 0x7a, 0x30, 0x79, 0xe8, 0x8f, 0x1c, 0xfe, 0xd8, 0x6f, 0x72, 0x9f, 0x3a, 0x66, 0x03, 0x8a, + 0xfe, 0x6a, 0x3d, 0xc5, 0x85, 0xfa, 0xb8, 0xe1, 0x33, 0x50, 0xb2, 0xf1, 0xab, 0x66, 0xc7, 0x37, + 0xc3, 0xf3, 0x3b, 0xb9, 0x1d, 0xf9, 0x9a, 0xac, 0x2b, 0x16, 0x14, 0xf1, 0xd5, 0xbe, 0x1b, 0x05, + 0xc5, 0xa6, 0x81, 0x2d, 0xf2, 0x0e, 0x26, 0x8a, 0xcd, 0xd4, 0x44, 0xb1, 0x7c, 0xec, 0x18, 0x90, + 0xfe, 0x0d, 0x1c, 0x26, 0x9e, 0xf7, 0x0d, 0x13, 0xd7, 0x4f, 0xc8, 0x7b, 0xf8, 0x1c, 0x71, 0x1b, + 0x4c, 0x46, 0xe6, 0x53, 0x85, 0x4d, 0x3b, 0xaa, 0xb0, 0xd5, 0x7e, 0x1c, 0x05, 0x53, 0x09, 0x13, + 0x27, 0x43, 0x43, 0x2f, 0xd5, 0x45, 0x88, 0xca, 0xd1, 0x18, 0x66, 0x63, 0x7a, 0xd8, 0x41, 0x04, + 0xcd, 0x5b, 0xfc, 0x20, 0x67, 0x1b, 0x8b, 0xbb, 0xa0, 0xcc, 0xb1, 0x6f, 0x12, 0x1e, 0xca, 0xe4, + 0x81, 0x4e, 0xc6, 0x63, 0xc0, 0x66, 0x4a, 0x8a, 0xfa, 0xb4, 0x17, 0x57, 0xc0, 0x74, 0xca, 0xd8, + 0x89, 0x3a, 0xae, 0x9f, 0xc5, 0x61, 0x71, 0xcc, 0xc9, 0x8b, 0x8e, 0xd5, 0x24, 0xef, 0x62, 0xbe, + 0x7d, 0x96, 0x8a, 0xc6, 0x5b, 0xc7, 0x3f, 0xdc, 0xd8, 0xcb, 0x81, 0x31, 0xd9, 0xea, 0x8b, 0xc9, + 0x3b, 0x43, 0xb1, 0x1f, 0x1e, 0x99, 0xbf, 0x68, 0x60, 0x26, 0xa1, 0xfd, 0x0e, 0xc6, 0x9f, 0xa7, + 0xe9, 0xf1, 0xe7, 0xfa, 0x30, 0x9b, 0x1a, 0x30, 0xff, 0xfc, 0x50, 0x48, 0x6d, 0xe6, 0x1f, 0xd4, + 0x71, 0x7f, 0xa9, 0x81, 0xf9, 0xae, 0x6b, 0x75, 0x6c, 0x72, 0xcf, 0xc2, 0xd4, 0x0e, 0x35, 0x44, + 0xff, 0x72, 0xc4, 0x8c, 0x29, 0x2d, 0x11, 0x9f, 0x51, 0xc6, 0x89, 0xc3, 0x9f, 0xc4, 0x1c, 0x8d, + 0xff, 0x28, 0x7b, 0xf3, 0x4f, 0x72, 0x88, 0x51, 0xae, 0x39, 0xf8, 0x7f, 0x30, 0x25, 0x1a, 0x39, + 0x6a, 0x10, 0x31, 0x5d, 0xaa, 0xff, 0x17, 0xe6, 0x14, 0xd1, 0x54, 0x33, 0x16, 0xa1, 0xa4, 0x1e, + 0xdc, 0x06, 0x73, 0x9e, 0xdb, 0x5e, 0xc7, 0x0e, 0x36, 0x89, 0x78, 0x1a, 0x37, 0xe4, 0xbf, 0x58, + 0xb2, 0x03, 0x9f, 0x6c, 0xdc, 0x08, 0x3b, 0xa6, 0x8d, 0xac, 0xca, 0x5b, 0xd1, 0xba, 0x66, 0x97, + 0x65, 0xef, 0x90, 0x47, 0x59, 0xfb, 0x4a, 0x03, 0xb3, 0x99, 0xec, 0x80, 0x1f, 0x1c, 0xd2, 0xb7, + 0x9e, 0xf9, 0xbb, 0x7a, 0xd6, 0xc6, 0xa5, 0xdd, 0xfd, 0xea, 0xc8, 0xeb, 0xfd, 0xea, 0xc8, 0x6f, + 0xfb, 0xd5, 0x91, 0x2f, 0x0e, 0xaa, 0xda, 0xee, 0x41, 0x55, 0x7b, 0x7d, 0x50, 0xd5, 0xfe, 0x38, + 0xa8, 0x6a, 0xdf, 0xbc, 0xa9, 0x8e, 0x3c, 0x9b, 0x50, 0xb1, 0xff, 0x67, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xdb, 0x8b, 0x00, 0x6d, 0xbc, 0x15, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto index 8699197886..ad1d271464 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto @@ -27,7 +27,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/policy/v1beta1/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go index b3bf3f16f5..d6c39c2549 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go @@ -11794,7 +11794,7 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 3369 bytes of a gzipped FileDescriptorProto + // 3379 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xdb, 0x6f, 0x1b, 0xc7, 0xd5, 0xf7, 0x8a, 0xa4, 0x45, 0x1d, 0x59, 0x92, 0x35, 0x72, 0x64, 0x46, 0x49, 0x44, 0x67, 0x3f, 0x7c, 0x89, 0xf3, 0x7d, 0x09, 0xf5, 0xc5, 0xf9, 0x9c, 0x26, 0x4e, 0xe2, 0x44, 0x94, 0x7c, 0x51, @@ -11814,196 +11814,197 @@ var fileDescriptorGenerated = []byte{ 0x59, 0x32, 0xb7, 0x90, 0xc7, 0x65, 0xbb, 0x06, 0x55, 0xf5, 0xb4, 0x98, 0x67, 0xef, 0xc4, 0xe0, 0xb4, 0xb7, 0x89, 0xae, 0xa4, 0xf8, 0x9e, 0xc9, 0xe3, 0x73, 0xa9, 0xaa, 0x2d, 0xa8, 0x06, 0x75, 0xa8, 0x7d, 0x90, 0x4d, 0x0e, 0xb1, 0x77, 0x88, 0x1d, 0x1d, 0x25, 0x45, 0xb7, 0x34, 0x92, 0x65, - 0xd3, 0x93, 0xb9, 0x83, 0x9b, 0x41, 0x2d, 0xd7, 0x00, 0x16, 0x1b, 0x2b, 0x57, 0x89, 0xcd, 0xc6, - 0x0c, 0x9d, 0x82, 0xa2, 0xa1, 0xe8, 0xa4, 0x22, 0x9d, 0x92, 0x4e, 0x8f, 0xd5, 0x8f, 0xdd, 0xdc, - 0xab, 0x1e, 0xd9, 0xdf, 0xab, 0x16, 0xd7, 0x15, 0x9d, 0x60, 0xde, 0x23, 0xff, 0x58, 0x82, 0x07, - 0x97, 0x5c, 0x87, 0x9a, 0xfa, 0x1a, 0xa1, 0xb6, 0xda, 0x5e, 0x72, 0x6d, 0x9b, 0x18, 0xb4, 0x49, - 0x15, 0xea, 0x3a, 0x77, 0xe6, 0x47, 0xd7, 0xa0, 0xb4, 0xa3, 0x68, 0x2e, 0xa9, 0x8c, 0x9c, 0x92, - 0x4e, 0x8f, 0x9f, 0xa9, 0xd5, 0x44, 0x2c, 0x45, 0x1d, 0xe3, 0x47, 0x53, 0xcd, 0x1f, 0xed, 0xda, - 0xab, 0xae, 0x62, 0x50, 0x95, 0xf6, 0xea, 0x27, 0x04, 0xe4, 0x31, 0x21, 0xf7, 0x2a, 0xc3, 0xc2, - 0x1e, 0xa4, 0xfc, 0x7d, 0x09, 0x1e, 0xc9, 0xd5, 0x6d, 0x55, 0x75, 0x28, 0xd2, 0xa1, 0xa4, 0x52, - 0xa2, 0x3b, 0x15, 0xe9, 0x54, 0xe1, 0xf4, 0xf8, 0x99, 0xcb, 0xb5, 0xbe, 0x22, 0xb9, 0x96, 0x0b, - 0x5e, 0x9f, 0x10, 0x7a, 0x95, 0x56, 0x18, 0x3c, 0xf6, 0xa4, 0xc8, 0x3f, 0x94, 0x00, 0x45, 0x79, - 0x5a, 0x8a, 0xdd, 0x25, 0xf4, 0x2e, 0xbc, 0xf4, 0xda, 0xe1, 0xbc, 0x34, 0x23, 0x20, 0xc7, 0x3d, - 0x81, 0x31, 0x27, 0xbd, 0x2f, 0xc1, 0x6c, 0x5a, 0x27, 0xee, 0x9d, 0xad, 0xb8, 0x77, 0x16, 0x0f, - 0xe1, 0x1d, 0x0f, 0x35, 0xc7, 0x2d, 0xbf, 0x1c, 0x81, 0xb1, 0x65, 0x85, 0xe8, 0xa6, 0xd1, 0x24, - 0x14, 0x7d, 0x13, 0xca, 0x6c, 0x7a, 0x76, 0x14, 0xaa, 0x70, 0x8f, 0x8c, 0x9f, 0xf9, 0xbf, 0x83, - 0xcc, 0x75, 0x6a, 0x8c, 0xba, 0xb6, 0xf3, 0x74, 0xed, 0xca, 0xe6, 0x75, 0xd2, 0xa6, 0x6b, 0x84, - 0x2a, 0x75, 0x24, 0xe4, 0x40, 0xd8, 0x86, 0x03, 0x54, 0xf4, 0x16, 0x14, 0x1d, 0x8b, 0xb4, 0x85, - 0x33, 0x5f, 0xec, 0xd3, 0xac, 0x40, 0xd3, 0xa6, 0x45, 0xda, 0xe1, 0x68, 0xb1, 0x2f, 0xcc, 0x71, - 0xd1, 0x16, 0x1c, 0x75, 0x78, 0x18, 0x54, 0x0a, 0x5c, 0xc2, 0xf9, 0x81, 0x25, 0x78, 0xc1, 0x34, - 0x29, 0x64, 0x1c, 0xf5, 0xbe, 0xb1, 0x40, 0x97, 0x7f, 0x27, 0xc1, 0x44, 0x40, 0xcb, 0x47, 0xec, - 0x8d, 0x94, 0xef, 0x6a, 0x77, 0xe7, 0x3b, 0xc6, 0xcd, 0x3d, 0x77, 0x5c, 0xc8, 0x2a, 0xfb, 0x2d, - 0x11, 0xbf, 0xbd, 0xe9, 0xc7, 0xc3, 0x08, 0x8f, 0x87, 0xe7, 0x06, 0x35, 0x2b, 0x27, 0x0c, 0xbe, - 0x28, 0x44, 0xcc, 0x61, 0xee, 0x44, 0x6f, 0x42, 0xd9, 0x21, 0x1a, 0x69, 0x53, 0xd3, 0x16, 0xe6, - 0x3c, 0x73, 0x97, 0xe6, 0x28, 0x9b, 0x44, 0x6b, 0x0a, 0xd6, 0xfa, 0x31, 0x66, 0x8f, 0xff, 0x85, - 0x03, 0x48, 0xf4, 0x3a, 0x94, 0x29, 0xd1, 0x2d, 0x4d, 0xa1, 0xfe, 0xc4, 0x7a, 0x2a, 0xdf, 0x24, - 0x06, 0xdb, 0x30, 0x3b, 0x2d, 0xc1, 0xc0, 0x07, 0x3f, 0x70, 0x96, 0xdf, 0x8a, 0x03, 0x40, 0xf4, - 0x81, 0x04, 0x93, 0xae, 0xd5, 0x61, 0xa4, 0x94, 0x25, 0xd8, 0x6e, 0x4f, 0x44, 0xc3, 0xc5, 0x41, - 0xdd, 0xb6, 0x11, 0x43, 0xab, 0xcf, 0x0a, 0xe1, 0x93, 0xf1, 0x76, 0x9c, 0x90, 0x8a, 0x16, 0x61, - 0x4a, 0x57, 0x0d, 0x4c, 0x94, 0x4e, 0xaf, 0x49, 0xda, 0xa6, 0xd1, 0x71, 0x2a, 0xc5, 0x53, 0xd2, - 0xe9, 0x52, 0xfd, 0xa4, 0x00, 0x98, 0x5a, 0x8b, 0x77, 0xe3, 0x24, 0x3d, 0xfa, 0x3a, 0x20, 0xdf, - 0xae, 0x4b, 0xde, 0x7a, 0xa1, 0x9a, 0x46, 0xa5, 0x74, 0x4a, 0x3a, 0x5d, 0xa8, 0xcf, 0x09, 0x14, - 0xd4, 0x4a, 0x51, 0xe0, 0x0c, 0x2e, 0xf9, 0x9f, 0x45, 0x98, 0x4a, 0x04, 0x38, 0xba, 0x0a, 0xb3, - 0x6d, 0x2f, 0x7d, 0xae, 0xbb, 0xfa, 0x26, 0xb1, 0x9b, 0xed, 0x6d, 0xd2, 0x71, 0x35, 0xd2, 0xe1, - 0xa3, 0x5e, 0xaa, 0xcf, 0x0b, 0x19, 0xb3, 0x4b, 0x99, 0x54, 0x38, 0x87, 0x9b, 0xe9, 0x6d, 0xf0, - 0xa6, 0x35, 0xd5, 0x71, 0x02, 0xcc, 0x11, 0x8e, 0x19, 0xe8, 0xbd, 0x9e, 0xa2, 0xc0, 0x19, 0x5c, - 0x4c, 0xc7, 0x0e, 0x71, 0x54, 0x9b, 0x74, 0x92, 0x3a, 0x16, 0xe2, 0x3a, 0x2e, 0x67, 0x52, 0xe1, - 0x1c, 0x6e, 0x74, 0x16, 0xc6, 0x3d, 0x69, 0xdc, 0xe3, 0x62, 0x68, 0x82, 0x84, 0xbd, 0x1e, 0x76, - 0xe1, 0x28, 0x1d, 0x33, 0xcd, 0xdc, 0xe4, 0x55, 0x40, 0x27, 0x7f, 0x48, 0xae, 0xa4, 0x28, 0x70, - 0x06, 0x17, 0x33, 0xcd, 0x8b, 0x99, 0x94, 0x69, 0x47, 0xe3, 0xa6, 0x6d, 0x64, 0x52, 0xe1, 0x1c, - 0x6e, 0x16, 0x79, 0x9e, 0xca, 0x8b, 0x3b, 0x8a, 0xaa, 0x29, 0x9b, 0x1a, 0xa9, 0x8c, 0xc6, 0x23, - 0x6f, 0x3d, 0xde, 0x8d, 0x93, 0xf4, 0xe8, 0x12, 0x4c, 0x7b, 0x4d, 0x1b, 0x86, 0x12, 0x80, 0x94, - 0x39, 0xc8, 0x83, 0x02, 0x64, 0x7a, 0x3d, 0x49, 0x80, 0xd3, 0x3c, 0xf2, 0x5f, 0x24, 0x38, 0x99, - 0x33, 0x93, 0xd0, 0xcb, 0x50, 0xa4, 0x3d, 0xcb, 0x5f, 0x7f, 0xff, 0xd7, 0xcf, 0xe8, 0xad, 0x9e, - 0x45, 0x6e, 0xef, 0x55, 0x1f, 0xca, 0x61, 0x63, 0xdd, 0x98, 0x33, 0xa2, 0x6f, 0xc3, 0x84, 0x6d, - 0x6a, 0x9a, 0x6a, 0x74, 0x3d, 0x12, 0x91, 0x4d, 0x2e, 0xf4, 0x39, 0xd3, 0x71, 0x14, 0x23, 0xcc, - 0x96, 0xd3, 0xfb, 0x7b, 0xd5, 0x89, 0x58, 0x1f, 0x8e, 0x8b, 0x93, 0x7f, 0x3d, 0x02, 0xb0, 0x4c, - 0x2c, 0xcd, 0xec, 0xe9, 0xc4, 0x18, 0xc6, 0x0a, 0xfa, 0x76, 0x6c, 0x05, 0x7d, 0xa9, 0xdf, 0x8c, - 0x16, 0xa8, 0x9a, 0xbb, 0x84, 0x76, 0x13, 0x4b, 0xe8, 0xcb, 0x83, 0x8b, 0x38, 0x78, 0x0d, 0xbd, - 0x55, 0x80, 0x99, 0x90, 0x78, 0xc9, 0x34, 0x3a, 0x2a, 0x9f, 0x13, 0x2f, 0xc4, 0x62, 0xe2, 0xf1, - 0x44, 0x4c, 0x9c, 0xcc, 0x60, 0x89, 0xc4, 0xc3, 0xd5, 0x40, 0xfb, 0x11, 0xce, 0x7e, 0x3e, 0x2e, - 0xfc, 0xf6, 0x5e, 0xf5, 0xc0, 0xa2, 0xbc, 0x16, 0x60, 0xc6, 0x95, 0x45, 0x8f, 0xc1, 0x51, 0x9b, - 0x28, 0x8e, 0x69, 0xf0, 0x34, 0x31, 0x16, 0x1a, 0x85, 0x79, 0x2b, 0x16, 0xbd, 0xe8, 0x09, 0x18, - 0xd5, 0x89, 0xe3, 0x28, 0x5d, 0xc2, 0x33, 0xc2, 0x58, 0x7d, 0x4a, 0x10, 0x8e, 0xae, 0x79, 0xcd, - 0xd8, 0xef, 0x47, 0xd7, 0x61, 0x52, 0x53, 0x1c, 0x11, 0xda, 0x2d, 0x55, 0x27, 0x7c, 0xce, 0x8f, - 0x9f, 0xf9, 0x9f, 0xbb, 0x8b, 0x18, 0xc6, 0x11, 0xae, 0x44, 0xab, 0x31, 0x24, 0x9c, 0x40, 0x46, - 0x3b, 0x80, 0x58, 0x4b, 0xcb, 0x56, 0x0c, 0xc7, 0x73, 0x19, 0x93, 0x37, 0xda, 0xb7, 0xbc, 0x20, - 0xbf, 0xad, 0xa6, 0xd0, 0x70, 0x86, 0x04, 0xf9, 0xf7, 0x12, 0x4c, 0x86, 0x03, 0x36, 0x84, 0x42, - 0xe9, 0xad, 0x78, 0xa1, 0xf4, 0xfc, 0xc0, 0xc1, 0x9b, 0x53, 0x29, 0x7d, 0x58, 0x00, 0x14, 0x12, - 0xb1, 0xd4, 0xb0, 0xa9, 0xb4, 0x6f, 0xdc, 0xc5, 0x3e, 0xe2, 0xa7, 0x12, 0x20, 0x91, 0xac, 0x17, - 0x0d, 0xc3, 0xa4, 0x3c, 0xff, 0xfb, 0x6a, 0xbe, 0x36, 0xb0, 0x9a, 0xbe, 0x06, 0xb5, 0x8d, 0x14, - 0xf6, 0x05, 0x83, 0xda, 0xbd, 0x70, 0xc4, 0xd2, 0x04, 0x38, 0x43, 0x21, 0xf4, 0x0e, 0x80, 0x2d, - 0x30, 0x5b, 0xa6, 0x48, 0x01, 0x2f, 0x0d, 0x90, 0x4d, 0x19, 0xc0, 0x92, 0x69, 0x6c, 0xa9, 0xdd, - 0x30, 0xa1, 0xe1, 0x00, 0x18, 0x47, 0x84, 0xcc, 0x5d, 0x80, 0x93, 0x39, 0xda, 0xa3, 0xe3, 0x50, - 0xb8, 0x41, 0x7a, 0x9e, 0x5b, 0x31, 0xfb, 0x89, 0x4e, 0x44, 0xf7, 0x63, 0x63, 0x62, 0x2b, 0x75, - 0x6e, 0xe4, 0x39, 0x49, 0xfe, 0xb2, 0x14, 0x8d, 0x35, 0x5e, 0xc5, 0x9e, 0x86, 0xb2, 0x4d, 0x2c, - 0x4d, 0x6d, 0x2b, 0x8e, 0xa8, 0x67, 0x78, 0x41, 0x8a, 0x45, 0x1b, 0x0e, 0x7a, 0x63, 0xf5, 0xee, - 0xc8, 0xfd, 0xad, 0x77, 0x0b, 0xf7, 0xba, 0xde, 0x35, 0xa1, 0xec, 0xf8, 0x85, 0x6e, 0x91, 0x83, - 0x2f, 0x1e, 0x22, 0x67, 0x8b, 0x1a, 0x37, 0x10, 0x18, 0x54, 0xb7, 0x81, 0x90, 0xac, 0xba, 0xb6, - 0xd4, 0x67, 0x5d, 0xbb, 0x0a, 0x27, 0x6c, 0xb2, 0xa3, 0x32, 0x35, 0x2e, 0xab, 0x0e, 0x35, 0xed, - 0xde, 0xaa, 0xaa, 0xab, 0x54, 0x94, 0x3d, 0x95, 0xfd, 0xbd, 0xea, 0x09, 0x9c, 0xd1, 0x8f, 0x33, - 0xb9, 0x58, 0x76, 0xb6, 0x14, 0xd7, 0x21, 0x1d, 0x9e, 0xd2, 0xca, 0x61, 0x76, 0x6e, 0xf0, 0x56, - 0x2c, 0x7a, 0x91, 0x1e, 0x0b, 0xee, 0xf2, 0xbd, 0x08, 0xee, 0xc9, 0xfc, 0xc0, 0x46, 0x1b, 0x70, - 0xd2, 0xb2, 0xcd, 0xae, 0x4d, 0x1c, 0x67, 0x99, 0x28, 0x1d, 0x4d, 0x35, 0x88, 0xef, 0xaf, 0x31, - 0x6e, 0xe7, 0x43, 0xfb, 0x7b, 0xd5, 0x93, 0x8d, 0x6c, 0x12, 0x9c, 0xc7, 0x2b, 0x7f, 0x54, 0x84, - 0xe3, 0xc9, 0x55, 0x36, 0xa7, 0x2a, 0x95, 0x06, 0xaa, 0x4a, 0x9f, 0x8c, 0x4c, 0x1b, 0xaf, 0x64, - 0x0f, 0xa2, 0x21, 0x63, 0xea, 0x2c, 0xc2, 0x94, 0xc8, 0x23, 0x7e, 0xa7, 0xa8, 0xcb, 0x83, 0x68, - 0xd8, 0x88, 0x77, 0xe3, 0x24, 0x3d, 0xab, 0x35, 0xc3, 0x12, 0xd2, 0x07, 0x29, 0xc6, 0x6b, 0xcd, - 0xc5, 0x24, 0x01, 0x4e, 0xf3, 0xa0, 0x35, 0x98, 0x71, 0x8d, 0x34, 0x94, 0x17, 0x9d, 0x0f, 0x09, - 0xa8, 0x99, 0x8d, 0x34, 0x09, 0xce, 0xe2, 0x43, 0x3b, 0x00, 0x6d, 0xbf, 0x20, 0x70, 0x2a, 0x47, - 0x79, 0xae, 0xae, 0x0f, 0x3c, 0xb7, 0x82, 0xda, 0x22, 0xcc, 0x88, 0x41, 0x93, 0x83, 0x23, 0x92, - 0xd0, 0x0b, 0x30, 0x61, 0xf3, 0x8d, 0x87, 0x6f, 0x80, 0x57, 0xbc, 0x3f, 0x20, 0xd8, 0x26, 0x70, - 0xb4, 0x13, 0xc7, 0x69, 0xe5, 0x3f, 0x48, 0xd1, 0x25, 0x2a, 0x28, 0xb5, 0xcf, 0xc5, 0xca, 0xaa, - 0xc7, 0x12, 0x65, 0xd5, 0x6c, 0x9a, 0x23, 0x52, 0x55, 0x7d, 0x27, 0xbb, 0xca, 0xbe, 0x78, 0xa8, - 0x2a, 0x3b, 0x5c, 0x6a, 0xef, 0x5c, 0x66, 0x7f, 0x22, 0xc1, 0xec, 0xc5, 0xe6, 0x25, 0xdb, 0x74, - 0x2d, 0x5f, 0xbd, 0x2b, 0x96, 0xe7, 0xab, 0xaf, 0x41, 0xd1, 0x76, 0x35, 0xdf, 0xae, 0xff, 0xf2, - 0xed, 0xc2, 0xae, 0xc6, 0xec, 0x9a, 0x49, 0x70, 0x79, 0x46, 0x31, 0x06, 0xf4, 0x16, 0x1c, 0xb5, - 0x15, 0xa3, 0x4b, 0xfc, 0x45, 0xf8, 0xd9, 0x3e, 0xad, 0x59, 0x59, 0xc6, 0x8c, 0x3d, 0x52, 0x0a, - 0x72, 0x34, 0x2c, 0x50, 0xe5, 0x9f, 0x48, 0x30, 0x75, 0xb9, 0xd5, 0x6a, 0xac, 0x18, 0x7c, 0x16, - 0x37, 0x14, 0xba, 0xcd, 0xea, 0x04, 0x4b, 0xa1, 0xdb, 0xc9, 0x3a, 0x81, 0xf5, 0x61, 0xde, 0x83, - 0xb6, 0x61, 0x94, 0x65, 0x0f, 0x62, 0x74, 0x06, 0x2c, 0xf1, 0x85, 0xb8, 0xba, 0x07, 0x12, 0xd6, - 0x9f, 0xa2, 0x01, 0xfb, 0xf0, 0xf2, 0x7b, 0x70, 0x22, 0xa2, 0x1e, 0xf3, 0x17, 0x3f, 0x9d, 0x44, - 0x6d, 0x28, 0x31, 0x4d, 0xfc, 0xb3, 0xc7, 0x7e, 0x8f, 0xd0, 0x12, 0x26, 0x87, 0x75, 0x14, 0xfb, - 0x72, 0xb0, 0x87, 0x2d, 0xaf, 0xc1, 0xc4, 0x65, 0xd3, 0xa1, 0x0d, 0xd3, 0xa6, 0xdc, 0x6d, 0xe8, - 0x11, 0x28, 0xe8, 0xaa, 0x21, 0x56, 0xe9, 0x71, 0xc1, 0x53, 0x60, 0xeb, 0x08, 0x6b, 0xe7, 0xdd, - 0xca, 0xae, 0xc8, 0x46, 0x61, 0xb7, 0xb2, 0x8b, 0x59, 0xbb, 0x7c, 0x09, 0x46, 0xc5, 0x70, 0x44, - 0x81, 0x0a, 0x07, 0x03, 0x15, 0x32, 0x80, 0x7e, 0x31, 0x02, 0xa3, 0x42, 0xfb, 0x21, 0x6c, 0xe6, - 0xde, 0x88, 0x6d, 0xe6, 0xce, 0x0d, 0x36, 0xd2, 0xb9, 0x3b, 0xb9, 0x4e, 0x62, 0x27, 0xf7, 0xe2, - 0x80, 0xf8, 0x07, 0x6f, 0xe3, 0x3e, 0x96, 0x60, 0x32, 0x1e, 0x73, 0xe8, 0x2c, 0x8c, 0xb3, 0x35, - 0x45, 0x6d, 0x93, 0xf5, 0xb0, 0x28, 0x0e, 0x0e, 0x56, 0x9a, 0x61, 0x17, 0x8e, 0xd2, 0xa1, 0x6e, - 0xc0, 0xc6, 0xc2, 0x42, 0x38, 0x25, 0xdf, 0xe5, 0x2e, 0x55, 0xb5, 0x9a, 0x77, 0x5f, 0x53, 0x5b, - 0x31, 0xe8, 0x15, 0xbb, 0x49, 0x6d, 0xd5, 0xe8, 0xa6, 0x04, 0xf1, 0x18, 0x8b, 0x22, 0xcb, 0x37, - 0x25, 0x18, 0x17, 0x2a, 0x0f, 0x61, 0x4b, 0xf2, 0x7a, 0x7c, 0x4b, 0xf2, 0xec, 0x80, 0xf3, 0x39, - 0x7b, 0x3f, 0xf2, 0x69, 0x68, 0x0a, 0x9b, 0xc1, 0x2c, 0xc1, 0x6c, 0x9b, 0x0e, 0x4d, 0x26, 0x18, - 0x36, 0xd7, 0x30, 0xef, 0x41, 0xdf, 0x93, 0xe0, 0xb8, 0x9a, 0x98, 0xf3, 0xc2, 0xd7, 0x2f, 0x0f, - 0xa6, 0x5a, 0x00, 0x53, 0xaf, 0x08, 0x79, 0xc7, 0x93, 0x3d, 0x38, 0x25, 0x52, 0x76, 0x21, 0x45, - 0x85, 0x14, 0x28, 0x6e, 0x53, 0x6a, 0x89, 0x41, 0x58, 0x1a, 0x3c, 0xf3, 0x84, 0x2a, 0x95, 0xb9, - 0xf9, 0xad, 0x56, 0x03, 0x73, 0x68, 0xf9, 0xe7, 0x23, 0x81, 0xc3, 0x9a, 0xde, 0x24, 0x09, 0xf2, - 0xad, 0x74, 0x2f, 0xf2, 0xed, 0x78, 0x56, 0xae, 0x45, 0xdf, 0x80, 0x02, 0xd5, 0x06, 0xdd, 0x94, - 0x0a, 0x09, 0xad, 0xd5, 0x66, 0x98, 0xb0, 0x5a, 0xab, 0x4d, 0xcc, 0x20, 0xd1, 0xdb, 0x50, 0x62, - 0xab, 0x19, 0x9b, 0xe3, 0x85, 0xc1, 0x73, 0x08, 0xf3, 0x57, 0x18, 0x61, 0xec, 0xcb, 0xc1, 0x1e, - 0xae, 0xfc, 0x1e, 0x4c, 0xc4, 0x12, 0x01, 0xba, 0x0e, 0xc7, 0x34, 0x53, 0xe9, 0xd4, 0x15, 0x4d, - 0x31, 0xda, 0xc4, 0x4e, 0xa6, 0xc6, 0xec, 0xfd, 0xcc, 0x6a, 0x84, 0x43, 0x24, 0x94, 0xe0, 0x02, - 0x31, 0xda, 0x87, 0x63, 0xd8, 0xb2, 0x02, 0x10, 0x5a, 0x8f, 0xaa, 0x50, 0x62, 0x21, 0xec, 0xad, - 0x4c, 0x63, 0xf5, 0x31, 0xa6, 0x2b, 0x8b, 0x6c, 0x07, 0x7b, 0xed, 0xe8, 0x0c, 0x80, 0x43, 0xda, - 0x36, 0xa1, 0x3c, 0xef, 0x78, 0x27, 0x40, 0x41, 0x06, 0x6e, 0x06, 0x3d, 0x38, 0x42, 0x25, 0xff, - 0x49, 0x82, 0x89, 0x75, 0x42, 0xdf, 0x35, 0xed, 0x1b, 0x0d, 0x53, 0x53, 0xdb, 0xbd, 0x21, 0xe4, - 0xfd, 0xcd, 0x58, 0xde, 0x7f, 0xa5, 0xcf, 0x31, 0x8b, 0x69, 0x9b, 0x97, 0xfd, 0xe5, 0xbf, 0x4b, - 0x50, 0x89, 0x51, 0x46, 0xd3, 0x04, 0x81, 0x92, 0x65, 0xda, 0xd4, 0x5f, 0xe3, 0x0f, 0xa5, 0x01, - 0x4b, 0xa9, 0x91, 0x55, 0x9e, 0xc1, 0x62, 0x0f, 0x9d, 0xd9, 0xb9, 0x65, 0x9b, 0xba, 0x88, 0xfb, - 0xc3, 0x49, 0x21, 0xc4, 0x0e, 0xed, 0xbc, 0x68, 0x9b, 0x3a, 0xe6, 0xd8, 0xf2, 0x1f, 0x25, 0x98, - 0x8e, 0x51, 0x0e, 0x21, 0xa5, 0x2b, 0xf1, 0x94, 0xfe, 0xe2, 0x61, 0x0c, 0xcb, 0x49, 0xec, 0x5f, - 0x25, 0xcd, 0x62, 0x0e, 0x40, 0x5b, 0x30, 0x6e, 0x99, 0x9d, 0xe6, 0x3d, 0xb8, 0x99, 0x9b, 0x62, - 0x2b, 0x64, 0x23, 0xc4, 0xc2, 0x51, 0x60, 0xb4, 0x0b, 0xd3, 0x86, 0xa2, 0x13, 0xc7, 0x52, 0xda, - 0xa4, 0x79, 0x0f, 0xce, 0x45, 0x1e, 0xe0, 0xb7, 0x05, 0x49, 0x44, 0x9c, 0x16, 0x22, 0xff, 0x2a, - 0x65, 0xb7, 0x69, 0x53, 0xf4, 0x2a, 0x94, 0xf9, 0x23, 0x89, 0xb6, 0xa9, 0x89, 0xa5, 0xed, 0x2c, - 0x1b, 0x9a, 0x86, 0x68, 0xbb, 0xbd, 0x57, 0xfd, 0xef, 0x03, 0x8f, 0x75, 0x7d, 0x42, 0x1c, 0xc0, - 0xa0, 0x75, 0x28, 0x5a, 0x87, 0x29, 0x33, 0xf8, 0xc2, 0xc2, 0x6b, 0x0b, 0x8e, 0x23, 0xff, 0x23, - 0xa9, 0x38, 0x5f, 0x5e, 0xae, 0xdf, 0xb3, 0x01, 0x0b, 0xca, 0x9a, 0xdc, 0x41, 0xb3, 0x61, 0x54, - 0xac, 0xb2, 0x22, 0x2e, 0x2f, 0x1d, 0x26, 0x2e, 0xa3, 0x2b, 0x43, 0xb0, 0x89, 0xf0, 0x1b, 0x7d, - 0x41, 0xf2, 0x5f, 0x25, 0x98, 0xe6, 0x0a, 0xb5, 0x5d, 0x5b, 0xa5, 0xbd, 0xa1, 0x65, 0xd0, 0xad, - 0x58, 0x06, 0x5d, 0xee, 0xd3, 0xd0, 0x94, 0xc6, 0xb9, 0x59, 0xf4, 0x73, 0x09, 0x1e, 0x48, 0x51, - 0x0f, 0x21, 0xc3, 0x90, 0x78, 0x86, 0x79, 0xe5, 0xb0, 0x06, 0xe6, 0x64, 0x99, 0x9b, 0x90, 0x61, - 0x1e, 0x0f, 0xdc, 0x33, 0x00, 0x96, 0xad, 0xee, 0xa8, 0x1a, 0xe9, 0x8a, 0xcb, 0xe0, 0x72, 0x38, - 0x24, 0x8d, 0xa0, 0x07, 0x47, 0xa8, 0xd0, 0xb7, 0x60, 0xb6, 0x43, 0xb6, 0x14, 0x57, 0xa3, 0x8b, - 0x9d, 0xce, 0x92, 0x62, 0x29, 0x9b, 0xaa, 0xa6, 0x52, 0x55, 0xec, 0xb0, 0xc7, 0xea, 0x17, 0xbc, - 0x4b, 0xda, 0x2c, 0x8a, 0xdb, 0x7b, 0xd5, 0xc7, 0x0f, 0xbe, 0x98, 0xf1, 0x89, 0x7b, 0x38, 0x47, - 0x08, 0xfa, 0xae, 0x04, 0x15, 0x9b, 0xbc, 0xe3, 0xaa, 0x36, 0xe9, 0x2c, 0xdb, 0xa6, 0x15, 0xd3, - 0xa0, 0xc0, 0x35, 0xb8, 0xb4, 0xbf, 0x57, 0xad, 0xe0, 0x1c, 0x9a, 0x7e, 0x74, 0xc8, 0x15, 0x84, - 0x28, 0xcc, 0x28, 0x9a, 0x66, 0xbe, 0x4b, 0xe2, 0x1e, 0x28, 0x72, 0xf9, 0xf5, 0xfd, 0xbd, 0xea, - 0xcc, 0x62, 0xba, 0xbb, 0x1f, 0xd1, 0x59, 0xf0, 0x68, 0x01, 0x46, 0x77, 0x4c, 0xcd, 0xd5, 0x89, - 0x53, 0x29, 0x71, 0x49, 0x2c, 0xe3, 0x8e, 0x5e, 0xf5, 0x9a, 0x6e, 0xef, 0x55, 0x8f, 0x5e, 0x6c, - 0xf2, 0xa3, 0x0f, 0x9f, 0x8a, 0xed, 0xd1, 0x58, 0xcd, 0x24, 0xa6, 0x3c, 0x3f, 0x77, 0x2d, 0x87, - 0x39, 0xe6, 0x72, 0xd8, 0x85, 0xa3, 0x74, 0x48, 0x87, 0xb1, 0x6d, 0xb1, 0x6f, 0x77, 0x2a, 0xa3, - 0x03, 0xad, 0x7e, 0xb1, 0x7d, 0x7f, 0x7d, 0x5a, 0x88, 0x1c, 0xf3, 0x9b, 0x1d, 0x1c, 0x4a, 0x40, - 0x4f, 0xc0, 0x28, 0xff, 0x58, 0x59, 0xe6, 0xa7, 0xb5, 0xe5, 0x30, 0x13, 0x5d, 0xf6, 0x9a, 0xb1, - 0xdf, 0xef, 0x93, 0xae, 0x34, 0x96, 0xf8, 0xe1, 0x6a, 0x82, 0x74, 0xa5, 0xb1, 0x84, 0xfd, 0x7e, - 0x64, 0xc1, 0xa8, 0x43, 0x56, 0x55, 0xc3, 0xdd, 0xad, 0xc0, 0x40, 0xd7, 0xc5, 0xcd, 0x0b, 0x9c, - 0x3b, 0x71, 0x14, 0x15, 0x4a, 0x14, 0xfd, 0xd8, 0x17, 0x83, 0x76, 0x61, 0xcc, 0x76, 0x8d, 0x45, - 0x67, 0xc3, 0x21, 0x76, 0x65, 0x9c, 0xcb, 0xec, 0x37, 0x39, 0x63, 0x9f, 0x3f, 0x29, 0x35, 0xf0, - 0x60, 0x40, 0x81, 0x43, 0x61, 0xe8, 0x23, 0x09, 0x90, 0xe3, 0x5a, 0x96, 0x46, 0x74, 0x62, 0x50, - 0x45, 0xe3, 0xa7, 0x61, 0x4e, 0xe5, 0x18, 0xd7, 0xa1, 0xd1, 0xaf, 0xdd, 0x29, 0xa0, 0xa4, 0x32, - 0xc1, 0x51, 0x73, 0x9a, 0x14, 0x67, 0xe8, 0xc1, 0x86, 0x62, 0xcb, 0xe1, 0xbf, 0x2b, 0x13, 0x03, - 0x0d, 0x45, 0xf6, 0xa9, 0x60, 0x38, 0x14, 0xa2, 0x1f, 0xfb, 0x62, 0xd0, 0x55, 0x98, 0xb5, 0x89, - 0xd2, 0xb9, 0x62, 0x68, 0x3d, 0x6c, 0x9a, 0xf4, 0xa2, 0xaa, 0x11, 0xa7, 0xe7, 0x50, 0xa2, 0x57, - 0x26, 0x79, 0xd8, 0x04, 0x4f, 0x2e, 0x70, 0x26, 0x15, 0xce, 0xe1, 0xe6, 0x2f, 0x01, 0xc4, 0x19, - 0xec, 0x70, 0xde, 0xd2, 0x1d, 0xee, 0x25, 0x40, 0xa8, 0xea, 0x7d, 0x7b, 0x09, 0x10, 0x11, 0x71, - 0xf0, 0x11, 0xd2, 0x57, 0x23, 0x30, 0x13, 0x12, 0xdf, 0xf5, 0x4b, 0x80, 0x0c, 0x96, 0x21, 0xbc, - 0x04, 0xc8, 0xbe, 0x4a, 0x2f, 0xdc, 0xef, 0xab, 0xf4, 0xfb, 0xf0, 0x02, 0x81, 0xdf, 0xce, 0x87, - 0x4e, 0xfc, 0xf7, 0xbf, 0x9d, 0x0f, 0x75, 0xcd, 0x29, 0x67, 0x7e, 0x33, 0x12, 0x35, 0xe8, 0x3f, - 0xe8, 0x0a, 0xf8, 0xf0, 0x2f, 0x0d, 0xe5, 0xcf, 0x0b, 0x70, 0x3c, 0x39, 0x63, 0x63, 0x37, 0x81, - 0xd2, 0x1d, 0x6f, 0x02, 0x1b, 0x70, 0x62, 0xcb, 0xd5, 0xb4, 0x1e, 0x77, 0x48, 0xe4, 0x3a, 0xd0, - 0x3b, 0xb5, 0x7f, 0x58, 0x70, 0x9e, 0xb8, 0x98, 0x41, 0x83, 0x33, 0x39, 0x73, 0x6e, 0x35, 0x0b, - 0x03, 0xdd, 0x6a, 0xa6, 0x2e, 0xd5, 0x8a, 0x77, 0x7f, 0xa9, 0x96, 0x7d, 0x43, 0x59, 0x1a, 0xe0, - 0x86, 0xf2, 0x5e, 0x5c, 0x29, 0x66, 0x24, 0xbe, 0x3b, 0x5d, 0x29, 0xca, 0x0f, 0xc3, 0x9c, 0x60, - 0x63, 0xdf, 0x4b, 0xa6, 0x41, 0x6d, 0x53, 0xd3, 0x88, 0xbd, 0xec, 0xea, 0x7a, 0x4f, 0x3e, 0x0f, - 0x93, 0xf1, 0x7b, 0x6d, 0x6f, 0xe4, 0xbd, 0xab, 0x76, 0x71, 0x97, 0x12, 0x19, 0x79, 0xaf, 0x1d, - 0x07, 0x14, 0xf2, 0x07, 0x12, 0xcc, 0x66, 0xbf, 0xa1, 0x43, 0x1a, 0x4c, 0xea, 0xca, 0x6e, 0xf4, - 0x11, 0xa1, 0x34, 0xe0, 0x8e, 0x1b, 0xed, 0xef, 0x55, 0x27, 0xd7, 0x62, 0x58, 0x38, 0x81, 0x2d, - 0x7f, 0x21, 0xc1, 0xc9, 0x9c, 0x6b, 0xc6, 0xe1, 0x6a, 0x82, 0xae, 0x41, 0x59, 0x57, 0x76, 0x9b, - 0xae, 0xdd, 0x25, 0x03, 0x9f, 0x31, 0xf0, 0x5c, 0xb2, 0x26, 0x50, 0x70, 0x80, 0x27, 0x7f, 0x22, - 0x41, 0x25, 0xaf, 0x1e, 0x44, 0x67, 0x63, 0x17, 0xa2, 0x8f, 0x26, 0x2e, 0x44, 0xa7, 0x53, 0x7c, - 0x43, 0xba, 0x0e, 0xfd, 0x54, 0x82, 0xd9, 0xec, 0xba, 0x19, 0x3d, 0x13, 0xd3, 0xb8, 0x9a, 0xd0, - 0x78, 0x2a, 0xc1, 0x25, 0xf4, 0xdd, 0x86, 0x49, 0x51, 0x5d, 0x0b, 0x18, 0xe1, 0xe5, 0x27, 0x0f, - 0xce, 0xaa, 0x02, 0xcc, 0xaf, 0x13, 0xf9, 0x48, 0xc6, 0xdb, 0x70, 0x02, 0x57, 0xfe, 0xd9, 0x08, - 0x94, 0x9a, 0x6d, 0x45, 0x23, 0x43, 0x28, 0xea, 0xae, 0xc5, 0x8a, 0xba, 0x7e, 0xdf, 0xf9, 0x73, - 0x2d, 0x73, 0xeb, 0xb9, 0xcd, 0x44, 0x3d, 0x77, 0x6e, 0x20, 0xf4, 0x83, 0x4b, 0xb9, 0xe7, 0x61, - 0x2c, 0x50, 0xa2, 0xbf, 0xd5, 0x43, 0xfe, 0x78, 0x04, 0xc6, 0x23, 0x22, 0xfa, 0x5c, 0x7b, 0x76, - 0x62, 0xab, 0xf7, 0x20, 0x7f, 0x29, 0x8a, 0xc8, 0xae, 0xf9, 0xeb, 0xb7, 0xf7, 0x86, 0x2e, 0x7c, - 0x0b, 0x95, 0x5e, 0xd6, 0xcf, 0xc3, 0x24, 0xe5, 0xff, 0xb0, 0x09, 0xce, 0xf8, 0x0a, 0x3c, 0x8a, - 0x83, 0x97, 0x99, 0xad, 0x58, 0x2f, 0x4e, 0x50, 0xcf, 0xbd, 0x00, 0x13, 0x31, 0x61, 0x7d, 0x3d, - 0x79, 0xfb, 0xad, 0x04, 0x8f, 0xde, 0x71, 0x4f, 0x86, 0xea, 0xb1, 0xe9, 0x55, 0x4b, 0x4c, 0xaf, - 0xf9, 0x7c, 0x80, 0x21, 0x3e, 0x96, 0xf8, 0xd1, 0x08, 0xa0, 0xd6, 0xb6, 0x6a, 0x77, 0x1a, 0x8a, - 0x4d, 0x7b, 0x58, 0xfc, 0x8f, 0x6a, 0x08, 0x13, 0xee, 0x2c, 0x8c, 0x77, 0x88, 0xd3, 0xb6, 0x55, - 0xee, 0x2c, 0xb1, 0x57, 0x08, 0xce, 0x41, 0x96, 0xc3, 0x2e, 0x1c, 0xa5, 0x43, 0x5d, 0x28, 0xef, - 0x78, 0xff, 0xd4, 0xf3, 0x6f, 0xde, 0xfa, 0x2d, 0x66, 0xc3, 0xff, 0xfa, 0x85, 0xf1, 0x25, 0x1a, - 0x1c, 0x1c, 0x80, 0xcb, 0x1f, 0x4a, 0x30, 0x9b, 0x76, 0xcc, 0x32, 0x53, 0xfd, 0xfe, 0x3b, 0xe7, - 0x61, 0x28, 0x72, 0x74, 0xe6, 0x95, 0x63, 0xde, 0x89, 0x37, 0x93, 0x8c, 0x79, 0xab, 0xfc, 0xa5, - 0x04, 0x73, 0xd9, 0xaa, 0x0d, 0x61, 0x2b, 0x71, 0x3d, 0xbe, 0x95, 0xe8, 0xf7, 0xd8, 0x20, 0x5b, - 0xef, 0x9c, 0x6d, 0xc5, 0x5e, 0xe6, 0x18, 0x0c, 0xc1, 0xc8, 0xad, 0xb8, 0x91, 0x8b, 0x87, 0x36, - 0x32, 0xdb, 0xc0, 0xfa, 0x13, 0x37, 0x6f, 0xcd, 0x1f, 0xf9, 0xec, 0xd6, 0xfc, 0x91, 0x3f, 0xdf, - 0x9a, 0x3f, 0xf2, 0xfe, 0xfe, 0xbc, 0x74, 0x73, 0x7f, 0x5e, 0xfa, 0x6c, 0x7f, 0x5e, 0xfa, 0xdb, - 0xfe, 0xbc, 0xf4, 0x83, 0x2f, 0xe6, 0x8f, 0x5c, 0x1b, 0x15, 0x98, 0xff, 0x0a, 0x00, 0x00, 0xff, - 0xff, 0x56, 0x18, 0xbd, 0xf5, 0xb1, 0x3c, 0x00, 0x00, + 0xd3, 0x93, 0xb9, 0x83, 0x9b, 0x45, 0xfd, 0xfc, 0x01, 0xa1, 0x60, 0x99, 0x9a, 0xda, 0xee, 0xe5, + 0x85, 0x81, 0x5c, 0x03, 0x58, 0x6c, 0xac, 0x5c, 0x25, 0x36, 0x1b, 0x6e, 0x74, 0x0a, 0x8a, 0x86, + 0xa2, 0x93, 0x8a, 0x74, 0x4a, 0x3a, 0x3d, 0x56, 0x3f, 0x76, 0x73, 0xaf, 0x7a, 0x64, 0x7f, 0xaf, + 0x5a, 0x5c, 0x57, 0x74, 0x82, 0x79, 0x8f, 0xfc, 0x63, 0x09, 0x1e, 0x5c, 0x72, 0x1d, 0x6a, 0xea, + 0x6b, 0x84, 0xda, 0x6a, 0x7b, 0xc9, 0xb5, 0x6d, 0x62, 0xd0, 0x26, 0x55, 0xa8, 0xeb, 0xdc, 0x99, + 0x1f, 0x5d, 0x83, 0xd2, 0x8e, 0xa2, 0xb9, 0xa4, 0x32, 0x72, 0x4a, 0x3a, 0x3d, 0x7e, 0xa6, 0x56, + 0x13, 0x61, 0x18, 0xf5, 0xa9, 0x1f, 0x88, 0x35, 0x3f, 0x50, 0x6a, 0xaf, 0xba, 0x8a, 0x41, 0x55, + 0xda, 0xab, 0x9f, 0x10, 0x90, 0xc7, 0x84, 0xdc, 0xab, 0x0c, 0x0b, 0x7b, 0x90, 0xf2, 0xf7, 0x25, + 0x78, 0x24, 0x57, 0xb7, 0x55, 0xd5, 0xa1, 0x48, 0x87, 0x92, 0x4a, 0x89, 0xee, 0x54, 0xa4, 0x53, + 0x85, 0xd3, 0xe3, 0x67, 0x2e, 0xd7, 0xfa, 0x9a, 0x04, 0xb5, 0x5c, 0xf0, 0xfa, 0x84, 0xd0, 0xab, + 0xb4, 0xc2, 0xe0, 0xb1, 0x27, 0x45, 0xfe, 0xa1, 0x04, 0x28, 0xca, 0xd3, 0x52, 0xec, 0x2e, 0xa1, + 0x77, 0xe1, 0xa5, 0xd7, 0x0e, 0xe7, 0xa5, 0x19, 0x01, 0x39, 0xee, 0x09, 0x8c, 0x39, 0xe9, 0x7d, + 0x09, 0x66, 0xd3, 0x3a, 0x71, 0xef, 0x6c, 0xc5, 0xbd, 0xb3, 0x78, 0x08, 0xef, 0x78, 0xa8, 0x39, + 0x6e, 0xf9, 0xe5, 0x08, 0x8c, 0x2d, 0x2b, 0x44, 0x37, 0x8d, 0x26, 0xa1, 0xe8, 0x9b, 0x50, 0x66, + 0x33, 0xbb, 0xa3, 0x50, 0x85, 0x7b, 0x64, 0xfc, 0xcc, 0xff, 0x1d, 0x64, 0xae, 0x53, 0x63, 0xd4, + 0xb5, 0x9d, 0xa7, 0x6b, 0x57, 0x36, 0xaf, 0x93, 0x36, 0x5d, 0x23, 0x54, 0xa9, 0x23, 0x21, 0x07, + 0xc2, 0x36, 0x1c, 0xa0, 0xa2, 0xb7, 0xa0, 0xe8, 0x58, 0xa4, 0x2d, 0x9c, 0xf9, 0x62, 0x9f, 0x66, + 0x05, 0x9a, 0x36, 0x2d, 0xd2, 0x0e, 0x47, 0x8b, 0x7d, 0x61, 0x8e, 0x8b, 0xb6, 0xe0, 0xa8, 0xc3, + 0xc3, 0xa0, 0x52, 0xe0, 0x12, 0xce, 0x0f, 0x2c, 0xc1, 0x0b, 0xa6, 0x49, 0x21, 0xe3, 0xa8, 0xf7, + 0x8d, 0x05, 0xba, 0xfc, 0x3b, 0x09, 0x26, 0x02, 0x5a, 0x3e, 0x62, 0x6f, 0xa4, 0x7c, 0x57, 0xbb, + 0x3b, 0xdf, 0x31, 0x6e, 0xee, 0xb9, 0xe3, 0x42, 0x56, 0xd9, 0x6f, 0x89, 0xf8, 0xed, 0x4d, 0x3f, + 0x1e, 0x46, 0x78, 0x3c, 0x3c, 0x37, 0xa8, 0x59, 0x39, 0x61, 0xf0, 0x45, 0x21, 0x62, 0x0e, 0x73, + 0x27, 0x7a, 0x13, 0xca, 0x0e, 0xd1, 0x48, 0x9b, 0x9a, 0xb6, 0x30, 0xe7, 0x99, 0xbb, 0x34, 0x47, + 0xd9, 0x24, 0x5a, 0x53, 0xb0, 0xd6, 0x8f, 0x31, 0x7b, 0xfc, 0x2f, 0x1c, 0x40, 0xa2, 0xd7, 0xa1, + 0x4c, 0x89, 0x6e, 0x69, 0x0a, 0xf5, 0x27, 0xd6, 0x53, 0xf9, 0x26, 0x31, 0xd8, 0x86, 0xd9, 0x69, + 0x09, 0x06, 0x3e, 0xf8, 0x81, 0xb3, 0xfc, 0x56, 0x1c, 0x00, 0xa2, 0x0f, 0x24, 0x98, 0x74, 0xad, + 0x0e, 0x23, 0xa5, 0x2c, 0xc1, 0x76, 0x7b, 0x22, 0x1a, 0x2e, 0x0e, 0xea, 0xb6, 0x8d, 0x18, 0x5a, + 0x7d, 0x56, 0x08, 0x9f, 0x8c, 0xb7, 0xe3, 0x84, 0x54, 0xb4, 0x08, 0x53, 0xba, 0x6a, 0x60, 0xa2, + 0x74, 0x7a, 0x4d, 0xd2, 0x36, 0x8d, 0x8e, 0x53, 0x29, 0x9e, 0x92, 0x4e, 0x97, 0xea, 0x27, 0x05, + 0xc0, 0xd4, 0x5a, 0xbc, 0x1b, 0x27, 0xe9, 0xd1, 0xd7, 0x01, 0xf9, 0x76, 0x5d, 0xf2, 0xd6, 0x0b, + 0xd5, 0x34, 0x2a, 0xa5, 0x53, 0xd2, 0xe9, 0x42, 0x7d, 0x4e, 0xa0, 0xa0, 0x56, 0x8a, 0x02, 0x67, + 0x70, 0xc9, 0xff, 0x2c, 0xc2, 0x54, 0x22, 0xc0, 0xd1, 0x55, 0x98, 0x6d, 0x7b, 0xe9, 0x73, 0xdd, + 0xd5, 0x37, 0x89, 0xdd, 0x6c, 0x6f, 0x93, 0x8e, 0xab, 0x91, 0x0e, 0x1f, 0xf5, 0x52, 0x7d, 0x5e, + 0xc8, 0x98, 0x5d, 0xca, 0xa4, 0xc2, 0x39, 0xdc, 0x4c, 0x6f, 0x83, 0x37, 0xad, 0xa9, 0x8e, 0x13, + 0x60, 0x8e, 0x70, 0xcc, 0x40, 0xef, 0xf5, 0x14, 0x05, 0xce, 0xe0, 0x62, 0x3a, 0x76, 0x88, 0xa3, + 0xda, 0xa4, 0x93, 0xd4, 0xb1, 0x10, 0xd7, 0x71, 0x39, 0x93, 0x0a, 0xe7, 0x70, 0xa3, 0xb3, 0x30, + 0xee, 0x49, 0xe3, 0x1e, 0x17, 0x43, 0x13, 0x24, 0xec, 0xf5, 0xb0, 0x0b, 0x47, 0xe9, 0x98, 0x69, + 0xe6, 0x26, 0x2f, 0x20, 0x3a, 0xf9, 0x43, 0x72, 0x25, 0x45, 0x81, 0x33, 0xb8, 0x98, 0x69, 0x5e, + 0xcc, 0xa4, 0x4c, 0x3b, 0x1a, 0x37, 0x6d, 0x23, 0x93, 0x0a, 0xe7, 0x70, 0xb3, 0xc8, 0xf3, 0x54, + 0x5e, 0xdc, 0x51, 0x54, 0x4d, 0xd9, 0xd4, 0x48, 0x65, 0x34, 0x1e, 0x79, 0xeb, 0xf1, 0x6e, 0x9c, + 0xa4, 0x47, 0x97, 0x60, 0xda, 0x6b, 0xda, 0x30, 0x94, 0x00, 0xa4, 0xcc, 0x41, 0x1e, 0x14, 0x20, + 0xd3, 0xeb, 0x49, 0x02, 0x9c, 0xe6, 0x91, 0xff, 0x22, 0xc1, 0xc9, 0x9c, 0x99, 0x84, 0x5e, 0x86, + 0x22, 0xed, 0x59, 0xfe, 0xfa, 0xfb, 0xbf, 0x7e, 0x46, 0x6f, 0xf5, 0x2c, 0x72, 0x7b, 0xaf, 0xfa, + 0x50, 0x0e, 0x1b, 0xeb, 0xc6, 0x9c, 0x11, 0x7d, 0x1b, 0x26, 0x6c, 0x53, 0xd3, 0x54, 0xa3, 0xeb, + 0x91, 0x88, 0x6c, 0x72, 0xa1, 0xcf, 0x99, 0x8e, 0xa3, 0x18, 0x61, 0xb6, 0x9c, 0xde, 0xdf, 0xab, + 0x4e, 0xc4, 0xfa, 0x70, 0x5c, 0x9c, 0xfc, 0xeb, 0x11, 0x80, 0x65, 0x62, 0x69, 0x66, 0x4f, 0x27, + 0xc6, 0x30, 0x56, 0xd0, 0xb7, 0x63, 0x2b, 0xe8, 0x4b, 0xfd, 0x66, 0xb4, 0x40, 0xd5, 0xdc, 0x25, + 0xb4, 0x9b, 0x58, 0x42, 0x5f, 0x1e, 0x5c, 0xc4, 0xc1, 0x6b, 0xe8, 0xad, 0x02, 0xcc, 0x84, 0xc4, + 0x4b, 0xa6, 0xd1, 0x51, 0xf9, 0x9c, 0x78, 0x21, 0x16, 0x13, 0x8f, 0x27, 0x62, 0xe2, 0x64, 0x06, + 0x4b, 0x24, 0x1e, 0xae, 0x06, 0xda, 0x8f, 0x70, 0xf6, 0xf3, 0x71, 0xe1, 0xb7, 0xf7, 0xaa, 0x07, + 0xd6, 0xf3, 0xb5, 0x00, 0x33, 0xae, 0x2c, 0x7a, 0x0c, 0x8e, 0xda, 0x44, 0x71, 0x4c, 0x83, 0xa7, + 0x89, 0xb1, 0xd0, 0x28, 0xcc, 0x5b, 0xb1, 0xe8, 0x45, 0x4f, 0xc0, 0xa8, 0x4e, 0x1c, 0x47, 0xe9, + 0x12, 0x9e, 0x11, 0xc6, 0xea, 0x53, 0x82, 0x70, 0x74, 0xcd, 0x6b, 0xc6, 0x7e, 0x3f, 0xba, 0x0e, + 0x93, 0x9a, 0xe2, 0x88, 0xd0, 0x6e, 0xa9, 0x3a, 0xe1, 0x73, 0x7e, 0xfc, 0xcc, 0xff, 0xdc, 0x5d, + 0xc4, 0x30, 0x8e, 0x70, 0x25, 0x5a, 0x8d, 0x21, 0xe1, 0x04, 0x32, 0xda, 0x01, 0xc4, 0x5a, 0x5a, + 0xb6, 0x62, 0x38, 0x9e, 0xcb, 0x98, 0xbc, 0xd1, 0xbe, 0xe5, 0x05, 0xf9, 0x6d, 0x35, 0x85, 0x86, + 0x33, 0x24, 0xc8, 0xbf, 0x97, 0x60, 0x32, 0x1c, 0xb0, 0x21, 0x14, 0x4a, 0x6f, 0xc5, 0x0b, 0xa5, + 0xe7, 0x07, 0x0e, 0xde, 0x9c, 0x4a, 0xe9, 0xc3, 0x02, 0xa0, 0x90, 0x88, 0xa5, 0x86, 0x4d, 0xa5, + 0x7d, 0xe3, 0x2e, 0xf6, 0x11, 0x3f, 0x95, 0x00, 0x89, 0x64, 0xbd, 0x68, 0x18, 0x26, 0xe5, 0xf9, + 0xdf, 0x57, 0xf3, 0xb5, 0x81, 0xd5, 0xf4, 0x35, 0xa8, 0x6d, 0xa4, 0xb0, 0x2f, 0x18, 0xd4, 0xee, + 0x85, 0x23, 0x96, 0x26, 0xc0, 0x19, 0x0a, 0xa1, 0x77, 0x00, 0x6c, 0x81, 0xd9, 0x32, 0x45, 0x0a, + 0x78, 0x69, 0x80, 0x6c, 0xca, 0x00, 0x96, 0x4c, 0x63, 0x4b, 0xed, 0x86, 0x09, 0x0d, 0x07, 0xc0, + 0x38, 0x22, 0x64, 0xee, 0x02, 0x9c, 0xcc, 0xd1, 0x1e, 0x1d, 0x87, 0xc2, 0x0d, 0xd2, 0xf3, 0xdc, + 0x8a, 0xd9, 0x4f, 0x74, 0x22, 0xba, 0x1f, 0x1b, 0x13, 0x5b, 0xa9, 0x73, 0x23, 0xcf, 0x49, 0xf2, + 0x97, 0xa5, 0x68, 0xac, 0xf1, 0x2a, 0xf6, 0x34, 0x94, 0x6d, 0x62, 0x69, 0x6a, 0x5b, 0x71, 0x44, + 0x3d, 0xc3, 0x0b, 0x52, 0x2c, 0xda, 0x70, 0xd0, 0x1b, 0xab, 0x77, 0x47, 0xee, 0x6f, 0xbd, 0x5b, + 0xb8, 0xd7, 0xf5, 0xae, 0x09, 0x65, 0xc7, 0x2f, 0x74, 0x8b, 0x1c, 0x7c, 0xf1, 0x10, 0x39, 0x5b, + 0xd4, 0xb8, 0x81, 0xc0, 0xa0, 0xba, 0x0d, 0x84, 0x64, 0xd5, 0xb5, 0xa5, 0x3e, 0xeb, 0xda, 0x55, + 0x38, 0x61, 0x93, 0x1d, 0x95, 0xa9, 0x71, 0x59, 0x75, 0xa8, 0x69, 0xf7, 0x56, 0x55, 0x5d, 0xa5, + 0xa2, 0xec, 0xa9, 0xec, 0xef, 0x55, 0x4f, 0xe0, 0x8c, 0x7e, 0x9c, 0xc9, 0xc5, 0xb2, 0xb3, 0xa5, + 0xb8, 0x0e, 0xe9, 0xf0, 0x94, 0x56, 0x0e, 0xb3, 0x73, 0x83, 0xb7, 0x62, 0xd1, 0x8b, 0xf4, 0x58, + 0x70, 0x97, 0xef, 0x45, 0x70, 0x4f, 0xe6, 0x07, 0x36, 0xda, 0x80, 0x93, 0x96, 0x6d, 0x76, 0x6d, + 0xe2, 0x38, 0xcb, 0x44, 0xe9, 0x68, 0xaa, 0x41, 0x7c, 0x7f, 0x8d, 0x71, 0x3b, 0x1f, 0xda, 0xdf, + 0xab, 0x9e, 0x6c, 0x64, 0x93, 0xe0, 0x3c, 0x5e, 0xf9, 0xa3, 0x22, 0x1c, 0x4f, 0xae, 0xb2, 0x39, + 0x55, 0xa9, 0x34, 0x50, 0x55, 0xfa, 0x64, 0x64, 0xda, 0x78, 0x25, 0x7b, 0x10, 0x0d, 0x19, 0x53, + 0x67, 0x11, 0xa6, 0x44, 0x1e, 0xf1, 0x3b, 0x45, 0x5d, 0x1e, 0x44, 0xc3, 0x46, 0xbc, 0x1b, 0x27, + 0xe9, 0x59, 0xad, 0x19, 0x96, 0x90, 0x3e, 0x48, 0x31, 0x5e, 0x6b, 0x2e, 0x26, 0x09, 0x70, 0x9a, + 0x07, 0xad, 0xc1, 0x8c, 0x6b, 0xa4, 0xa1, 0xbc, 0xe8, 0x7c, 0x48, 0x40, 0xcd, 0x6c, 0xa4, 0x49, + 0x70, 0x16, 0x1f, 0xda, 0x01, 0x68, 0xfb, 0x05, 0x81, 0x53, 0x39, 0xca, 0x73, 0x75, 0x7d, 0xe0, + 0xb9, 0x15, 0xd4, 0x16, 0x61, 0x46, 0x0c, 0x9a, 0x1c, 0x1c, 0x91, 0x84, 0x5e, 0x80, 0x09, 0x9b, + 0x6f, 0x3c, 0x7c, 0x03, 0xbc, 0xe2, 0xfd, 0x01, 0xc1, 0x36, 0x81, 0xa3, 0x9d, 0x38, 0x4e, 0x2b, + 0xff, 0x41, 0x8a, 0x2e, 0x51, 0x41, 0xa9, 0x7d, 0x2e, 0x56, 0x56, 0x3d, 0x96, 0x28, 0xab, 0x66, + 0xd3, 0x1c, 0x91, 0xaa, 0xea, 0x3b, 0xd9, 0x55, 0xf6, 0xc5, 0x43, 0x55, 0xd9, 0xe1, 0x52, 0x7b, + 0xe7, 0x32, 0xfb, 0x13, 0x09, 0x66, 0x2f, 0x36, 0x2f, 0xd9, 0xa6, 0x6b, 0xf9, 0xea, 0x5d, 0xb1, + 0x3c, 0x5f, 0x7d, 0x0d, 0x8a, 0xb6, 0xab, 0xf9, 0x76, 0xfd, 0x97, 0x6f, 0x17, 0x76, 0x35, 0x66, + 0xd7, 0x4c, 0x82, 0xcb, 0x33, 0x8a, 0x31, 0xa0, 0xb7, 0xe0, 0xa8, 0xad, 0x18, 0x5d, 0xe2, 0x2f, + 0xc2, 0xcf, 0xf6, 0x69, 0xcd, 0xca, 0x32, 0x66, 0xec, 0x91, 0x52, 0x90, 0xa3, 0x61, 0x81, 0x2a, + 0xff, 0x44, 0x82, 0xa9, 0xcb, 0xad, 0x56, 0x63, 0xc5, 0xe0, 0xb3, 0xb8, 0xa1, 0xd0, 0x6d, 0x56, + 0x27, 0x58, 0x0a, 0xdd, 0x4e, 0xd6, 0x09, 0xac, 0x0f, 0xf3, 0x1e, 0xb4, 0x0d, 0xa3, 0x2c, 0x7b, + 0x10, 0xa3, 0x33, 0x60, 0x89, 0x2f, 0xc4, 0xd5, 0x3d, 0x90, 0xb0, 0xfe, 0x14, 0x0d, 0xd8, 0x87, + 0x97, 0xdf, 0x83, 0x13, 0x11, 0xf5, 0x98, 0xbf, 0xf8, 0xe9, 0x24, 0x6a, 0x43, 0x89, 0x69, 0xe2, + 0x9f, 0x3d, 0xf6, 0x7b, 0x84, 0x96, 0x30, 0x39, 0xac, 0xa3, 0xd8, 0x97, 0x83, 0x3d, 0x6c, 0x79, + 0x0d, 0x26, 0x2e, 0x9b, 0x0e, 0x6d, 0x98, 0x36, 0xe5, 0x6e, 0x43, 0x8f, 0x40, 0x41, 0x57, 0x0d, + 0xb1, 0x4a, 0x8f, 0x0b, 0x9e, 0x02, 0x5b, 0x47, 0x58, 0x3b, 0xef, 0x56, 0x76, 0x45, 0x36, 0x0a, + 0xbb, 0x95, 0x5d, 0xcc, 0xda, 0xe5, 0x4b, 0x30, 0x2a, 0x86, 0x23, 0x0a, 0x54, 0x38, 0x18, 0xa8, + 0x90, 0x01, 0xf4, 0x8b, 0x11, 0x18, 0x15, 0xda, 0x0f, 0x61, 0x33, 0xf7, 0x46, 0x6c, 0x33, 0x77, + 0x6e, 0xb0, 0x91, 0xce, 0xdd, 0xc9, 0x75, 0x12, 0x3b, 0xb9, 0x17, 0x07, 0xc4, 0x3f, 0x78, 0x1b, + 0xf7, 0xb1, 0x04, 0x93, 0xf1, 0x98, 0x43, 0x67, 0x61, 0x9c, 0xad, 0x29, 0x6a, 0x9b, 0xac, 0x87, + 0x45, 0x71, 0x70, 0xb0, 0xd2, 0x0c, 0xbb, 0x70, 0x94, 0x0e, 0x75, 0x03, 0x36, 0x16, 0x16, 0xc2, + 0x29, 0xf9, 0x2e, 0x77, 0xa9, 0xaa, 0xd5, 0xbc, 0xab, 0x9e, 0xda, 0x8a, 0x41, 0xaf, 0xd8, 0x4d, + 0x6a, 0xab, 0x46, 0x37, 0x25, 0x88, 0xc7, 0x58, 0x14, 0x59, 0xbe, 0x29, 0xc1, 0xb8, 0x50, 0x79, + 0x08, 0x5b, 0x92, 0xd7, 0xe3, 0x5b, 0x92, 0x67, 0x07, 0x9c, 0xcf, 0xd9, 0xfb, 0x91, 0x4f, 0x43, + 0x53, 0xd8, 0x0c, 0x66, 0x09, 0x66, 0xdb, 0x74, 0x68, 0x32, 0xc1, 0xb0, 0xb9, 0x86, 0x79, 0x0f, + 0xfa, 0x9e, 0x04, 0xc7, 0xd5, 0xc4, 0x9c, 0x17, 0xbe, 0x7e, 0x79, 0x30, 0xd5, 0x02, 0x98, 0x7a, + 0x45, 0xc8, 0x3b, 0x9e, 0xec, 0xc1, 0x29, 0x91, 0xb2, 0x0b, 0x29, 0x2a, 0xa4, 0x40, 0x71, 0x9b, + 0x52, 0x4b, 0x0c, 0xc2, 0xd2, 0xe0, 0x99, 0x27, 0x54, 0xa9, 0xcc, 0xcd, 0x6f, 0xb5, 0x1a, 0x98, + 0x43, 0xcb, 0x3f, 0x1f, 0x09, 0x1c, 0xd6, 0xf4, 0x26, 0x49, 0x90, 0x6f, 0xa5, 0x7b, 0x91, 0x6f, + 0xc7, 0xb3, 0x72, 0x2d, 0xfa, 0x06, 0x14, 0xa8, 0x36, 0xe8, 0xa6, 0x54, 0x48, 0x68, 0xad, 0x36, + 0xc3, 0x84, 0xd5, 0x5a, 0x6d, 0x62, 0x06, 0x89, 0xde, 0x86, 0x12, 0x5b, 0xcd, 0xd8, 0x1c, 0x2f, + 0x0c, 0x9e, 0x43, 0x98, 0xbf, 0xc2, 0x08, 0x63, 0x5f, 0x0e, 0xf6, 0x70, 0xe5, 0xf7, 0x60, 0x22, + 0x96, 0x08, 0xd0, 0x75, 0x38, 0xa6, 0x99, 0x4a, 0xa7, 0xae, 0x68, 0x8a, 0xd1, 0x26, 0x76, 0x32, + 0x35, 0x66, 0xef, 0x67, 0x56, 0x23, 0x1c, 0x22, 0xa1, 0x04, 0x17, 0x88, 0xd1, 0x3e, 0x1c, 0xc3, + 0x96, 0x15, 0x80, 0xd0, 0x7a, 0x54, 0x85, 0x12, 0x0b, 0x61, 0x6f, 0x65, 0x1a, 0xab, 0x8f, 0x31, + 0x5d, 0x59, 0x64, 0x3b, 0xd8, 0x6b, 0x47, 0x67, 0x00, 0x1c, 0xd2, 0xb6, 0x09, 0xe5, 0x79, 0xc7, + 0x3b, 0x01, 0x0a, 0x32, 0x70, 0x33, 0xe8, 0xc1, 0x11, 0x2a, 0xf9, 0x4f, 0x12, 0x4c, 0xac, 0x13, + 0xfa, 0xae, 0x69, 0xdf, 0x68, 0xf0, 0x0b, 0xda, 0x21, 0xe4, 0xfd, 0xcd, 0x58, 0xde, 0x7f, 0xa5, + 0xcf, 0x31, 0x8b, 0x69, 0x9b, 0x97, 0xfd, 0xe5, 0xbf, 0x4b, 0x50, 0x89, 0x51, 0x46, 0xd3, 0x04, + 0x81, 0x92, 0x65, 0xda, 0xd4, 0x5f, 0xe3, 0x0f, 0xa5, 0x01, 0x4b, 0xa9, 0x91, 0x55, 0x9e, 0xc1, + 0x62, 0x0f, 0x9d, 0xd9, 0xb9, 0x65, 0x9b, 0xba, 0x88, 0xfb, 0xc3, 0x49, 0x21, 0xc4, 0x0e, 0xed, + 0xbc, 0x68, 0x9b, 0x3a, 0xe6, 0xd8, 0xf2, 0x1f, 0x25, 0x98, 0x8e, 0x51, 0x0e, 0x21, 0xa5, 0x2b, + 0xf1, 0x94, 0xfe, 0xe2, 0x61, 0x0c, 0xcb, 0x49, 0xec, 0x5f, 0x25, 0xcd, 0x62, 0x0e, 0x40, 0x5b, + 0x30, 0x6e, 0x99, 0x9d, 0xe6, 0x3d, 0xb8, 0x99, 0x9b, 0x62, 0x2b, 0x64, 0x23, 0xc4, 0xc2, 0x51, + 0x60, 0xb4, 0x0b, 0xd3, 0x86, 0xa2, 0x13, 0xc7, 0x52, 0xda, 0xa4, 0x79, 0x0f, 0xce, 0x45, 0x1e, + 0xe0, 0xb7, 0x05, 0x49, 0x44, 0x9c, 0x16, 0x22, 0xff, 0x2a, 0x65, 0xb7, 0x69, 0x53, 0xf4, 0x2a, + 0x94, 0xf9, 0x23, 0x89, 0xb6, 0xa9, 0x89, 0xa5, 0xed, 0x2c, 0x1b, 0x9a, 0x86, 0x68, 0xbb, 0xbd, + 0x57, 0xfd, 0xef, 0x03, 0x8f, 0x75, 0x7d, 0x42, 0x1c, 0xc0, 0xa0, 0x75, 0x28, 0x5a, 0x87, 0x29, + 0x33, 0xf8, 0xc2, 0xc2, 0x6b, 0x0b, 0x8e, 0x23, 0xff, 0x23, 0xa9, 0x38, 0x5f, 0x5e, 0xae, 0xdf, + 0xb3, 0x01, 0x0b, 0xca, 0x9a, 0xdc, 0x41, 0xb3, 0x61, 0x54, 0xac, 0xb2, 0x22, 0x2e, 0x2f, 0x1d, + 0x26, 0x2e, 0xa3, 0x2b, 0x43, 0xb0, 0x89, 0xf0, 0x1b, 0x7d, 0x41, 0xf2, 0x5f, 0x25, 0x98, 0xe6, + 0x0a, 0xb5, 0x5d, 0x5b, 0xa5, 0xbd, 0xa1, 0x65, 0xd0, 0xad, 0x58, 0x06, 0x5d, 0xee, 0xd3, 0xd0, + 0x94, 0xc6, 0xb9, 0x59, 0xf4, 0x73, 0x09, 0x1e, 0x48, 0x51, 0x0f, 0x21, 0xc3, 0x90, 0x78, 0x86, + 0x79, 0xe5, 0xb0, 0x06, 0xe6, 0x64, 0x99, 0x9b, 0x90, 0x61, 0x1e, 0x0f, 0xdc, 0x33, 0x00, 0x96, + 0xad, 0xee, 0xa8, 0x1a, 0xe9, 0x8a, 0xcb, 0xe0, 0x72, 0x38, 0x24, 0x8d, 0xa0, 0x07, 0x47, 0xa8, + 0xd0, 0xb7, 0x60, 0xb6, 0x43, 0xb6, 0x14, 0x57, 0xa3, 0x8b, 0x9d, 0xce, 0x92, 0x62, 0x29, 0x9b, + 0xaa, 0xa6, 0x52, 0x55, 0xec, 0xb0, 0xc7, 0xea, 0x17, 0xbc, 0x4b, 0xda, 0x2c, 0x8a, 0xdb, 0x7b, + 0xd5, 0xc7, 0x0f, 0xbe, 0x98, 0xf1, 0x89, 0x7b, 0x38, 0x47, 0x08, 0xfa, 0xae, 0x04, 0x15, 0x9b, + 0xbc, 0xe3, 0xaa, 0x36, 0xe9, 0x2c, 0xdb, 0xa6, 0x15, 0xd3, 0xa0, 0xc0, 0x35, 0xb8, 0xb4, 0xbf, + 0x57, 0xad, 0xe0, 0x1c, 0x9a, 0x7e, 0x74, 0xc8, 0x15, 0x84, 0x28, 0xcc, 0x28, 0x9a, 0x66, 0xbe, + 0x4b, 0xe2, 0x1e, 0x28, 0x72, 0xf9, 0xf5, 0xfd, 0xbd, 0xea, 0xcc, 0x62, 0xba, 0xbb, 0x1f, 0xd1, + 0x59, 0xf0, 0x68, 0x01, 0x46, 0x77, 0x4c, 0xcd, 0xd5, 0x89, 0x53, 0x29, 0x71, 0x49, 0x2c, 0xe3, + 0x8e, 0x5e, 0xf5, 0x9a, 0x6e, 0xef, 0x55, 0x8f, 0x5e, 0x6c, 0xf2, 0xa3, 0x0f, 0x9f, 0x8a, 0xed, + 0xd1, 0x58, 0xcd, 0x24, 0xa6, 0x3c, 0x3f, 0x77, 0x2d, 0x87, 0x39, 0xe6, 0x72, 0xd8, 0x85, 0xa3, + 0x74, 0x48, 0x87, 0xb1, 0x6d, 0xb1, 0x6f, 0x77, 0x2a, 0xa3, 0x03, 0xad, 0x7e, 0xb1, 0x7d, 0x7f, + 0x7d, 0x5a, 0x88, 0x1c, 0xf3, 0x9b, 0x1d, 0x1c, 0x4a, 0x40, 0x4f, 0xc0, 0x28, 0xff, 0x58, 0x59, + 0xe6, 0xa7, 0xb5, 0xe5, 0x30, 0x13, 0x5d, 0xf6, 0x9a, 0xb1, 0xdf, 0xef, 0x93, 0xae, 0x34, 0x96, + 0xf8, 0xe1, 0x6a, 0x82, 0x74, 0xa5, 0xb1, 0x84, 0xfd, 0x7e, 0x64, 0xc1, 0xa8, 0x43, 0x56, 0x55, + 0xc3, 0xdd, 0xad, 0xc0, 0x40, 0xd7, 0xc5, 0xcd, 0x0b, 0x9c, 0x3b, 0x71, 0x14, 0x15, 0x4a, 0x14, + 0xfd, 0xd8, 0x17, 0x83, 0x76, 0x61, 0xcc, 0x76, 0x8d, 0x45, 0x67, 0xc3, 0x21, 0x76, 0x65, 0x9c, + 0xcb, 0xec, 0x37, 0x39, 0x63, 0x9f, 0x3f, 0x29, 0x35, 0xf0, 0x60, 0x40, 0x81, 0x43, 0x61, 0xe8, + 0x23, 0x09, 0x90, 0xe3, 0x5a, 0x96, 0x46, 0x74, 0x62, 0x50, 0x45, 0xe3, 0xa7, 0x61, 0x4e, 0xe5, + 0x18, 0xd7, 0xa1, 0xd1, 0xaf, 0xdd, 0x29, 0xa0, 0xa4, 0x32, 0xc1, 0x51, 0x73, 0x9a, 0x14, 0x67, + 0xe8, 0xc1, 0x86, 0x62, 0xcb, 0xe1, 0xbf, 0x2b, 0x13, 0x03, 0x0d, 0x45, 0xf6, 0xa9, 0x60, 0x38, + 0x14, 0xa2, 0x1f, 0xfb, 0x62, 0xd0, 0x55, 0x98, 0xb5, 0x89, 0xd2, 0xb9, 0x62, 0x68, 0x3d, 0x6c, + 0x9a, 0xf4, 0xa2, 0xaa, 0x11, 0xa7, 0xe7, 0x50, 0xa2, 0x57, 0x26, 0x79, 0xd8, 0x04, 0x4f, 0x2e, + 0x70, 0x26, 0x15, 0xce, 0xe1, 0xe6, 0x2f, 0x01, 0xc4, 0x19, 0xec, 0x70, 0xde, 0xd2, 0x1d, 0xee, + 0x25, 0x40, 0xa8, 0xea, 0x7d, 0x7b, 0x09, 0x10, 0x11, 0x71, 0xf0, 0x11, 0xd2, 0x57, 0x23, 0x30, + 0x13, 0x12, 0xdf, 0xf5, 0x4b, 0x80, 0x0c, 0x96, 0x21, 0xbc, 0x04, 0xc8, 0xbe, 0x4a, 0x2f, 0xdc, + 0xef, 0xab, 0xf4, 0xfb, 0xf0, 0x02, 0x81, 0xdf, 0xce, 0x87, 0x4e, 0xfc, 0xf7, 0xbf, 0x9d, 0x0f, + 0x75, 0xcd, 0x29, 0x67, 0x7e, 0x33, 0x12, 0x35, 0xe8, 0x3f, 0xe8, 0x0a, 0xf8, 0xf0, 0x2f, 0x0d, + 0xe5, 0xcf, 0x0b, 0x70, 0x3c, 0x39, 0x63, 0x63, 0x37, 0x81, 0xd2, 0x1d, 0x6f, 0x02, 0x1b, 0x70, + 0x62, 0xcb, 0xd5, 0xb4, 0x1e, 0x77, 0x48, 0xe4, 0x3a, 0xd0, 0x3b, 0xb5, 0x7f, 0x58, 0x70, 0x9e, + 0xb8, 0x98, 0x41, 0x83, 0x33, 0x39, 0x73, 0x6e, 0x35, 0x0b, 0x03, 0xdd, 0x6a, 0xa6, 0x2e, 0xd5, + 0x8a, 0x77, 0x7f, 0xa9, 0x96, 0x7d, 0x43, 0x59, 0x1a, 0xe0, 0x86, 0xf2, 0x5e, 0x5c, 0x29, 0x66, + 0x24, 0xbe, 0x3b, 0x5d, 0x29, 0xca, 0x0f, 0xc3, 0x9c, 0x60, 0x63, 0xdf, 0x4b, 0xa6, 0x41, 0x6d, + 0x53, 0xd3, 0x88, 0xbd, 0xec, 0xea, 0x7a, 0x4f, 0x3e, 0x0f, 0x93, 0xf1, 0x7b, 0x6d, 0x6f, 0xe4, + 0xbd, 0xab, 0x76, 0x71, 0x97, 0x12, 0x19, 0x79, 0xaf, 0x1d, 0x07, 0x14, 0xf2, 0x07, 0x12, 0xcc, + 0x66, 0xbf, 0xa1, 0x43, 0x1a, 0x4c, 0xea, 0xca, 0x6e, 0xf4, 0x11, 0xa1, 0x34, 0xe0, 0x8e, 0x1b, + 0xed, 0xef, 0x55, 0x27, 0xd7, 0x62, 0x58, 0x38, 0x81, 0x2d, 0x7f, 0x21, 0xc1, 0xc9, 0x9c, 0x6b, + 0xc6, 0xe1, 0x6a, 0x82, 0xae, 0x41, 0x59, 0x57, 0x76, 0x9b, 0xae, 0xdd, 0x25, 0x03, 0x9f, 0x31, + 0xf0, 0x5c, 0xb2, 0x26, 0x50, 0x70, 0x80, 0x27, 0x7f, 0x22, 0x41, 0x25, 0xaf, 0x1e, 0x44, 0x67, + 0x63, 0x17, 0xa2, 0x8f, 0x26, 0x2e, 0x44, 0xa7, 0x53, 0x7c, 0x43, 0xba, 0x0e, 0xfd, 0x54, 0x82, + 0xd9, 0xec, 0xba, 0x19, 0x3d, 0x13, 0xd3, 0xb8, 0x9a, 0xd0, 0x78, 0x2a, 0xc1, 0x25, 0xf4, 0xdd, + 0x86, 0x49, 0x51, 0x5d, 0x0b, 0x18, 0xe1, 0xe5, 0x27, 0x0f, 0xce, 0xaa, 0x02, 0xcc, 0xaf, 0x13, + 0xf9, 0x48, 0xc6, 0xdb, 0x70, 0x02, 0x57, 0xfe, 0xd9, 0x08, 0x94, 0x9a, 0x6d, 0x45, 0x23, 0x43, + 0x28, 0xea, 0xae, 0xc5, 0x8a, 0xba, 0x7e, 0xdf, 0xf9, 0x73, 0x2d, 0x73, 0xeb, 0xb9, 0xcd, 0x44, + 0x3d, 0x77, 0x6e, 0x20, 0xf4, 0x83, 0x4b, 0xb9, 0xe7, 0x61, 0x2c, 0x50, 0xa2, 0xbf, 0xd5, 0x43, + 0xfe, 0x78, 0x04, 0xc6, 0x23, 0x22, 0xfa, 0x5c, 0x7b, 0x76, 0x62, 0xab, 0xf7, 0x20, 0x7f, 0x29, + 0x8a, 0xc8, 0xae, 0xf9, 0xeb, 0xb7, 0xf7, 0x86, 0x2e, 0x7c, 0x0b, 0x95, 0x5e, 0xd6, 0xcf, 0xc3, + 0x24, 0xe5, 0xff, 0xb0, 0x09, 0xce, 0xf8, 0x0a, 0x3c, 0x8a, 0x83, 0x97, 0x99, 0xad, 0x58, 0x2f, + 0x4e, 0x50, 0xcf, 0xbd, 0x00, 0x13, 0x31, 0x61, 0x7d, 0x3d, 0x79, 0xfb, 0xad, 0x04, 0x8f, 0xde, + 0x71, 0x4f, 0x86, 0xea, 0xb1, 0xe9, 0x55, 0x4b, 0x4c, 0xaf, 0xf9, 0x7c, 0x80, 0x21, 0x3e, 0x96, + 0xf8, 0xd1, 0x08, 0xa0, 0xd6, 0xb6, 0x6a, 0x77, 0x1a, 0x8a, 0x4d, 0x7b, 0x58, 0xfc, 0x8f, 0x6a, + 0x08, 0x13, 0xee, 0x2c, 0x8c, 0x77, 0x88, 0xd3, 0xb6, 0x55, 0xee, 0x2c, 0xb1, 0x57, 0x08, 0xce, + 0x41, 0x96, 0xc3, 0x2e, 0x1c, 0xa5, 0x43, 0x5d, 0x28, 0xef, 0x78, 0xff, 0xd4, 0xf3, 0x6f, 0xde, + 0xfa, 0x2d, 0x66, 0xc3, 0xff, 0xfa, 0x85, 0xf1, 0x25, 0x1a, 0x1c, 0x1c, 0x80, 0xcb, 0x1f, 0x4a, + 0x30, 0x9b, 0x76, 0xcc, 0x32, 0x53, 0xfd, 0xfe, 0x3b, 0xe7, 0x61, 0x28, 0x72, 0x74, 0xe6, 0x95, + 0x63, 0xde, 0x89, 0x37, 0x93, 0x8c, 0x79, 0xab, 0xfc, 0xa5, 0x04, 0x73, 0xd9, 0xaa, 0x0d, 0x61, + 0x2b, 0x71, 0x3d, 0xbe, 0x95, 0xe8, 0xf7, 0xd8, 0x20, 0x5b, 0xef, 0x9c, 0x6d, 0xc5, 0x5e, 0xe6, + 0x18, 0x0c, 0xc1, 0xc8, 0xad, 0xb8, 0x91, 0x8b, 0x87, 0x36, 0x32, 0xdb, 0xc0, 0xfa, 0x13, 0x37, + 0x6f, 0xcd, 0x1f, 0xf9, 0xec, 0xd6, 0xfc, 0x91, 0x3f, 0xdf, 0x9a, 0x3f, 0xf2, 0xfe, 0xfe, 0xbc, + 0x74, 0x73, 0x7f, 0x5e, 0xfa, 0x6c, 0x7f, 0x5e, 0xfa, 0xdb, 0xfe, 0xbc, 0xf4, 0x83, 0x2f, 0xe6, + 0x8f, 0x5c, 0x1b, 0x15, 0x98, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xdb, 0xfb, 0x34, 0x4b, 0xec, + 0x3c, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto index 861904e446..a7580703f5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto @@ -28,6 +28,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/policy/v1beta1/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1beta1"; diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/types.go b/staging/src/k8s.io/client-go/pkg/apis/policy/types.go index ef2ff713ad..4d49da1747 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/types.go @@ -28,12 +28,19 @@ type PodDisruptionBudgetSpec struct { // absence of the evicted pod. So for example you can prevent all voluntary // evictions by specifying "100%". // +optional - MinAvailable intstr.IntOrString + MinAvailable *intstr.IntOrString // Label query over pods whose evictions are managed by the disruption // budget. // +optional Selector *metav1.LabelSelector + + // An eviction is allowed if at most "maxUnavailable" pods selected by + // "selector" are unavailable after the eviction, i.e. even in absence of + // the evicted pod. For example, one can prevent all voluntary evictions + // by specifying 0. This is a mutually exclusive setting with "minAvailable". + // +optional + MaxUnavailable *intstr.IntOrString } // PodDisruptionBudgetStatus represents information about the status of a diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go index 38266b2b25..a4922f455c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go @@ -39,6 +39,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 strings "strings" import reflect "reflect" import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" @@ -216,14 +218,16 @@ func (m *PodDisruptionBudgetSpec) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintGenerated(dAtA, i, uint64(m.MinAvailable.Size())) - n7, err := m.MinAvailable.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.MinAvailable != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.MinAvailable.Size())) + n7, err := m.MinAvailable.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n7 } - i += n7 if m.Selector != nil { dAtA[i] = 0x12 i++ @@ -234,6 +238,16 @@ func (m *PodDisruptionBudgetSpec) MarshalTo(dAtA []byte) (int, error) { } i += n8 } + if m.MaxUnavailable != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.MaxUnavailable.Size())) + n9, err := m.MaxUnavailable.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n9 + } return i, nil } @@ -274,11 +288,11 @@ func (m *PodDisruptionBudgetStatus) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64((&v).Size())) - n9, err := (&v).MarshalTo(dAtA[i:]) + n10, err := (&v).MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n9 + i += n10 } } dAtA[i] = 0x18 @@ -364,12 +378,18 @@ func (m *PodDisruptionBudgetList) Size() (n int) { func (m *PodDisruptionBudgetSpec) Size() (n int) { var l int _ = l - l = m.MinAvailable.Size() - n += 1 + l + sovGenerated(uint64(l)) + if m.MinAvailable != nil { + l = m.MinAvailable.Size() + n += 1 + l + sovGenerated(uint64(l)) + } if m.Selector != nil { l = m.Selector.Size() n += 1 + l + sovGenerated(uint64(l)) } + if m.MaxUnavailable != nil { + l = m.MaxUnavailable.Size() + n += 1 + l + sovGenerated(uint64(l)) + } return n } @@ -445,8 +465,9 @@ func (this *PodDisruptionBudgetSpec) String() string { return "nil" } s := strings.Join([]string{`&PodDisruptionBudgetSpec{`, - `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, + `MinAvailable:` + strings.Replace(fmt.Sprintf("%v", this.MinAvailable), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_apimachinery_pkg_apis_meta_v1.LabelSelector", 1) + `,`, + `MaxUnavailable:` + strings.Replace(fmt.Sprintf("%v", this.MaxUnavailable), "IntOrString", "k8s_io_apimachinery_pkg_util_intstr.IntOrString", 1) + `,`, `}`, }, "") return s @@ -903,6 +924,9 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.MinAvailable == nil { + m.MinAvailable = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} + } if err := m.MinAvailable.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -940,6 +964,39 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxUnavailable", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MaxUnavailable == nil { + m.MaxUnavailable = &k8s_io_apimachinery_pkg_util_intstr.IntOrString{} + } + if err := m.MaxUnavailable.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -1337,54 +1394,56 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 773 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcb, 0x6e, 0xf3, 0x44, - 0x18, 0x86, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0xac, 0x5a, - 0x04, 0x63, 0xda, 0x22, 0x54, 0x58, 0x54, 0xd4, 0xa4, 0x82, 0xa2, 0x56, 0xa9, 0x5c, 0x24, 0x24, - 0x04, 0x12, 0x63, 0xfb, 0xc3, 0x99, 0xc6, 0x27, 0x8d, 0xc7, 0xa1, 0xd9, 0x71, 0x09, 0x2c, 0xb8, - 0xa8, 0x4a, 0x6c, 0xba, 0x44, 0x08, 0x55, 0x34, 0x70, 0x0b, 0xec, 0x91, 0xc7, 0x93, 0x83, 0x9b, - 0x44, 0x0d, 0xea, 0xaf, 0x7f, 0xe7, 0x39, 0x3c, 0xef, 0xfb, 0x9d, 0xc6, 0xe8, 0x93, 0xfe, 0x51, - 0x42, 0x58, 0x64, 0xf4, 0x53, 0x1b, 0x78, 0x08, 0x02, 0x12, 0x23, 0xee, 0x7b, 0x06, 0x8d, 0x59, - 0x62, 0xc4, 0x91, 0xcf, 0x9c, 0xa1, 0x31, 0xd8, 0xb7, 0x41, 0xd0, 0x7d, 0xc3, 0x83, 0x10, 0x38, - 0x15, 0xe0, 0x92, 0x98, 0x47, 0x22, 0xc2, 0x7b, 0x39, 0x4a, 0xa6, 0x28, 0x89, 0xfb, 0x1e, 0xc9, - 0x50, 0x92, 0xa3, 0x44, 0xa1, 0xad, 0x0f, 0x3c, 0x26, 0x7a, 0xa9, 0x4d, 0x9c, 0x28, 0x30, 0xbc, - 0xc8, 0x8b, 0x0c, 0xa9, 0x60, 0xa7, 0x3f, 0xca, 0x95, 0x5c, 0xc8, 0xaf, 0x5c, 0xb9, 0xf5, 0x91, - 0x0a, 0x8a, 0xc6, 0x2c, 0xa0, 0x4e, 0x8f, 0x85, 0xc0, 0x87, 0xd3, 0xb0, 0x02, 0x10, 0xd4, 0x18, - 0xcc, 0xc5, 0xd3, 0x32, 0x96, 0x51, 0x3c, 0x0d, 0x05, 0x0b, 0x60, 0x0e, 0xf8, 0xf8, 0x29, 0x20, - 0x71, 0x7a, 0x10, 0xd0, 0x39, 0xee, 0x70, 0x19, 0x97, 0x0a, 0xe6, 0x1b, 0x2c, 0x14, 0x89, 0xe0, - 0x73, 0xd0, 0x4c, 0x4e, 0x09, 0xf0, 0x01, 0xf0, 0x69, 0x42, 0x70, 0x43, 0x83, 0xd8, 0x87, 0x45, - 0x39, 0xbd, 0xbf, 0xb4, 0x3d, 0x0b, 0x6e, 0xb7, 0xff, 0xd0, 0x50, 0xed, 0x74, 0xc0, 0x1c, 0xc1, - 0xa2, 0x10, 0xff, 0x80, 0x6a, 0x59, 0xa5, 0x5c, 0x2a, 0x68, 0x53, 0x7b, 0x57, 0xdb, 0xdd, 0x38, - 0xf8, 0x90, 0xa8, 0x8e, 0xcd, 0x06, 0x3e, 0xed, 0x59, 0x76, 0x9b, 0x0c, 0xf6, 0x49, 0xd7, 0xbe, - 0x06, 0x47, 0x5c, 0x80, 0xa0, 0x26, 0xbe, 0xbd, 0xdf, 0x29, 0x8d, 0xee, 0x77, 0xd0, 0x74, 0xcf, - 0x9a, 0xa8, 0x62, 0x1f, 0x35, 0x5c, 0xf0, 0x41, 0x40, 0x37, 0xce, 0x1c, 0x93, 0xe6, 0x9a, 0xb4, - 0x39, 0x5c, 0xcd, 0xa6, 0x33, 0x8b, 0x9a, 0xaf, 0x8d, 0xee, 0x77, 0x1a, 0x85, 0x2d, 0xab, 0x28, - 0xde, 0xfe, 0x6d, 0x0d, 0xbd, 0x7e, 0x19, 0xb9, 0x1d, 0x96, 0xf0, 0x54, 0x6e, 0x99, 0xa9, 0xeb, - 0x81, 0x78, 0x09, 0x79, 0xba, 0xa8, 0x92, 0xc4, 0xe0, 0xa8, 0xf4, 0x4c, 0xb2, 0xf2, 0xdc, 0x93, - 0x05, 0xf1, 0x5e, 0xc5, 0xe0, 0x98, 0x75, 0xe5, 0x57, 0xc9, 0x56, 0x96, 0x54, 0xc7, 0x3e, 0x5a, - 0x4f, 0x04, 0x15, 0x69, 0xd2, 0x2c, 0x4b, 0x9f, 0xce, 0x33, 0x7d, 0xa4, 0x96, 0xb9, 0xa9, 0x9c, - 0xd6, 0xf3, 0xb5, 0xa5, 0x3c, 0xda, 0x7f, 0x6a, 0xe8, 0xad, 0x05, 0xd4, 0x39, 0x4b, 0x04, 0xfe, - 0x6e, 0xae, 0xa2, 0x64, 0xb5, 0x8a, 0x66, 0xb4, 0xac, 0xe7, 0x96, 0x72, 0xad, 0x8d, 0x77, 0x66, - 0xaa, 0xe9, 0xa0, 0x2a, 0x13, 0x10, 0x64, 0xd3, 0x52, 0xde, 0xdd, 0x38, 0x38, 0x7e, 0x5e, 0x9a, - 0x66, 0x43, 0x59, 0x55, 0xcf, 0x32, 0x51, 0x2b, 0xd7, 0x6e, 0xff, 0xb3, 0x38, 0xbd, 0xac, 0xdc, - 0xf8, 0x1a, 0xd5, 0x03, 0x16, 0x9e, 0x0c, 0x28, 0xf3, 0xa9, 0xed, 0xc3, 0x93, 0x43, 0x93, 0xbd, - 0x6a, 0x92, 0xbf, 0x6a, 0x72, 0x16, 0x8a, 0x2e, 0xbf, 0x12, 0x9c, 0x85, 0x9e, 0xf9, 0x86, 0x72, - 0xae, 0x5f, 0xcc, 0xa8, 0x59, 0x05, 0x6d, 0xfc, 0x3d, 0xaa, 0x25, 0xe0, 0x83, 0x23, 0x22, 0xfe, - 0xff, 0x5e, 0xc7, 0x39, 0xb5, 0xc1, 0xbf, 0x52, 0xa8, 0x59, 0xcf, 0x6a, 0x39, 0x5e, 0x59, 0x13, - 0xc9, 0xf6, 0xbf, 0x15, 0xf4, 0xf6, 0xd2, 0xde, 0xe3, 0xaf, 0x10, 0x8e, 0x6c, 0xf9, 0xb3, 0x71, - 0xbf, 0xc8, 0xff, 0x14, 0x2c, 0x0a, 0x65, 0xba, 0x65, 0xb3, 0xa5, 0x82, 0xc7, 0xdd, 0xb9, 0x1b, - 0xd6, 0x02, 0x0a, 0xff, 0xaa, 0xa1, 0x86, 0x9b, 0xdb, 0x80, 0x7b, 0x19, 0xb9, 0xe3, 0xf6, 0x7d, - 0xf3, 0x22, 0xa6, 0x94, 0x74, 0x66, 0x95, 0x4f, 0x43, 0xc1, 0x87, 0xe6, 0xb6, 0x0a, 0xb0, 0x51, - 0x38, 0xb3, 0x8a, 0x41, 0xe0, 0x0b, 0x84, 0xdd, 0x89, 0x64, 0x72, 0xe2, 0xfb, 0xd1, 0x4f, 0xe0, - 0xca, 0x07, 0x54, 0x35, 0xdf, 0x51, 0x0a, 0xdb, 0x05, 0xdf, 0xf1, 0x25, 0x6b, 0x01, 0x88, 0x8f, - 0xd1, 0xa6, 0x93, 0x72, 0x0e, 0xa1, 0xf8, 0x12, 0xa8, 0x2f, 0x7a, 0xc3, 0x66, 0x45, 0x4a, 0xbd, - 0xa9, 0xa4, 0x36, 0x3f, 0x2f, 0x9c, 0x5a, 0x8f, 0x6e, 0x67, 0xbc, 0x0b, 0x09, 0xe3, 0xe0, 0x8e, - 0xf9, 0x6a, 0x91, 0xef, 0x14, 0x4e, 0xad, 0x47, 0xb7, 0xf1, 0x11, 0xaa, 0xc3, 0x4d, 0x0c, 0xce, - 0xb8, 0xc6, 0xeb, 0x92, 0x9e, 0x0c, 0xda, 0xe9, 0xcc, 0x99, 0x55, 0xb8, 0xd9, 0xf2, 0x11, 0x9e, - 0x2f, 0x22, 0xde, 0x42, 0xe5, 0x3e, 0x0c, 0x65, 0xcb, 0x5f, 0xb5, 0xb2, 0x4f, 0xfc, 0x19, 0xaa, - 0x0e, 0xa8, 0x9f, 0x82, 0x9a, 0xc6, 0xf7, 0x56, 0x9b, 0xc6, 0xaf, 0x59, 0x00, 0x56, 0x0e, 0x7e, - 0xba, 0x76, 0xa4, 0x99, 0x7b, 0xb7, 0x0f, 0x7a, 0xe9, 0xee, 0x41, 0x2f, 0xfd, 0xfe, 0xa0, 0x97, - 0x7e, 0x1e, 0xe9, 0xda, 0xed, 0x48, 0xd7, 0xee, 0x46, 0xba, 0xf6, 0xd7, 0x48, 0xd7, 0x7e, 0xf9, - 0x5b, 0x2f, 0x7d, 0xfb, 0x8a, 0x6a, 0xfa, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe9, 0x2f, - 0xf1, 0x61, 0x08, 0x00, 0x00, + // 805 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xdf, 0x6e, 0xe3, 0x44, + 0x14, 0xc6, 0xe3, 0xa6, 0x29, 0x65, 0x36, 0x89, 0xca, 0xc0, 0x42, 0x89, 0x84, 0x83, 0x72, 0xb5, + 0x8b, 0x60, 0x4c, 0x77, 0x11, 0x2a, 0x5c, 0xac, 0x58, 0x93, 0x0a, 0x16, 0x6d, 0xd5, 0xd5, 0x14, + 0x84, 0x84, 0x40, 0x62, 0x6c, 0x9f, 0x75, 0x87, 0x8c, 0xff, 0x68, 0x3c, 0x0e, 0xcd, 0x1d, 0x8f, + 0xc0, 0x05, 0x0f, 0x55, 0x09, 0x09, 0xed, 0x25, 0x42, 0x28, 0xa2, 0xe6, 0x19, 0xb8, 0x47, 0x1e, + 0x4f, 0x9a, 0xb8, 0x49, 0xb4, 0x81, 0x22, 0xee, 0x3c, 0x33, 0xe7, 0xf7, 0x7d, 0xe7, 0x9c, 0x39, + 0x63, 0xf4, 0xc1, 0xe8, 0x30, 0x23, 0x3c, 0x71, 0x46, 0xb9, 0x07, 0x32, 0x06, 0x05, 0x99, 0x93, + 0x8e, 0x42, 0x87, 0xa5, 0x3c, 0x73, 0xd2, 0x44, 0x70, 0x7f, 0xe2, 0x8c, 0x0f, 0x3c, 0x50, 0xec, + 0xc0, 0x09, 0x21, 0x06, 0xc9, 0x14, 0x04, 0x24, 0x95, 0x89, 0x4a, 0xf0, 0xdd, 0x0a, 0x25, 0x73, + 0x94, 0xa4, 0xa3, 0x90, 0x94, 0x28, 0xa9, 0x50, 0x62, 0xd0, 0xde, 0x3b, 0x21, 0x57, 0x67, 0xb9, + 0x47, 0xfc, 0x24, 0x72, 0xc2, 0x24, 0x4c, 0x1c, 0xad, 0xe0, 0xe5, 0x4f, 0xf5, 0x4a, 0x2f, 0xf4, + 0x57, 0xa5, 0xdc, 0x7b, 0xcf, 0x24, 0xc5, 0x52, 0x1e, 0x31, 0xff, 0x8c, 0xc7, 0x20, 0x27, 0xf3, + 0xb4, 0x22, 0x50, 0xcc, 0x19, 0x2f, 0xe5, 0xd3, 0x73, 0xd6, 0x51, 0x32, 0x8f, 0x15, 0x8f, 0x60, + 0x09, 0x78, 0xff, 0x79, 0x40, 0xe6, 0x9f, 0x41, 0xc4, 0x96, 0xb8, 0xfb, 0xeb, 0xb8, 0x5c, 0x71, + 0xe1, 0xf0, 0x58, 0x65, 0x4a, 0x2e, 0x41, 0x0b, 0x35, 0x65, 0x20, 0xc7, 0x20, 0xe7, 0x05, 0xc1, + 0x39, 0x8b, 0x52, 0x01, 0xab, 0x6a, 0x7a, 0x7b, 0xed, 0xf5, 0xac, 0x88, 0x1e, 0xfc, 0x66, 0xa1, + 0xdd, 0xa3, 0x31, 0xf7, 0x15, 0x4f, 0x62, 0xfc, 0x2d, 0xda, 0x2d, 0x3b, 0x15, 0x30, 0xc5, 0xf6, + 0xad, 0x37, 0xad, 0x3b, 0xb7, 0xee, 0xbd, 0x4b, 0xcc, 0x8d, 0x2d, 0x26, 0x3e, 0xbf, 0xb3, 0x32, + 0x9a, 0x8c, 0x0f, 0xc8, 0x89, 0xf7, 0x1d, 0xf8, 0xea, 0x18, 0x14, 0x73, 0xf1, 0xc5, 0xb4, 0xdf, + 0x28, 0xa6, 0x7d, 0x34, 0xdf, 0xa3, 0x57, 0xaa, 0x58, 0xa0, 0x4e, 0x00, 0x02, 0x14, 0x9c, 0xa4, + 0xa5, 0x63, 0xb6, 0xbf, 0xa5, 0x6d, 0xee, 0x6f, 0x66, 0x33, 0x5c, 0x44, 0xdd, 0x97, 0x8a, 0x69, + 0xbf, 0x53, 0xdb, 0xa2, 0x75, 0xf1, 0xc1, 0xcf, 0x5b, 0xe8, 0xe5, 0x27, 0x49, 0x30, 0xe4, 0x99, + 0xcc, 0xf5, 0x96, 0x9b, 0x07, 0x21, 0xa8, 0xff, 0xa1, 0xce, 0x00, 0x6d, 0x67, 0x29, 0xf8, 0xa6, + 0x3c, 0x97, 0x6c, 0x3c, 0xf7, 0x64, 0x45, 0xbe, 0xa7, 0x29, 0xf8, 0x6e, 0xdb, 0xf8, 0x6d, 0x97, + 0x2b, 0xaa, 0xd5, 0xb1, 0x40, 0x3b, 0x99, 0x62, 0x2a, 0xcf, 0xf6, 0x9b, 0xda, 0x67, 0x78, 0x43, + 0x1f, 0xad, 0xe5, 0x76, 0x8d, 0xd3, 0x4e, 0xb5, 0xa6, 0xc6, 0x63, 0xf0, 0xbb, 0x85, 0x5e, 0x5b, + 0x41, 0x3d, 0xe6, 0x99, 0xc2, 0x5f, 0x2f, 0x75, 0x94, 0x6c, 0xd6, 0xd1, 0x92, 0xd6, 0xfd, 0xdc, + 0x33, 0xae, 0xbb, 0xb3, 0x9d, 0x85, 0x6e, 0xfa, 0xa8, 0xc5, 0x15, 0x44, 0xe5, 0xb4, 0x34, 0xef, + 0xdc, 0xba, 0xf7, 0xe0, 0x66, 0x65, 0xba, 0x1d, 0x63, 0xd5, 0x7a, 0x54, 0x8a, 0xd2, 0x4a, 0x7b, + 0xf0, 0xcb, 0xd6, 0xca, 0xf2, 0xca, 0x76, 0xe3, 0xa7, 0xa8, 0x1d, 0xf1, 0xf8, 0xe1, 0x98, 0x71, + 0xc1, 0x3c, 0x01, 0xcf, 0x1d, 0x9a, 0xf2, 0x55, 0x93, 0xea, 0x55, 0x93, 0x47, 0xb1, 0x3a, 0x91, + 0xa7, 0x4a, 0xf2, 0x38, 0x74, 0xf7, 0x8a, 0x69, 0xbf, 0x7d, 0xbc, 0xa0, 0x44, 0x6b, 0xba, 0xf8, + 0x1b, 0xb4, 0x9b, 0x81, 0x00, 0x5f, 0x25, 0xf2, 0x9f, 0xbd, 0x8c, 0xc7, 0xcc, 0x03, 0x71, 0x6a, + 0x50, 0xb7, 0x5d, 0xf6, 0x71, 0xb6, 0xa2, 0x57, 0x92, 0x58, 0xa0, 0x6e, 0xc4, 0xce, 0xbf, 0x88, + 0xd9, 0x55, 0x21, 0xcd, 0x7f, 0x59, 0x08, 0x2e, 0xa6, 0xfd, 0xee, 0x71, 0x4d, 0x8b, 0x5e, 0xd3, + 0x1e, 0xfc, 0xb5, 0x8d, 0x5e, 0x5f, 0x3b, 0x65, 0xf8, 0x33, 0x84, 0x13, 0x4f, 0xff, 0xd6, 0x82, + 0x4f, 0xaa, 0x7f, 0x12, 0x4f, 0x62, 0xdd, 0xd8, 0xa6, 0xdb, 0x33, 0x17, 0x84, 0x4f, 0x96, 0x22, + 0xe8, 0x0a, 0x0a, 0xff, 0x64, 0xa1, 0x4e, 0x50, 0xd9, 0x40, 0xf0, 0x24, 0x09, 0x66, 0x83, 0xf2, + 0xe5, 0x7f, 0xf1, 0x1e, 0xc8, 0x70, 0x51, 0xf9, 0x28, 0x56, 0x72, 0xe2, 0xde, 0x36, 0x09, 0x76, + 0x6a, 0x67, 0xb4, 0x9e, 0x04, 0x3e, 0x46, 0x38, 0xb8, 0x92, 0xcc, 0x1e, 0x0a, 0x91, 0x7c, 0x0f, + 0x81, 0x6e, 0x79, 0xcb, 0x7d, 0xc3, 0x28, 0xdc, 0xae, 0xf9, 0xce, 0x82, 0xe8, 0x0a, 0x10, 0x3f, + 0x40, 0x5d, 0x3f, 0x97, 0x12, 0x62, 0xf5, 0x29, 0x30, 0xa1, 0xce, 0x26, 0xfb, 0xdb, 0x5a, 0xea, + 0x55, 0x23, 0xd5, 0xfd, 0xb8, 0x76, 0x4a, 0xaf, 0x45, 0x97, 0x7c, 0x00, 0x19, 0x97, 0x10, 0xcc, + 0xf8, 0x56, 0x9d, 0x1f, 0xd6, 0x4e, 0xe9, 0xb5, 0x68, 0x7c, 0x88, 0xda, 0x70, 0x9e, 0x82, 0x3f, + 0xeb, 0xf1, 0x8e, 0xa6, 0x5f, 0x31, 0x74, 0xfb, 0x68, 0xe1, 0x8c, 0xd6, 0x22, 0x7b, 0x02, 0xe1, + 0xe5, 0x26, 0xe2, 0x3d, 0xd4, 0x1c, 0xc1, 0x44, 0x5f, 0xf9, 0x8b, 0xb4, 0xfc, 0xc4, 0x1f, 0xa1, + 0xd6, 0x98, 0x89, 0x1c, 0xcc, 0xec, 0xbf, 0xb5, 0xd9, 0xec, 0x7f, 0xce, 0x23, 0xa0, 0x15, 0xf8, + 0xe1, 0xd6, 0xa1, 0xe5, 0xde, 0xbd, 0xb8, 0xb4, 0x1b, 0xcf, 0x2e, 0xed, 0xc6, 0xaf, 0x97, 0x76, + 0xe3, 0x87, 0xc2, 0xb6, 0x2e, 0x0a, 0xdb, 0x7a, 0x56, 0xd8, 0xd6, 0x1f, 0x85, 0x6d, 0xfd, 0xf8, + 0xa7, 0xdd, 0xf8, 0xea, 0x05, 0x73, 0xe9, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xc0, 0x72, + 0x96, 0xcb, 0x08, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto index d14d5de30e..3350c06c39 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto @@ -71,6 +71,12 @@ message PodDisruptionBudgetSpec { // Label query over pods whose evictions are managed by the disruption // budget. optional k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector selector = 2; + + // An eviction is allowed if at most "maxUnavailable" pods selected by + // "selector" are unavailable after the eviction, i.e. even in absence of + // the evicted pod. For example, one can prevent all voluntary evictions + // by specifying 0. This is a mutually exclusive setting with "minAvailable". + optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxUnavailable = 3; } // PodDisruptionBudgetStatus represents information about the status of a diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go index 38b3afeb45..a4636a80ab 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go @@ -85,14 +85,15 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [2]bool + var yyq2 [3]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false - yyq2[0] = true + yyq2[0] = x.MinAvailable != nil yyq2[1] = x.Selector != nil + yyq2[2] = x.MaxUnavailable != nil var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(2) + r.EncodeArrayStart(3) } else { yynn2 = 0 for _, b := range yyq2 { @@ -106,15 +107,18 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq2[0] { - yy4 := &x.MinAvailable - yym5 := z.EncBinary() - _ = yym5 - if false { - } else if z.HasExtensions() && z.EncExt(yy4) { - } else if !yym5 && z.IsJSONHandle() { - z.EncJSONMarshal(yy4) + if x.MinAvailable == nil { + r.EncodeNil() } else { - z.EncFallback(yy4) + yym4 := z.EncBinary() + _ = yym4 + if false { + } else if z.HasExtensions() && z.EncExt(x.MinAvailable) { + } else if !yym4 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MinAvailable) + } else { + z.EncFallback(x.MinAvailable) + } } } else { r.EncodeNil() @@ -124,15 +128,18 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minAvailable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy6 := &x.MinAvailable - yym7 := z.EncBinary() - _ = yym7 - if false { - } else if z.HasExtensions() && z.EncExt(yy6) { - } else if !yym7 && z.IsJSONHandle() { - z.EncJSONMarshal(yy6) + if x.MinAvailable == nil { + r.EncodeNil() } else { - z.EncFallback(yy6) + yym5 := z.EncBinary() + _ = yym5 + if false { + } else if z.HasExtensions() && z.EncExt(x.MinAvailable) { + } else if !yym5 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MinAvailable) + } else { + z.EncFallback(x.MinAvailable) + } } } } @@ -142,8 +149,8 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Selector == nil { r.EncodeNil() } else { - yym9 := z.EncBinary() - _ = yym9 + yym7 := z.EncBinary() + _ = yym7 if false { } else if z.HasExtensions() && z.EncExt(x.Selector) { } else { @@ -161,8 +168,8 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Selector == nil { r.EncodeNil() } else { - yym10 := z.EncBinary() - _ = yym10 + yym8 := z.EncBinary() + _ = yym8 if false { } else if z.HasExtensions() && z.EncExt(x.Selector) { } else { @@ -171,6 +178,45 @@ func (x *PodDisruptionBudgetSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[2] { + if x.MaxUnavailable == nil { + r.EncodeNil() + } else { + yym10 := z.EncBinary() + _ = yym10 + if false { + } else if z.HasExtensions() && z.EncExt(x.MaxUnavailable) { + } else if !yym10 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MaxUnavailable) + } else { + z.EncFallback(x.MaxUnavailable) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq2[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("maxUnavailable")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.MaxUnavailable == nil { + r.EncodeNil() + } else { + yym11 := z.EncBinary() + _ = yym11 + if false { + } else if z.HasExtensions() && z.EncExt(x.MaxUnavailable) { + } else if !yym11 && z.IsJSONHandle() { + z.EncJSONMarshal(x.MaxUnavailable) + } else { + z.EncFallback(x.MaxUnavailable) + } + } + } + } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { @@ -234,17 +280,21 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec switch yys3 { case "minAvailable": if r.TryDecodeAsNil() { - x.MinAvailable = pkg1_intstr.IntOrString{} + if x.MinAvailable != nil { + x.MinAvailable = nil + } } else { - yyv4 := &x.MinAvailable + if x.MinAvailable == nil { + x.MinAvailable = new(pkg1_intstr.IntOrString) + } yym5 := z.DecBinary() _ = yym5 if false { - } else if z.HasExtensions() && z.DecExt(yyv4) { + } else if z.HasExtensions() && z.DecExt(x.MinAvailable) { } else if !yym5 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4) + z.DecJSONUnmarshal(x.MinAvailable) } else { - z.DecFallback(yyv4, false) + z.DecFallback(x.MinAvailable, false) } } case "selector": @@ -264,6 +314,25 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec z.DecFallback(x.Selector, false) } } + case "maxUnavailable": + if r.TryDecodeAsNil() { + if x.MaxUnavailable != nil { + x.MaxUnavailable = nil + } + } else { + if x.MaxUnavailable == nil { + x.MaxUnavailable = new(pkg1_intstr.IntOrString) + } + yym9 := z.DecBinary() + _ = yym9 + if false { + } else if z.HasExtensions() && z.DecExt(x.MaxUnavailable) { + } else if !yym9 && z.IsJSONHandle() { + z.DecJSONUnmarshal(x.MaxUnavailable) + } else { + z.DecFallback(x.MaxUnavailable, false) + } + } default: z.DecStructFieldNotFound(-1, yys3) } // end switch yys3 @@ -275,41 +344,45 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj8 int - var yyb8 bool - var yyhl8 bool = l >= 0 - yyj8++ - if yyhl8 { - yyb8 = yyj8 > l + var yyj10 int + var yyb10 bool + var yyhl10 bool = l >= 0 + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l } else { - yyb8 = r.CheckBreak() + yyb10 = r.CheckBreak() } - if yyb8 { + if yyb10 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinAvailable = pkg1_intstr.IntOrString{} + if x.MinAvailable != nil { + x.MinAvailable = nil + } } else { - yyv9 := &x.MinAvailable - yym10 := z.DecBinary() - _ = yym10 + if x.MinAvailable == nil { + x.MinAvailable = new(pkg1_intstr.IntOrString) + } + yym12 := z.DecBinary() + _ = yym12 if false { - } else if z.HasExtensions() && z.DecExt(yyv9) { - } else if !yym10 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv9) + } else if z.HasExtensions() && z.DecExt(x.MinAvailable) { + } else if !yym12 && z.IsJSONHandle() { + z.DecJSONUnmarshal(x.MinAvailable) } else { - z.DecFallback(yyv9, false) + z.DecFallback(x.MinAvailable, false) } } - yyj8++ - if yyhl8 { - yyb8 = yyj8 > l + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l } else { - yyb8 = r.CheckBreak() + yyb10 = r.CheckBreak() } - if yyb8 { + if yyb10 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -322,26 +395,55 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D if x.Selector == nil { x.Selector = new(pkg2_v1.LabelSelector) } - yym12 := z.DecBinary() - _ = yym12 + yym14 := z.DecBinary() + _ = yym14 if false { } else if z.HasExtensions() && z.DecExt(x.Selector) { } else { z.DecFallback(x.Selector, false) } } - for { - yyj8++ - if yyhl8 { - yyb8 = yyj8 > l - } else { - yyb8 = r.CheckBreak() + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l + } else { + yyb10 = r.CheckBreak() + } + if yyb10 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + if x.MaxUnavailable != nil { + x.MaxUnavailable = nil } - if yyb8 { + } else { + if x.MaxUnavailable == nil { + x.MaxUnavailable = new(pkg1_intstr.IntOrString) + } + yym16 := z.DecBinary() + _ = yym16 + if false { + } else if z.HasExtensions() && z.DecExt(x.MaxUnavailable) { + } else if !yym16 && z.IsJSONHandle() { + z.DecJSONUnmarshal(x.MaxUnavailable) + } else { + z.DecFallback(x.MaxUnavailable, false) + } + } + for { + yyj10++ + if yyhl10 { + yyb10 = yyj10 > l + } else { + yyb10 = r.CheckBreak() + } + if yyb10 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj8-1, "") + z.DecStructFieldNotFound(yyj10-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -2122,7 +2224,7 @@ func (x codecSelfer1234) decSlicePodDisruptionBudget(v *[]PodDisruptionBudget, d yyrg1 := len(yyv1) > 0 yyv21 := yyv1 - yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 336) + yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 320) if yyrt1 { if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go index ca5ea37306..6cc56256a6 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go @@ -27,11 +27,17 @@ type PodDisruptionBudgetSpec struct { // "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%". - MinAvailable intstr.IntOrString `json:"minAvailable,omitempty" protobuf:"bytes,1,opt,name=minAvailable"` + MinAvailable *intstr.IntOrString `json:"minAvailable,omitempty" protobuf:"bytes,1,opt,name=minAvailable"` // Label query over pods whose evictions are managed by the disruption // budget. Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + + // An eviction is allowed if at most "maxUnavailable" pods selected by + // "selector" are unavailable after the eviction, i.e. even in absence of + // the evicted pod. For example, one can prevent all voluntary evictions + // by specifying 0. This is a mutually exclusive setting with "minAvailable". + MaxUnavailable *intstr.IntOrString `json:"maxUnavailable,omitempty" protobuf:"bytes,3,opt,name=maxUnavailable"` } // PodDisruptionBudgetStatus represents information about the status of a diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go index d919856b25..29432506df 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go @@ -56,9 +56,10 @@ func (PodDisruptionBudgetList) SwaggerDoc() map[string]string { } var map_PodDisruptionBudgetSpec = map[string]string{ - "": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.", - "minAvailable": "An eviction is allowed if at least \"minAvailable\" pods selected by \"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%\".", - "selector": "Label query over pods whose evictions are managed by the disruption budget.", + "": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.", + "minAvailable": "An eviction is allowed if at least \"minAvailable\" pods selected by \"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%\".", + "selector": "Label query over pods whose evictions are managed by the disruption budget.", + "maxUnavailable": "An eviction is allowed if at most \"maxUnavailable\" pods selected by \"selector\" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with \"minAvailable\".", } func (PodDisruptionBudgetSpec) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go index 816251bd40..b10663a02c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go @@ -24,6 +24,7 @@ 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" policy "k8s.io/client-go/pkg/apis/policy" unsafe "unsafe" ) @@ -130,8 +131,9 @@ func Convert_policy_PodDisruptionBudgetList_To_v1beta1_PodDisruptionBudgetList(i } func autoConvert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(in *PodDisruptionBudgetSpec, out *policy.PodDisruptionBudgetSpec, s conversion.Scope) error { - out.MinAvailable = in.MinAvailable + out.MinAvailable = (*intstr.IntOrString)(unsafe.Pointer(in.MinAvailable)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) return nil } @@ -141,8 +143,9 @@ func Convert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(i } func autoConvert_policy_PodDisruptionBudgetSpec_To_v1beta1_PodDisruptionBudgetSpec(in *policy.PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, s conversion.Scope) error { - out.MinAvailable = in.MinAvailable + out.MinAvailable = (*intstr.IntOrString)(unsafe.Pointer(in.MinAvailable)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) return nil } diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go index abd2cea268..cf8ddbd623 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go @@ -24,6 +24,7 @@ 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" reflect "reflect" ) @@ -112,6 +113,11 @@ func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c in := in.(*PodDisruptionBudgetSpec) out := out.(*PodDisruptionBudgetSpec) *out = *in + if in.MinAvailable != nil { + in, out := &in.MinAvailable, &out.MinAvailable + *out = new(intstr.IntOrString) + **out = **in + } if in.Selector != nil { in, out := &in.Selector, &out.Selector if newVal, err := c.DeepCopy(*in); err != nil { @@ -120,6 +126,11 @@ func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *out = newVal.(*v1.LabelSelector) } } + if in.MaxUnavailable != nil { + in, out := &in.MaxUnavailable, &out.MaxUnavailable + *out = new(intstr.IntOrString) + **out = **in + } return nil } } diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go index 9edd2a1e2d..ba27f9072e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go @@ -24,6 +24,7 @@ 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" reflect "reflect" ) @@ -112,6 +113,11 @@ func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c in := in.(*PodDisruptionBudgetSpec) out := out.(*PodDisruptionBudgetSpec) *out = *in + if in.MinAvailable != nil { + in, out := &in.MinAvailable, &out.MinAvailable + *out = new(intstr.IntOrString) + **out = **in + } if in.Selector != nil { in, out := &in.Selector, &out.Selector if newVal, err := c.DeepCopy(*in); err != nil { @@ -120,6 +126,11 @@ func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *out = newVal.(*v1.LabelSelector) } } + if in.MaxUnavailable != nil { + in, out := &in.MaxUnavailable, &out.MaxUnavailable + *out = new(intstr.IntOrString) + **out = **in + } return nil } }