diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_apps_apis_apps_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_apps_apis_apps_v1.proto index eaef6d5d4ee7..a9bbd918a2fd 100644 --- a/api/protobuf-spec/github_com_openshift_origin_pkg_apps_apis_apps_v1.proto +++ b/api/protobuf-spec/github_com_openshift_origin_pkg_apps_apis_apps_v1.proto @@ -130,6 +130,7 @@ message DeploymentConfigRollbackSpec { // DeploymentConfigSpec represents the desired state of the deployment. message DeploymentConfigSpec { // Strategy describes how a deployment is executed. + // +optional optional DeploymentStrategy strategy = 1; // MinReadySeconds is the minimum number of seconds for which a newly created pod should @@ -140,9 +141,11 @@ message DeploymentConfigSpec { // Triggers determine how updates to a DeploymentConfig result in new deployments. If no triggers // are defined, a new deployment can only occur as a result of an explicit client update to the // DeploymentConfig with a new LatestVersion. If null, defaults to having a config change trigger. + // +optional optional DeploymentTriggerPolicies triggers = 2; // Replicas is the number of desired replicas. + // +optional optional int32 replicas = 3; // RevisionHistoryLimit is the number of old ReplicationControllers to retain to allow for rollbacks. @@ -153,6 +156,7 @@ message DeploymentConfigSpec { // Test ensures that this deployment config will have zero replicas except while a deployment is running. This allows the // deployment config to be used as a continuous deployment test - triggering on images, running the deployment, and then succeeding // or failing. Post strategy hooks and After actions can be used to integrate successful deployment with an action. + // +optional optional bool test = 5; // Paused indicates that the deployment config is paused resulting in no new deployments on template diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto index 34c91b297553..bfdb3c8183a8 100644 --- a/api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto +++ b/api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto @@ -461,6 +461,7 @@ message TagReference { optional string name = 1; // Optional; if specified, annotations that are applied to images retrieved via ImageStreamTags. + // +optional map annotations = 2; // Optional; if specified, a reference to another image that this tag should point to. Valid values @@ -478,6 +479,7 @@ message TagReference { // to import the newest remote tag. To trigger a new import, clients may set this value to zero which // will reset the generation to the latest stream generation. Legacy clients will send this value as // nil which will be merged with the current tag generation. + // +optional optional int64 generation = 5; // ImportPolicy is information that controls how images may be imported by the server. diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json index 6e31b93706f9..fc730efe7290 100644 --- a/api/swagger-spec/oapi-v1.json +++ b/api/swagger-spec/oapi-v1.json @@ -23170,8 +23170,7 @@ "id": "v1.DeploymentConfig", "description": "Deployment Configs define the template for a pod and manages deploying new images or configuration changes. A single deployment configuration is usually analogous to a single micro-service. Can support many different deployment patterns, including full restart, customizable rolling updates, and fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.", "required": [ - "spec", - "status" + "spec" ], "properties": { "kind": { diff --git a/api/swagger-spec/openshift-openapi-spec.json b/api/swagger-spec/openshift-openapi-spec.json index 65d9b1b61f0e..0fadf3d291ae 100644 --- a/api/swagger-spec/openshift-openapi-spec.json +++ b/api/swagger-spec/openshift-openapi-spec.json @@ -87032,8 +87032,7 @@ "com.github.openshift.origin.pkg.apps.apis.apps.v1.DeploymentConfig": { "description": "Deployment Configs define the template for a pod and manages deploying new images or configuration changes. A single deployment configuration is usually analogous to a single micro-service. Can support many different deployment patterns, including full restart, customizable rolling updates, and fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.", "required": [ - "spec", - "status" + "spec" ], "properties": { "apiVersion": { @@ -87192,12 +87191,6 @@ }, "com.github.openshift.origin.pkg.apps.apis.apps.v1.DeploymentConfigSpec": { "description": "DeploymentConfigSpec represents the desired state of the deployment.", - "required": [ - "strategy", - "triggers", - "replicas", - "test" - ], "properties": { "minReadySeconds": { "description": "MinReadySeconds is the minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)", @@ -90677,9 +90670,7 @@ "com.github.openshift.origin.pkg.image.apis.image.v1.TagReference": { "description": "TagReference specifies optional annotations for images using this tag and an optional reference to an ImageStreamTag, ImageStreamImage, or DockerImage this tag should track.", "required": [ - "name", - "annotations", - "generation" + "name" ], "properties": { "annotations": { diff --git a/pkg/apps/apis/apps/v1/defaults.go b/pkg/apps/apis/apps/v1/defaults.go index b3f033237f37..cc1768466dcb 100644 --- a/pkg/apps/apis/apps/v1/defaults.go +++ b/pkg/apps/apis/apps/v1/defaults.go @@ -43,6 +43,10 @@ func SetDefaults_DeploymentConfigSpec(obj *DeploymentConfigSpec) { if len(obj.Selector) == 0 && obj.Template != nil { obj.Selector = obj.Template.Labels } + if obj.Replicas == nil { + one := int32(1) + obj.Replicas = &one + } // if you only specify a single container, default the TagImages hook to the container name if obj.Template != nil && len(obj.Template.Spec.Containers) == 1 { diff --git a/pkg/apps/apis/apps/v1/generated.pb.go b/pkg/apps/apis/apps/v1/generated.pb.go index 42a2e2d87d42..4679568d878e 100644 --- a/pkg/apps/apis/apps/v1/generated.pb.go +++ b/pkg/apps/apis/apps/v1/generated.pb.go @@ -580,9 +580,11 @@ func (m *DeploymentConfigSpec) MarshalTo(dAtA []byte) (int, error) { } i += n12 } - dAtA[i] = 0x18 - i++ - i = encodeVarintGenerated(dAtA, i, uint64(m.Replicas)) + if m.Replicas != nil { + dAtA[i] = 0x18 + i++ + i = encodeVarintGenerated(dAtA, i, uint64(*m.Replicas)) + } if m.RevisionHistoryLimit != nil { dAtA[i] = 0x20 i++ @@ -1531,7 +1533,9 @@ func (m *DeploymentConfigSpec) Size() (n int) { l = m.Triggers.Size() n += 1 + l + sovGenerated(uint64(l)) } - n += 1 + sovGenerated(uint64(m.Replicas)) + if m.Replicas != nil { + n += 1 + sovGenerated(uint64(*m.Replicas)) + } if m.RevisionHistoryLimit != nil { n += 1 + sovGenerated(uint64(*m.RevisionHistoryLimit)) } @@ -1966,7 +1970,7 @@ func (this *DeploymentConfigSpec) String() string { s := strings.Join([]string{`&DeploymentConfigSpec{`, `Strategy:` + strings.Replace(strings.Replace(this.Strategy.String(), "DeploymentStrategy", "DeploymentStrategy", 1), `&`, ``, 1) + `,`, `Triggers:` + strings.Replace(fmt.Sprintf("%v", this.Triggers), "DeploymentTriggerPolicies", "DeploymentTriggerPolicies", 1) + `,`, - `Replicas:` + fmt.Sprintf("%v", this.Replicas) + `,`, + `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, `RevisionHistoryLimit:` + valueToStringGenerated(this.RevisionHistoryLimit) + `,`, `Test:` + fmt.Sprintf("%v", this.Test) + `,`, `Paused:` + fmt.Sprintf("%v", this.Paused) + `,`, @@ -3489,7 +3493,7 @@ func (m *DeploymentConfigSpec) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Replicas", wireType) } - m.Replicas = 0 + var v int32 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -3499,11 +3503,12 @@ func (m *DeploymentConfigSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Replicas |= (int32(b) & 0x7F) << shift + v |= (int32(b) & 0x7F) << shift if b < 0x80 { break } } + m.Replicas = &v case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RevisionHistoryLimit", wireType) @@ -6332,166 +6337,167 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2568 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4d, 0x6c, 0x24, 0x47, - 0x15, 0x76, 0x7b, 0xc6, 0xf6, 0xcc, 0xf3, 0xdf, 0xba, 0xbc, 0x3f, 0x13, 0x07, 0x79, 0xac, 0x09, - 0x09, 0x0b, 0x24, 0x33, 0xd8, 0x89, 0x50, 0xb2, 0x11, 0x01, 0x8f, 0xd7, 0x9b, 0x38, 0x1a, 0xaf, - 0x4d, 0xf9, 0x27, 0x22, 0x41, 0x88, 0x76, 0x4f, 0x79, 0x5c, 0x71, 0x77, 0xd7, 0x6c, 0x57, 0xcd, - 0x64, 0x87, 0x53, 0x24, 0x90, 0x38, 0x00, 0x82, 0x53, 0x84, 0x38, 0x71, 0x8c, 0x38, 0xc0, 0x8d, - 0x23, 0xe7, 0x70, 0x62, 0x05, 0x97, 0x08, 0x21, 0x2b, 0x6b, 0xee, 0x48, 0xdc, 0xd0, 0x9e, 0x50, - 0xfd, 0xf4, 0xdf, 0xf4, 0x8c, 0x77, 0xfd, 0x93, 0xdb, 0xcc, 0xfb, 0xf9, 0xde, 0xab, 0x57, 0xef, - 0xbd, 0x7a, 0x55, 0x0d, 0xab, 0x2d, 0x2a, 0x8e, 0x3a, 0x07, 0x55, 0x87, 0x79, 0x35, 0xd6, 0x26, - 0x3e, 0x3f, 0xa2, 0x87, 0xa2, 0xc6, 0x02, 0xda, 0xa2, 0x7e, 0xad, 0x7d, 0xdc, 0xaa, 0xd9, 0xed, - 0x36, 0xaf, 0xd9, 0x6d, 0xca, 0xf5, 0xaf, 0xee, 0x72, 0xad, 0x45, 0x7c, 0x12, 0xd8, 0x82, 0x34, - 0xab, 0xed, 0x80, 0x09, 0x86, 0x96, 0x63, 0x88, 0x6a, 0x04, 0x51, 0xd5, 0x10, 0xd5, 0xf6, 0x71, - 0xab, 0x2a, 0x15, 0xab, 0x12, 0x42, 0xff, 0xea, 0x2e, 0x2f, 0xbc, 0x92, 0xb0, 0xda, 0x62, 0x2d, - 0x56, 0x53, 0x48, 0x07, 0x9d, 0x43, 0xf5, 0x4f, 0xfd, 0x51, 0xbf, 0xb4, 0x85, 0x85, 0xd7, 0x8e, - 0x5f, 0xe7, 0x55, 0xca, 0xa4, 0x1b, 0x9e, 0xed, 0x1c, 0x51, 0x9f, 0x04, 0x3d, 0xe3, 0x1c, 0xe5, - 0x35, 0x8f, 0x08, 0x7b, 0x80, 0x5f, 0x0b, 0xb5, 0x61, 0x5a, 0x41, 0xc7, 0x17, 0xd4, 0x23, 0x19, - 0x85, 0x6f, 0x3f, 0x4d, 0x81, 0x3b, 0x47, 0xc4, 0xb3, 0x33, 0x7a, 0xaf, 0x0e, 0xd3, 0xeb, 0x08, - 0xea, 0xd6, 0xa8, 0x2f, 0xb8, 0x08, 0x32, 0x4a, 0x2f, 0x1b, 0xa5, 0xe3, 0xce, 0x01, 0x09, 0x7c, - 0x22, 0x08, 0x0f, 0x57, 0x34, 0x68, 0x2d, 0x6f, 0x0c, 0x95, 0xe6, 0xb5, 0x36, 0x73, 0xa9, 0xd3, - 0xab, 0x75, 0x97, 0x0f, 0x88, 0xb0, 0x33, 0xaa, 0x95, 0xbf, 0x5a, 0xb0, 0xb8, 0xd6, 0xe1, 0x82, - 0x79, 0x77, 0x49, 0xdb, 0x65, 0x3d, 0x8f, 0xf8, 0x62, 0x47, 0x48, 0x89, 0x56, 0x6f, 0xdb, 0x0e, - 0x6c, 0x8f, 0xa3, 0x17, 0x60, 0x8c, 0x7a, 0x76, 0x8b, 0x94, 0xac, 0x25, 0xeb, 0x76, 0xb1, 0x3e, - 0xfd, 0xd9, 0x49, 0x79, 0xe4, 0xf4, 0xa4, 0x3c, 0xb6, 0x21, 0x89, 0x58, 0xf3, 0xd0, 0x07, 0x30, - 0x49, 0xfc, 0x2e, 0x0d, 0x98, 0x2f, 0x11, 0x4a, 0xa3, 0x4b, 0xb9, 0xdb, 0x93, 0x2b, 0x5f, 0xad, - 0x6a, 0xc7, 0xaa, 0xb1, 0x63, 0x66, 0xcb, 0x69, 0xb5, 0xbb, 0x5c, 0x5d, 0xf7, 0xbb, 0xfb, 0x76, - 0x50, 0x9f, 0x37, 0x80, 0x93, 0xeb, 0x31, 0x00, 0x4e, 0xa2, 0xa1, 0x17, 0x61, 0xc2, 0x61, 0x9e, - 0x67, 0xfb, 0xcd, 0x52, 0x6e, 0x29, 0x77, 0xbb, 0x58, 0x9f, 0x3c, 0x3d, 0x29, 0x4f, 0xac, 0x69, - 0x12, 0x0e, 0x79, 0x95, 0x7f, 0x58, 0x30, 0x1b, 0xaf, 0x62, 0xcd, 0xee, 0x70, 0x82, 0xde, 0x80, - 0xbc, 0xe8, 0xb5, 0x43, 0xdf, 0x5f, 0x34, 0xa6, 0xf2, 0xbb, 0xbd, 0x36, 0x79, 0x72, 0x52, 0xbe, - 0x11, 0x8b, 0xef, 0x06, 0xb4, 0xd5, 0x22, 0x81, 0x64, 0x60, 0xa5, 0x82, 0x7e, 0x66, 0xc1, 0x94, - 0x5a, 0x9c, 0x61, 0x95, 0x46, 0x97, 0xac, 0xdb, 0x93, 0x2b, 0xf7, 0xab, 0xe7, 0xce, 0xe8, 0x6a, - 0x9f, 0x57, 0x1b, 0x09, 0xd4, 0xfa, 0xb5, 0xd3, 0x93, 0xf2, 0x54, 0x92, 0x82, 0x53, 0x56, 0x2b, - 0x3e, 0x3c, 0x7f, 0x86, 0x3a, 0xda, 0x82, 0xfc, 0x61, 0xc0, 0x3c, 0xb5, 0xc0, 0xc9, 0x95, 0x57, - 0xce, 0x8e, 0xf8, 0xd6, 0xc1, 0x87, 0xc4, 0x11, 0x98, 0x1c, 0x92, 0x80, 0xf8, 0x0e, 0xa9, 0x4f, - 0x85, 0xf1, 0xb8, 0x17, 0x30, 0x0f, 0x2b, 0xa0, 0xca, 0xe3, 0x1c, 0xcc, 0x27, 0x0c, 0x32, 0xbf, - 0x49, 0x05, 0x65, 0x3e, 0x7a, 0x33, 0x15, 0xc9, 0xaf, 0xf5, 0x45, 0xf2, 0xd6, 0x00, 0x95, 0x44, - 0x2c, 0xf7, 0x61, 0x9c, 0x0b, 0x5b, 0x74, 0xb8, 0x0a, 0x62, 0xb1, 0xfe, 0x96, 0x51, 0x1f, 0xdf, - 0x51, 0xd4, 0x27, 0x27, 0xe5, 0x33, 0x33, 0xbe, 0x1a, 0x61, 0x6a, 0x79, 0x6c, 0xd0, 0x50, 0x17, - 0x90, 0x6b, 0x73, 0xb1, 0x1b, 0xd8, 0x3e, 0xd7, 0x36, 0xa9, 0x47, 0x4a, 0x39, 0x15, 0x8b, 0x6f, - 0x84, 0xb1, 0x48, 0x56, 0x5e, 0x18, 0x0d, 0x5e, 0x95, 0x8d, 0x41, 0xc6, 0x44, 0x6a, 0xd4, 0x17, - 0x8c, 0x3f, 0xa8, 0x91, 0x41, 0xc3, 0x03, 0x2c, 0xa0, 0x97, 0x60, 0x3c, 0x20, 0x36, 0x67, 0x7e, - 0x29, 0xaf, 0xd6, 0x33, 0x13, 0xae, 0x07, 0x2b, 0x2a, 0x36, 0x5c, 0xf4, 0x75, 0x98, 0xf0, 0x08, - 0xe7, 0xb2, 0x7a, 0xc6, 0x94, 0xe0, 0xac, 0x11, 0x9c, 0xd8, 0xd4, 0x64, 0x1c, 0xf2, 0xd1, 0x87, - 0x30, 0x23, 0x0d, 0xed, 0xb5, 0x9b, 0xb6, 0x20, 0x6a, 0x19, 0xe3, 0xe7, 0x5e, 0xc6, 0x4d, 0x83, - 0x3e, 0xd3, 0x48, 0x21, 0xe1, 0x3e, 0xe4, 0xca, 0xdf, 0x47, 0xe1, 0x5a, 0x6a, 0xc3, 0x0e, 0x69, - 0x0b, 0xfd, 0x18, 0x0a, 0x12, 0xac, 0x69, 0x0b, 0xdb, 0x64, 0xd3, 0xb7, 0x9e, 0xcd, 0xb4, 0xce, - 0xaa, 0x4d, 0x22, 0xec, 0x3a, 0x32, 0x0e, 0x40, 0x4c, 0xc3, 0x11, 0x2a, 0xa2, 0x90, 0xe7, 0x6d, - 0xe2, 0x98, 0x42, 0x7a, 0xfb, 0x72, 0x85, 0xa4, 0x9c, 0xde, 0x69, 0x13, 0x27, 0xce, 0x62, 0xf9, - 0x0f, 0x2b, 0x13, 0xe8, 0x41, 0x94, 0x70, 0x3a, 0x19, 0x36, 0xae, 0xc2, 0x98, 0x02, 0x8c, 0xf7, - 0x3a, 0x9d, 0x8b, 0x95, 0x13, 0x0b, 0xae, 0xf7, 0xab, 0x34, 0x28, 0x17, 0xe8, 0x87, 0x99, 0xc0, - 0x56, 0x9f, 0x2d, 0xb0, 0x52, 0x5b, 0x85, 0xf5, 0x9a, 0x31, 0x59, 0x08, 0x29, 0x89, 0xa0, 0x1e, - 0xc1, 0x18, 0x15, 0xc4, 0xe3, 0xa6, 0xe7, 0xae, 0x5d, 0xc1, 0x42, 0x13, 0x3d, 0x5e, 0x22, 0x63, - 0x6d, 0xa0, 0xf2, 0x69, 0x0e, 0x4a, 0xfd, 0xa2, 0x98, 0xb9, 0xee, 0x81, 0xed, 0x1c, 0xa3, 0x25, - 0xc8, 0xfb, 0xb6, 0x17, 0xb6, 0x87, 0x68, 0x4b, 0xee, 0xdb, 0x1e, 0xc1, 0x8a, 0x83, 0xfe, 0x64, - 0x01, 0xea, 0xa8, 0x1c, 0x6c, 0xae, 0xfa, 0x3e, 0x13, 0xb6, 0xac, 0xa6, 0xd0, 0x6d, 0xe7, 0x0a, - 0xdc, 0x0e, 0x7d, 0xa9, 0xee, 0x65, 0xac, 0xac, 0xfb, 0x22, 0xe8, 0xc5, 0x55, 0x9e, 0x15, 0xc0, - 0x03, 0x5c, 0x43, 0x0f, 0x4c, 0xbe, 0xea, 0x14, 0xda, 0xba, 0x42, 0x17, 0x87, 0xe5, 0xed, 0xc2, - 0x3a, 0xdc, 0x1a, 0xe2, 0x3d, 0xba, 0x06, 0xb9, 0x63, 0xd2, 0xd3, 0x01, 0xc6, 0xf2, 0x27, 0xba, - 0x0e, 0x63, 0x5d, 0xdb, 0xed, 0x10, 0xdd, 0x54, 0xb1, 0xfe, 0x73, 0x67, 0xf4, 0x75, 0xab, 0xf2, - 0x97, 0x1c, 0x7c, 0xe5, 0x2c, 0xdb, 0x57, 0x7e, 0x6c, 0xa0, 0x97, 0xa1, 0x10, 0x90, 0x2e, 0xe5, - 0x94, 0xf9, 0xca, 0x9d, 0x5c, 0x9c, 0xb4, 0xd8, 0xd0, 0x71, 0x24, 0x81, 0x56, 0x61, 0x96, 0xfa, - 0x8e, 0xdb, 0x69, 0x86, 0xe7, 0x98, 0xae, 0xd3, 0x42, 0xfd, 0x96, 0x51, 0x9a, 0xdd, 0x48, 0xb3, - 0x71, 0xbf, 0x7c, 0x12, 0x82, 0x78, 0x6d, 0xd7, 0x16, 0x44, 0xf5, 0xe2, 0x01, 0x10, 0x86, 0x8d, - 0xfb, 0xe5, 0xd1, 0x3e, 0xdc, 0x34, 0x24, 0x4c, 0xda, 0x2e, 0x75, 0x54, 0xb4, 0x65, 0x79, 0xa9, - 0x66, 0x5d, 0xa8, 0x2f, 0x1a, 0xa4, 0x9b, 0x1b, 0x03, 0xa5, 0xf0, 0x10, 0xed, 0x84, 0x6b, 0xe1, - 0x28, 0xa5, 0x7a, 0x79, 0xd6, 0xb5, 0x90, 0x8d, 0xfb, 0xe5, 0x2b, 0x9f, 0x8e, 0x67, 0x9b, 0x89, - 0xda, 0x38, 0x0e, 0x05, 0x1e, 0x82, 0xea, 0xcd, 0x5b, 0xbf, 0x54, 0x5e, 0x86, 0x16, 0xe3, 0xed, - 0x8a, 0x9c, 0x8a, 0x0c, 0xa1, 0x2e, 0x14, 0x44, 0xb8, 0x4f, 0xba, 0x79, 0x37, 0x2e, 0x65, 0xd4, - 0x6c, 0xe2, 0xb6, 0x9c, 0x4d, 0x29, 0xe1, 0xf5, 0x29, 0x69, 0x37, 0xda, 0xea, 0xc8, 0x96, 0x4e, - 0x2a, 0x15, 0x5b, 0x9d, 0x1f, 0x63, 0xc9, 0xa4, 0xd2, 0x74, 0x1c, 0x49, 0xa0, 0x06, 0x5c, 0x0f, - 0x13, 0xec, 0x1d, 0xca, 0x05, 0x0b, 0x7a, 0x0d, 0xea, 0x51, 0xa1, 0xd2, 0x62, 0xac, 0x5e, 0x3a, - 0x3d, 0x29, 0x5f, 0xc7, 0x03, 0xf8, 0x78, 0xa0, 0x96, 0x6c, 0x68, 0x82, 0x70, 0x61, 0x52, 0x21, - 0x4a, 0xf9, 0x5d, 0xc2, 0x05, 0x56, 0x1c, 0x39, 0x04, 0xb4, 0xe5, 0x3c, 0xd6, 0x34, 0xbb, 0x1b, - 0x1d, 0x0c, 0xdb, 0x8a, 0x8a, 0x0d, 0x17, 0xfd, 0xd4, 0x82, 0x02, 0x27, 0x2e, 0x71, 0x04, 0x0b, - 0x4a, 0x13, 0xaa, 0xdd, 0xed, 0x5d, 0xd1, 0xd9, 0x57, 0xdd, 0x31, 0xb8, 0xba, 0xc1, 0xc5, 0x7b, - 0x68, 0xc8, 0x38, 0x32, 0x8c, 0xde, 0x83, 0x82, 0x08, 0x0b, 0xa5, 0xf0, 0x2c, 0x55, 0xbf, 0xcd, - 0x9a, 0x61, 0xa5, 0xe8, 0x76, 0xa5, 0x36, 0x29, 0x2c, 0xa6, 0x08, 0x4c, 0x66, 0xbb, 0x47, 0x7d, - 0x4c, 0xec, 0x66, 0x6f, 0x87, 0x38, 0xcc, 0x6f, 0xf2, 0x52, 0x51, 0x45, 0x3c, 0xca, 0xf6, 0xcd, - 0x34, 0x1b, 0xf7, 0xcb, 0x2f, 0xbc, 0x09, 0xd3, 0xa9, 0x85, 0x9c, 0xab, 0xd7, 0x3d, 0x1a, 0x83, - 0x9b, 0x83, 0x8f, 0x6a, 0xf4, 0x26, 0x4c, 0x4b, 0x17, 0xb9, 0xd8, 0x27, 0x81, 0xea, 0x4c, 0x96, - 0xea, 0x4c, 0x37, 0x8c, 0x63, 0xd3, 0x8d, 0x24, 0x13, 0xa7, 0x65, 0xd1, 0xbb, 0x80, 0xd8, 0x01, - 0x27, 0x41, 0x97, 0x34, 0xdf, 0xd6, 0xb7, 0xa6, 0xb8, 0xb7, 0x45, 0x27, 0xc9, 0x56, 0x46, 0x02, - 0x0f, 0xd0, 0x3a, 0x67, 0x22, 0xaf, 0xc2, 0xac, 0x39, 0x8d, 0x42, 0xa6, 0xc9, 0xe1, 0x28, 0xa2, - 0x7b, 0x69, 0x36, 0xee, 0x97, 0x47, 0x6f, 0xc3, 0x9c, 0xdd, 0xb5, 0xa9, 0x6b, 0x1f, 0xb8, 0x24, - 0x02, 0x19, 0x53, 0x20, 0xcf, 0x19, 0x90, 0xb9, 0xd5, 0x7e, 0x01, 0x9c, 0xd5, 0x41, 0x9b, 0x30, - 0xdf, 0xf1, 0xb3, 0x50, 0xe3, 0x0a, 0xea, 0x79, 0x03, 0x35, 0xbf, 0x97, 0x15, 0xc1, 0x83, 0xf4, - 0xd0, 0x31, 0x4c, 0x34, 0x89, 0xb0, 0xa9, 0xcb, 0x4b, 0x13, 0x2a, 0x09, 0xef, 0x5e, 0xaa, 0x12, - 0xee, 0x6a, 0x2c, 0x7d, 0x21, 0x34, 0x7f, 0x70, 0x68, 0x01, 0xfd, 0x04, 0xc0, 0x09, 0x2f, 0x0e, - 0xbc, 0x54, 0x50, 0x95, 0x77, 0xef, 0xb2, 0x95, 0xa7, 0xe1, 0xe2, 0x49, 0x37, 0x22, 0x71, 0x9c, - 0xb0, 0x26, 0x53, 0x2f, 0x90, 0x29, 0x1e, 0x45, 0x4c, 0xd7, 0x44, 0x94, 0x7a, 0x38, 0xc9, 0xc4, - 0x69, 0xd9, 0xca, 0x1f, 0x2c, 0x98, 0xcb, 0x2c, 0x32, 0x79, 0x99, 0xb0, 0x9e, 0x7a, 0x99, 0x18, - 0x77, 0x64, 0xf3, 0x09, 0xc7, 0xab, 0xfa, 0xe5, 0x2f, 0xad, 0x71, 0x7b, 0x53, 0x7f, 0x39, 0x36, - 0x16, 0x2a, 0xb3, 0x30, 0x1d, 0x8b, 0x36, 0x58, 0xab, 0xf2, 0xcb, 0x7c, 0xf2, 0xec, 0x6a, 0xb0, - 0xd6, 0x56, 0x5b, 0xc7, 0xa4, 0x06, 0x45, 0x87, 0xf9, 0xc2, 0x96, 0xe3, 0xae, 0x59, 0xc2, 0x9c, - 0x01, 0x2d, 0xae, 0x85, 0x0c, 0x1c, 0xcb, 0xc8, 0x0e, 0x7b, 0xc8, 0x5c, 0x97, 0x7d, 0xa4, 0xca, - 0x2e, 0xd1, 0x61, 0xef, 0x29, 0x2a, 0x36, 0x5c, 0x59, 0x5e, 0x6d, 0xd9, 0xc4, 0x59, 0x27, 0x9c, - 0x23, 0xa2, 0xf2, 0xda, 0x36, 0x74, 0x1c, 0x49, 0xa0, 0xd7, 0x60, 0x8a, 0x53, 0xdf, 0x21, 0x61, - 0xb7, 0xca, 0xeb, 0x71, 0x45, 0xde, 0xc3, 0x77, 0x12, 0x74, 0x9c, 0x92, 0x42, 0xef, 0x41, 0x51, - 0xfd, 0x57, 0x57, 0xb3, 0xb1, 0x73, 0x5f, 0xcd, 0xa6, 0xe5, 0x22, 0x77, 0x42, 0x00, 0x1c, 0x63, - 0xa1, 0x15, 0x00, 0x41, 0x3d, 0xc2, 0x85, 0xed, 0xb5, 0xb9, 0x39, 0x4a, 0xa2, 0xec, 0xda, 0x8d, - 0x38, 0x38, 0x21, 0x85, 0xbe, 0x09, 0x45, 0x99, 0x13, 0x0d, 0xea, 0x13, 0x5d, 0x48, 0x39, 0x6d, - 0x60, 0x37, 0x24, 0xe2, 0x98, 0x8f, 0xaa, 0x00, 0xae, 0x3c, 0xd2, 0xea, 0x3d, 0x41, 0xb8, 0xea, - 0xfd, 0xb9, 0xfa, 0x8c, 0x04, 0x6f, 0x44, 0x54, 0x9c, 0x90, 0x90, 0x51, 0xf7, 0xd9, 0x47, 0x36, - 0x15, 0x2a, 0x67, 0x13, 0x51, 0xbf, 0xcf, 0xde, 0xb3, 0xa9, 0xc0, 0x86, 0x8b, 0x5e, 0x84, 0x89, - 0xae, 0xe9, 0xab, 0xa0, 0x40, 0x55, 0x15, 0x86, 0xdd, 0x34, 0xe4, 0x55, 0xfe, 0x99, 0x4a, 0x66, - 0x4c, 0x1e, 0x74, 0xe4, 0xe1, 0xf9, 0xf4, 0xfb, 0xc2, 0x4b, 0x30, 0xae, 0x1b, 0x72, 0xff, 0xe6, - 0xeb, 0xae, 0x8d, 0x0d, 0x17, 0xbd, 0x00, 0x63, 0x87, 0x2c, 0x70, 0x88, 0xd9, 0xf9, 0xe8, 0xee, - 0x72, 0x4f, 0x12, 0xb1, 0xe6, 0xa1, 0x7d, 0x98, 0x25, 0x0f, 0xd3, 0x03, 0x67, 0x5e, 0x3d, 0x25, - 0xbd, 0x2c, 0xdb, 0xe9, 0x7a, 0x9a, 0x35, 0xfc, 0x65, 0xa8, 0x1f, 0xa4, 0xf2, 0xe7, 0x02, 0xa0, - 0xec, 0x30, 0x85, 0xee, 0xa4, 0x1e, 0x4b, 0x5e, 0xea, 0x7b, 0x2c, 0xb9, 0x99, 0xd5, 0x48, 0xbc, - 0x95, 0xfc, 0xdc, 0x82, 0x29, 0x47, 0x3d, 0xc9, 0xe9, 0x07, 0x38, 0x33, 0x71, 0x7d, 0xff, 0x02, - 0x25, 0x7c, 0xf6, 0xcb, 0x9e, 0x4e, 0xf9, 0xb5, 0x84, 0x29, 0x9c, 0x32, 0x8c, 0x7e, 0x6d, 0xc1, - 0x4c, 0x40, 0x9c, 0x80, 0xd8, 0x82, 0x18, 0x5f, 0xf4, 0x55, 0x68, 0xe7, 0x02, 0xbe, 0x60, 0x03, - 0x34, 0xd4, 0x1b, 0x74, 0x7a, 0x52, 0x9e, 0xc1, 0x29, 0x73, 0xb8, 0xcf, 0x3c, 0xfa, 0x85, 0x05, - 0xd3, 0x01, 0x73, 0x5d, 0xea, 0xb7, 0x8c, 0x43, 0x79, 0xe5, 0x10, 0xbe, 0x88, 0x43, 0x1a, 0x67, - 0xa8, 0x3f, 0x73, 0xaa, 0x4d, 0x27, 0x8d, 0xe1, 0xb4, 0x6d, 0xe4, 0x40, 0x31, 0x20, 0x9c, 0x75, - 0x02, 0x87, 0x70, 0xd3, 0x12, 0x56, 0xce, 0x9e, 0xa9, 0xb0, 0x11, 0x97, 0x55, 0x40, 0x03, 0x22, - 0xad, 0xf2, 0xb8, 0x07, 0x86, 0x5c, 0x8e, 0x63, 0x5c, 0xd4, 0x93, 0x65, 0x70, 0x40, 0x5c, 0xd9, - 0x1a, 0x72, 0x17, 0xcc, 0x83, 0xec, 0x1a, 0xab, 0x0d, 0x85, 0xa9, 0xc7, 0xc6, 0x44, 0x65, 0x49, - 0x22, 0x36, 0x06, 0xd1, 0xaf, 0x2c, 0x98, 0xb4, 0x13, 0x57, 0x75, 0x3d, 0xbb, 0xee, 0x5f, 0x8d, - 0x03, 0x99, 0xdb, 0x79, 0xf4, 0x0e, 0x9c, 0xbc, 0x96, 0x27, 0xed, 0xa3, 0x2d, 0xb8, 0x61, 0x3b, - 0x82, 0x76, 0xc9, 0x5d, 0x62, 0x37, 0x5d, 0xea, 0x47, 0x1d, 0x5c, 0xf7, 0xb4, 0xe7, 0x4e, 0x4f, - 0xca, 0x37, 0x56, 0x07, 0x09, 0xe0, 0xc1, 0x7a, 0x0b, 0x6f, 0xc0, 0x64, 0x22, 0x0e, 0xe7, 0x99, - 0x3a, 0x17, 0xde, 0x82, 0x6b, 0x97, 0xba, 0xa1, 0xff, 0x71, 0x14, 0x2a, 0x99, 0x1e, 0xa3, 0x5e, - 0x76, 0xd7, 0x8e, 0x6c, 0xbf, 0x15, 0x26, 0x7c, 0x0d, 0x8a, 0x76, 0x47, 0x30, 0xcf, 0x16, 0xd4, - 0x51, 0xc0, 0x85, 0x38, 0x5d, 0x56, 0x43, 0x06, 0x8e, 0x65, 0xd0, 0x1d, 0x98, 0x89, 0xce, 0x4f, - 0xd9, 0x4c, 0xf5, 0x04, 0x50, 0xd4, 0xd5, 0xb5, 0x96, 0xe2, 0xe0, 0x3e, 0xc9, 0xe8, 0x51, 0x20, - 0x77, 0x55, 0x8f, 0x02, 0xef, 0x86, 0xcf, 0xb3, 0x6a, 0x75, 0xa4, 0xa9, 0xd6, 0x67, 0x9e, 0x4c, - 0xfb, 0x9e, 0x5c, 0x93, 0x12, 0x78, 0x80, 0x56, 0xe5, 0x13, 0x0b, 0x9e, 0x1b, 0x7a, 0x83, 0x44, - 0x2c, 0x7c, 0x05, 0xb3, 0x54, 0x8e, 0xbe, 0x7b, 0x65, 0xd7, 0xd3, 0xde, 0xe0, 0xc7, 0xb0, 0x3b, - 0x85, 0xdf, 0xfe, 0xbe, 0x3c, 0xf2, 0xf1, 0xbf, 0x96, 0x46, 0x2a, 0xff, 0xb5, 0xe0, 0xd6, 0x10, - 0xdd, 0xcb, 0x7c, 0x7e, 0xf8, 0x9d, 0x05, 0x73, 0xb4, 0x3f, 0x1f, 0xcc, 0x59, 0xb0, 0x77, 0x15, - 0xcb, 0xcb, 0x24, 0x5b, 0xfd, 0x86, 0xbc, 0x15, 0x64, 0xc8, 0x38, 0xeb, 0x46, 0xe5, 0x0b, 0x0b, - 0x66, 0xd6, 0x1f, 0x12, 0xe7, 0x3e, 0xf9, 0x68, 0x9b, 0x35, 0xdf, 0x61, 0xec, 0x38, 0xf9, 0x91, - 0xc6, 0x1a, 0xfe, 0x91, 0x06, 0xad, 0x41, 0x8e, 0xf8, 0xdd, 0x73, 0x7d, 0x20, 0x9a, 0x34, 0x61, - 0xcb, 0xad, 0xfb, 0x5d, 0x2c, 0xb5, 0xe5, 0x70, 0x9d, 0x4a, 0x5d, 0x95, 0xb1, 0xc5, 0x78, 0xb8, - 0x4e, 0xe5, 0x39, 0x4e, 0xcb, 0xaa, 0xb1, 0x85, 0xb9, 0x1d, 0x59, 0x1a, 0xf9, 0xd8, 0xd1, 0x7d, - 0x4d, 0xc2, 0x21, 0xaf, 0xf2, 0xb7, 0x51, 0x98, 0x6e, 0xd0, 0x43, 0xe2, 0xf4, 0x1c, 0x97, 0xa8, - 0x15, 0xfe, 0x00, 0xa6, 0x0f, 0x6d, 0xea, 0x76, 0x02, 0xa2, 0x77, 0xd7, 0xec, 0xea, 0xab, 0xa1, - 0xd5, 0x7b, 0x49, 0xe6, 0x93, 0x93, 0xf2, 0x42, 0x4a, 0x3d, 0xc5, 0xc5, 0x69, 0x24, 0xf4, 0x00, - 0x80, 0x44, 0xe1, 0x34, 0x9b, 0xbc, 0x7a, 0x81, 0x4d, 0x4e, 0xef, 0x89, 0x9e, 0xf2, 0x62, 0x1a, - 0x4e, 0x18, 0x41, 0x6d, 0x39, 0x42, 0xb6, 0xd4, 0x6e, 0x73, 0xf5, 0x59, 0x6d, 0x72, 0xe5, 0xbb, - 0x17, 0xb0, 0xb8, 0x6b, 0x30, 0x94, 0xbd, 0xa8, 0x35, 0x85, 0x54, 0x35, 0x87, 0x9a, 0x9f, 0x95, - 0xff, 0x8d, 0xc2, 0xd2, 0xd3, 0xa6, 0x00, 0xd9, 0xbf, 0xe4, 0x9c, 0xcb, 0x3a, 0x22, 0x6c, 0xee, - 0xfa, 0xce, 0xae, 0xfa, 0xd7, 0x6e, 0x8a, 0x83, 0xfb, 0x24, 0xd1, 0x07, 0x90, 0x6b, 0x07, 0xc4, - 0x84, 0xef, 0x7b, 0x17, 0x58, 0x4c, 0x6a, 0xc3, 0xea, 0x13, 0x32, 0xe7, 0xb6, 0x03, 0x82, 0x25, - 0xaa, 0x04, 0xf7, 0x68, 0xd3, 0xf4, 0xc6, 0x2b, 0x02, 0xdf, 0xa4, 0x4d, 0x2c, 0x51, 0xd1, 0x8f, - 0x20, 0xdf, 0x66, 0x5c, 0x98, 0x69, 0xe6, 0xf2, 0xe8, 0x05, 0xd9, 0x65, 0xb6, 0x19, 0x17, 0x58, - 0xe1, 0x56, 0xfe, 0x93, 0x87, 0xf2, 0x53, 0xe6, 0x1d, 0xb4, 0x01, 0xf3, 0xfa, 0x15, 0x61, 0x9b, - 0x04, 0x94, 0x35, 0xd3, 0xe1, 0xbf, 0xa5, 0x6e, 0xf9, 0x59, 0x36, 0x1e, 0xa4, 0x83, 0xbe, 0x03, - 0xb3, 0xd4, 0x17, 0x24, 0xe8, 0xda, 0x6e, 0x08, 0xa3, 0xdf, 0x4d, 0xe6, 0xf5, 0xe3, 0x67, 0x8a, - 0x85, 0xfb, 0x65, 0x07, 0xe4, 0x40, 0xee, 0x99, 0x73, 0xc0, 0x85, 0x19, 0xcf, 0x7e, 0x98, 0x78, - 0x8f, 0x30, 0x31, 0x1d, 0xfe, 0x2d, 0xab, 0x23, 0xa8, 0x5b, 0xd5, 0xdf, 0xe1, 0xab, 0x1b, 0xbe, - 0xd8, 0x0a, 0x76, 0x44, 0x40, 0xfd, 0x96, 0xb6, 0xb6, 0x99, 0xc2, 0xc2, 0x7d, 0xd8, 0xe8, 0x7d, - 0x28, 0x78, 0xf6, 0xc3, 0x9d, 0x4e, 0xd0, 0x0a, 0xef, 0x84, 0xe7, 0xb7, 0xa3, 0xde, 0xd5, 0x36, - 0x0d, 0x0a, 0x8e, 0xf0, 0xc2, 0x6c, 0x9e, 0xf8, 0x52, 0xb2, 0x39, 0x4c, 0xb8, 0xc2, 0x97, 0x94, - 0x70, 0x9f, 0x58, 0x30, 0x95, 0x6c, 0x0d, 0xd9, 0x96, 0x6d, 0x9d, 0xa3, 0x65, 0x6f, 0xc0, 0xa8, - 0x60, 0xa6, 0xae, 0xcf, 0x39, 0x96, 0x80, 0x31, 0x30, 0xba, 0xcb, 0xf0, 0xa8, 0x60, 0xf5, 0xdb, - 0x9f, 0x3d, 0x5e, 0x1c, 0x79, 0xf4, 0x78, 0x71, 0xe4, 0xf3, 0xc7, 0x8b, 0x23, 0x1f, 0x9f, 0x2e, - 0x5a, 0x9f, 0x9d, 0x2e, 0x5a, 0x8f, 0x4e, 0x17, 0xad, 0xcf, 0x4f, 0x17, 0xad, 0x2f, 0x4e, 0x17, - 0xad, 0xdf, 0xfc, 0x7b, 0x71, 0xe4, 0xfd, 0xd1, 0xee, 0xf2, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, - 0xdb, 0x37, 0x1d, 0x97, 0xfd, 0x22, 0x00, 0x00, + // 2577 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4d, 0x6c, 0x6b, 0x47, + 0x15, 0xce, 0x8d, 0x9d, 0xc4, 0x3e, 0xf9, 0x7b, 0x99, 0xbc, 0x1f, 0x37, 0x45, 0x71, 0xe4, 0xd2, + 0x12, 0xa0, 0xb5, 0x49, 0x5a, 0xa1, 0xf6, 0x55, 0x14, 0xe2, 0xbc, 0xbc, 0x36, 0x95, 0xf3, 0x12, + 0x26, 0x3f, 0x15, 0x2d, 0x42, 0xdc, 0x5c, 0x4f, 0x9c, 0x69, 0xee, 0xbd, 0xe3, 0x77, 0x67, 0xec, + 0x3e, 0xb3, 0xaa, 0x04, 0x12, 0x0b, 0x40, 0xb0, 0xaa, 0x10, 0x2b, 0x16, 0x2c, 0x10, 0x0b, 0xd8, + 0xb1, 0x64, 0x5d, 0x56, 0x54, 0xb0, 0xa9, 0x10, 0x8a, 0xfa, 0xc2, 0x1e, 0x89, 0x1d, 0xea, 0x0a, + 0xcd, 0xcf, 0xfd, 0xf3, 0xb5, 0xf3, 0x5e, 0x7e, 0xba, 0xb3, 0xcf, 0xcf, 0x77, 0xce, 0x9c, 0x39, + 0xe7, 0xcc, 0x99, 0xb9, 0xb0, 0xd6, 0xa2, 0xe2, 0xb8, 0x73, 0x58, 0x75, 0x98, 0x57, 0x63, 0x6d, + 0xe2, 0xf3, 0x63, 0x7a, 0x24, 0x6a, 0x2c, 0xa0, 0x2d, 0xea, 0xd7, 0xda, 0x27, 0xad, 0x9a, 0xdd, + 0x6e, 0xf3, 0x9a, 0xdd, 0xa6, 0x5c, 0xff, 0xea, 0xae, 0xd4, 0x5a, 0xc4, 0x27, 0x81, 0x2d, 0x48, + 0xb3, 0xda, 0x0e, 0x98, 0x60, 0x68, 0x25, 0x86, 0xa8, 0x46, 0x10, 0x55, 0x0d, 0x51, 0x6d, 0x9f, + 0xb4, 0xaa, 0x52, 0xb1, 0x2a, 0x21, 0xf4, 0xaf, 0xee, 0xca, 0xc2, 0x4b, 0x09, 0xab, 0x2d, 0xd6, + 0x62, 0x35, 0x85, 0x74, 0xd8, 0x39, 0x52, 0xff, 0xd4, 0x1f, 0xf5, 0x4b, 0x5b, 0x58, 0x78, 0xe5, + 0xe4, 0x55, 0x5e, 0xa5, 0x4c, 0xba, 0xe1, 0xd9, 0xce, 0x31, 0xf5, 0x49, 0xd0, 0x33, 0xce, 0x51, + 0x5e, 0xf3, 0x88, 0xb0, 0x07, 0xf8, 0xb5, 0x50, 0x1b, 0xa6, 0x15, 0x74, 0x7c, 0x41, 0x3d, 0x92, + 0x51, 0xf8, 0xe6, 0x93, 0x14, 0xb8, 0x73, 0x4c, 0x3c, 0x3b, 0xa3, 0xf7, 0xf2, 0x30, 0xbd, 0x8e, + 0xa0, 0x6e, 0x8d, 0xfa, 0x82, 0x8b, 0x20, 0xa3, 0xf4, 0xa2, 0x51, 0x3a, 0xe9, 0x1c, 0x92, 0xc0, + 0x27, 0x82, 0xf0, 0x70, 0x45, 0x83, 0xd6, 0xf2, 0xda, 0x50, 0x69, 0x5e, 0x6b, 0x33, 0x97, 0x3a, + 0xbd, 0x5a, 0x77, 0xe5, 0x90, 0x08, 0x3b, 0xa3, 0x5a, 0xf9, 0xab, 0x05, 0x8b, 0xeb, 0x1d, 0x2e, + 0x98, 0x77, 0x8f, 0xb4, 0x5d, 0xd6, 0xf3, 0x88, 0x2f, 0x76, 0x85, 0x94, 0x68, 0xf5, 0x76, 0xec, + 0xc0, 0xf6, 0x38, 0x7a, 0x0e, 0xc6, 0xa8, 0x67, 0xb7, 0x48, 0xc9, 0x5a, 0xb2, 0x96, 0x8b, 0xf5, + 0xe9, 0x8f, 0x4f, 0xcb, 0x23, 0x67, 0xa7, 0xe5, 0xb1, 0x4d, 0x49, 0xc4, 0x9a, 0x87, 0xde, 0x83, + 0x49, 0xe2, 0x77, 0x69, 0xc0, 0x7c, 0x89, 0x50, 0x1a, 0x5d, 0xca, 0x2d, 0x4f, 0xae, 0x7e, 0xb9, + 0xaa, 0x1d, 0xab, 0xc6, 0x8e, 0x99, 0x2d, 0xa7, 0xd5, 0xee, 0x4a, 0x75, 0xc3, 0xef, 0x1e, 0xd8, + 0x41, 0x7d, 0xde, 0x00, 0x4e, 0x6e, 0xc4, 0x00, 0x38, 0x89, 0x86, 0x9e, 0x87, 0x09, 0x87, 0x79, + 0x9e, 0xed, 0x37, 0x4b, 0xb9, 0xa5, 0xdc, 0x72, 0xb1, 0x3e, 0x79, 0x76, 0x5a, 0x9e, 0x58, 0xd7, + 0x24, 0x1c, 0xf2, 0x2a, 0xff, 0xb0, 0x60, 0x36, 0x5e, 0xc5, 0xba, 0xdd, 0xe1, 0x04, 0xbd, 0x06, + 0x79, 0xd1, 0x6b, 0x87, 0xbe, 0x3f, 0x6f, 0x4c, 0xe5, 0xf7, 0x7a, 0x6d, 0xf2, 0xf9, 0x69, 0xf9, + 0x56, 0x2c, 0xbe, 0x17, 0xd0, 0x56, 0x8b, 0x04, 0x92, 0x81, 0x95, 0x0a, 0xfa, 0x89, 0x05, 0x53, + 0x6a, 0x71, 0x86, 0x55, 0x1a, 0x5d, 0xb2, 0x96, 0x27, 0x57, 0x1f, 0x54, 0x2f, 0x9c, 0xd1, 0xd5, + 0x3e, 0xaf, 0x36, 0x13, 0xa8, 0xf5, 0x1b, 0x67, 0xa7, 0xe5, 0xa9, 0x24, 0x05, 0xa7, 0xac, 0x56, + 0x7c, 0x78, 0xf6, 0x1c, 0x75, 0xb4, 0x0d, 0xf9, 0xa3, 0x80, 0x79, 0x6a, 0x81, 0x93, 0xab, 0x2f, + 0x9d, 0x1f, 0xf1, 0xed, 0xc3, 0xf7, 0x89, 0x23, 0x30, 0x39, 0x22, 0x01, 0xf1, 0x1d, 0x52, 0x9f, + 0x0a, 0xe3, 0x71, 0x3f, 0x60, 0x1e, 0x56, 0x40, 0x95, 0xc7, 0x39, 0x98, 0x4f, 0x18, 0x64, 0x7e, + 0x93, 0x0a, 0xca, 0x7c, 0xf4, 0x7a, 0x2a, 0x92, 0x5f, 0xe9, 0x8b, 0xe4, 0x9d, 0x01, 0x2a, 0x89, + 0x58, 0x1e, 0xc0, 0x38, 0x17, 0xb6, 0xe8, 0x70, 0x15, 0xc4, 0x62, 0xfd, 0x0d, 0xa3, 0x3e, 0xbe, + 0xab, 0xa8, 0x9f, 0x9f, 0x96, 0xcf, 0xcd, 0xf8, 0x6a, 0x84, 0xa9, 0xe5, 0xb1, 0x41, 0x43, 0x5d, + 0x40, 0xae, 0xcd, 0xc5, 0x5e, 0x60, 0xfb, 0x5c, 0xdb, 0xa4, 0x1e, 0x29, 0xe5, 0x54, 0x2c, 0xbe, + 0x16, 0xc6, 0x22, 0x59, 0x79, 0x61, 0x34, 0x78, 0x55, 0x36, 0x06, 0x19, 0x13, 0xa9, 0x51, 0x5f, + 0x30, 0xfe, 0xa0, 0x46, 0x06, 0x0d, 0x0f, 0xb0, 0x80, 0x5e, 0x80, 0xf1, 0x80, 0xd8, 0x9c, 0xf9, + 0xa5, 0xbc, 0x5a, 0xcf, 0x4c, 0xb8, 0x1e, 0xac, 0xa8, 0xd8, 0x70, 0xd1, 0x57, 0x61, 0xc2, 0x23, + 0x9c, 0xcb, 0xea, 0x19, 0x53, 0x82, 0xb3, 0x46, 0x70, 0x62, 0x4b, 0x93, 0x71, 0xc8, 0x47, 0xef, + 0xc3, 0x8c, 0x34, 0xb4, 0xdf, 0x6e, 0xda, 0x82, 0xa8, 0x65, 0x8c, 0x5f, 0x78, 0x19, 0xb7, 0x0d, + 0xfa, 0x4c, 0x23, 0x85, 0x84, 0xfb, 0x90, 0x2b, 0x7f, 0x1f, 0x85, 0x1b, 0xa9, 0x0d, 0x3b, 0xa2, + 0x2d, 0xf4, 0x43, 0x28, 0x48, 0xb0, 0xa6, 0x2d, 0x6c, 0x93, 0x4d, 0xdf, 0x78, 0x3a, 0xd3, 0x3a, + 0xab, 0xb6, 0x88, 0xb0, 0xeb, 0xc8, 0x38, 0x00, 0x31, 0x0d, 0x47, 0xa8, 0x88, 0x42, 0x9e, 0xb7, + 0x89, 0x63, 0x0a, 0xe9, 0xcd, 0xab, 0x15, 0x92, 0x72, 0x7a, 0xb7, 0x4d, 0x9c, 0x38, 0x8b, 0xe5, + 0x3f, 0xac, 0x4c, 0xa0, 0x87, 0x51, 0xc2, 0xe9, 0x64, 0xd8, 0xbc, 0x0e, 0x63, 0x0a, 0x30, 0xde, + 0xeb, 0x74, 0x2e, 0x56, 0x4e, 0x2d, 0xb8, 0xd9, 0xaf, 0xd2, 0xa0, 0x5c, 0xa0, 0xef, 0x67, 0x02, + 0x5b, 0x7d, 0xba, 0xc0, 0x4a, 0x6d, 0x15, 0xd6, 0x1b, 0xc6, 0x64, 0x21, 0xa4, 0x24, 0x82, 0x7a, + 0x0c, 0x63, 0x54, 0x10, 0x8f, 0x9b, 0x9e, 0xbb, 0x7e, 0x0d, 0x0b, 0x4d, 0xf4, 0x78, 0x89, 0x8c, + 0xb5, 0x81, 0xca, 0xef, 0x73, 0x50, 0xea, 0x17, 0xc5, 0xcc, 0x75, 0x0f, 0x6d, 0xe7, 0x04, 0x2d, + 0x41, 0xde, 0xb7, 0xbd, 0xb0, 0x3d, 0x44, 0x5b, 0xf2, 0xc0, 0xf6, 0x08, 0x56, 0x1c, 0xf4, 0x27, + 0x0b, 0x50, 0x47, 0xe5, 0x60, 0x73, 0xcd, 0xf7, 0x99, 0xb0, 0x65, 0x35, 0x85, 0x6e, 0x3b, 0xd7, + 0xe0, 0x76, 0xe8, 0x4b, 0x75, 0x3f, 0x63, 0x65, 0xc3, 0x17, 0x41, 0x2f, 0xae, 0xf2, 0xac, 0x00, + 0x1e, 0xe0, 0x1a, 0x7a, 0x68, 0xf2, 0x55, 0xa7, 0xd0, 0xf6, 0x35, 0xba, 0x38, 0x2c, 0x6f, 0x17, + 0x36, 0xe0, 0xce, 0x10, 0xef, 0xd1, 0x0d, 0xc8, 0x9d, 0x90, 0x9e, 0x0e, 0x30, 0x96, 0x3f, 0xd1, + 0x4d, 0x18, 0xeb, 0xda, 0x6e, 0x87, 0xe8, 0xa6, 0x8a, 0xf5, 0x9f, 0xbb, 0xa3, 0xaf, 0x5a, 0x95, + 0xbf, 0xe4, 0xe0, 0x4b, 0xe7, 0xd9, 0xbe, 0xf6, 0x63, 0x03, 0xbd, 0x08, 0x85, 0x80, 0x74, 0x29, + 0xa7, 0xcc, 0x57, 0xee, 0xe4, 0xe2, 0xa4, 0xc5, 0x86, 0x8e, 0x23, 0x09, 0xb4, 0x06, 0xb3, 0xd4, + 0x77, 0xdc, 0x4e, 0x33, 0x3c, 0xc7, 0x74, 0x9d, 0x16, 0xea, 0x77, 0x8c, 0xd2, 0xec, 0x66, 0x9a, + 0x8d, 0xfb, 0xe5, 0x93, 0x10, 0xc4, 0x6b, 0xbb, 0xb6, 0x20, 0xaa, 0x17, 0x0f, 0x80, 0x30, 0x6c, + 0xdc, 0x2f, 0x8f, 0x0e, 0xe0, 0xb6, 0x21, 0x61, 0xd2, 0x76, 0xa9, 0xa3, 0xa2, 0x2d, 0xcb, 0x4b, + 0x35, 0xeb, 0x42, 0x7d, 0xd1, 0x20, 0xdd, 0xde, 0x1c, 0x28, 0x85, 0x87, 0x68, 0x27, 0x5c, 0x0b, + 0x47, 0x29, 0xd5, 0xcb, 0xb3, 0xae, 0x85, 0x6c, 0xdc, 0x2f, 0x5f, 0xf9, 0xdd, 0x78, 0xb6, 0x99, + 0xa8, 0x8d, 0xe3, 0x50, 0xe0, 0x21, 0xa8, 0xde, 0xbc, 0x8d, 0x2b, 0xe5, 0x65, 0x68, 0x31, 0xde, + 0xae, 0xc8, 0xa9, 0xc8, 0x10, 0xea, 0x42, 0x41, 0x84, 0xfb, 0xa4, 0x9b, 0x77, 0xe3, 0x4a, 0x46, + 0xcd, 0x26, 0xee, 0xc8, 0xd9, 0x94, 0x12, 0x5e, 0x9f, 0x92, 0x76, 0xa3, 0xad, 0x8e, 0x6c, 0xa1, + 0x65, 0x99, 0x54, 0x2a, 0xb6, 0x3a, 0x3f, 0xc6, 0xb4, 0xa4, 0x89, 0x37, 0xc7, 0x11, 0x17, 0x35, + 0xe0, 0x66, 0x98, 0x5c, 0x6f, 0x51, 0x2e, 0x58, 0xd0, 0x6b, 0x50, 0x8f, 0x0a, 0x95, 0x12, 0x63, + 0xf5, 0xd2, 0xd9, 0x69, 0xf9, 0x26, 0x1e, 0xc0, 0xc7, 0x03, 0xb5, 0x64, 0x33, 0x13, 0x84, 0x0b, + 0x93, 0x06, 0x51, 0xba, 0xef, 0x11, 0x2e, 0xb0, 0xe2, 0xc8, 0x01, 0xa0, 0x2d, 0x67, 0xb1, 0xa6, + 0xd9, 0xd9, 0xe8, 0x50, 0xd8, 0x51, 0x54, 0x6c, 0xb8, 0xe8, 0xc7, 0x16, 0x14, 0x38, 0x71, 0x89, + 0x23, 0x58, 0x50, 0x9a, 0x50, 0xad, 0x6e, 0xff, 0x9a, 0xce, 0xbd, 0xea, 0xae, 0xc1, 0xd5, 0xcd, + 0x2d, 0xde, 0x3f, 0x43, 0xc6, 0x91, 0x61, 0xf4, 0x0e, 0x14, 0x44, 0x58, 0x24, 0x85, 0xa7, 0xa9, + 0xf8, 0x1d, 0xd6, 0x0c, 0xab, 0x44, 0xb7, 0x2a, 0xb5, 0x41, 0x61, 0x21, 0x45, 0x60, 0x32, 0xd3, + 0x3d, 0xea, 0x63, 0x62, 0x37, 0x7b, 0xbb, 0xc4, 0x61, 0x7e, 0x93, 0x97, 0x8a, 0x2a, 0xe2, 0x51, + 0xa6, 0x6f, 0xa5, 0xd9, 0xb8, 0x5f, 0x7e, 0xe1, 0x75, 0x98, 0x4e, 0x2d, 0xe4, 0x42, 0x7d, 0xee, + 0x93, 0x31, 0xb8, 0x3d, 0xf8, 0x98, 0x46, 0xaf, 0xc3, 0xb4, 0x74, 0x91, 0x8b, 0x03, 0x12, 0xa8, + 0xae, 0x64, 0xa9, 0xae, 0x74, 0xcb, 0x38, 0x36, 0xdd, 0x48, 0x32, 0x71, 0x5a, 0x16, 0xbd, 0x0d, + 0x88, 0x1d, 0x72, 0x12, 0x74, 0x49, 0xf3, 0x4d, 0x7d, 0x63, 0x8a, 0xfb, 0x5a, 0x74, 0x8a, 0x6c, + 0x67, 0x24, 0xf0, 0x00, 0x2d, 0xdd, 0x19, 0x53, 0x49, 0x9c, 0xe8, 0x8c, 0x99, 0x44, 0x5e, 0x83, + 0x59, 0x73, 0x12, 0x85, 0x4c, 0x93, 0xc3, 0x51, 0x44, 0xf7, 0xd3, 0x6c, 0xdc, 0x2f, 0x8f, 0xde, + 0x84, 0x39, 0xbb, 0x6b, 0x53, 0xd7, 0x3e, 0x74, 0x49, 0x04, 0x32, 0xa6, 0x40, 0x9e, 0x31, 0x20, + 0x73, 0x6b, 0xfd, 0x02, 0x38, 0xab, 0x83, 0xb6, 0x60, 0xbe, 0xe3, 0x67, 0xa1, 0xc6, 0x15, 0xd4, + 0xb3, 0x06, 0x6a, 0x7e, 0x3f, 0x2b, 0x82, 0x07, 0xe9, 0xa1, 0x13, 0x98, 0x68, 0x12, 0x61, 0x53, + 0x97, 0x97, 0x26, 0x54, 0x12, 0xde, 0xbb, 0x52, 0x25, 0xdc, 0xd3, 0x58, 0xfa, 0x32, 0x68, 0xfe, + 0xe0, 0xd0, 0x02, 0xfa, 0x11, 0x80, 0x13, 0x5e, 0x1a, 0x78, 0xa9, 0xa0, 0x2a, 0xef, 0xfe, 0x55, + 0x2b, 0x4f, 0xc3, 0xc5, 0x53, 0x6e, 0x44, 0xe2, 0x38, 0x61, 0x4d, 0xa6, 0x5e, 0x20, 0x53, 0x3c, + 0x8a, 0x98, 0xae, 0x89, 0x28, 0xf5, 0x70, 0x92, 0x89, 0xd3, 0xb2, 0x95, 0x3f, 0x58, 0x30, 0x97, + 0x59, 0x64, 0xf2, 0x22, 0x61, 0x3d, 0xf1, 0x22, 0x31, 0xee, 0xc8, 0xe6, 0x13, 0x8e, 0x56, 0xf5, + 0xab, 0x5f, 0x58, 0xe3, 0xf6, 0xa6, 0xfe, 0x72, 0x6c, 0x2c, 0x54, 0x66, 0x61, 0x3a, 0x16, 0x6d, + 0xb0, 0x56, 0xe5, 0xe7, 0xf9, 0xe4, 0xb9, 0xd5, 0x60, 0xad, 0xed, 0xb6, 0x8e, 0x49, 0x0d, 0x8a, + 0x0e, 0xf3, 0x85, 0x2d, 0x47, 0x5d, 0xb3, 0x84, 0x39, 0x03, 0x5a, 0x5c, 0x0f, 0x19, 0x38, 0x96, + 0x91, 0x1d, 0xf6, 0x88, 0xb9, 0x2e, 0xfb, 0x40, 0x95, 0x5d, 0xa2, 0xc3, 0xde, 0x57, 0x54, 0x6c, + 0xb8, 0xb2, 0xbc, 0xda, 0xb2, 0x89, 0xb3, 0x4e, 0x38, 0x43, 0x44, 0xe5, 0xb5, 0x63, 0xe8, 0x38, + 0x92, 0x40, 0xaf, 0xc0, 0x14, 0xa7, 0xbe, 0x43, 0xc2, 0x6e, 0x95, 0xd7, 0xa3, 0x8a, 0xbc, 0x83, + 0xef, 0x26, 0xe8, 0x38, 0x25, 0x85, 0xde, 0x81, 0xa2, 0xfa, 0xaf, 0xae, 0x65, 0x63, 0x17, 0xbe, + 0x96, 0x4d, 0xcb, 0x45, 0xee, 0x86, 0x00, 0x38, 0xc6, 0x42, 0xab, 0x00, 0x82, 0x7a, 0x84, 0x0b, + 0xdb, 0x6b, 0x73, 0x73, 0x94, 0x44, 0xd9, 0xb5, 0x17, 0x71, 0x70, 0x42, 0x0a, 0x7d, 0x1d, 0x8a, + 0x32, 0x27, 0x1a, 0xd4, 0x27, 0xba, 0x90, 0x72, 0xda, 0xc0, 0x5e, 0x48, 0xc4, 0x31, 0x1f, 0x55, + 0x01, 0x5c, 0x79, 0xa4, 0xd5, 0x7b, 0x82, 0x70, 0xd5, 0xfb, 0x73, 0xf5, 0x19, 0x09, 0xde, 0x88, + 0xa8, 0x38, 0x21, 0x21, 0xa3, 0xee, 0xb3, 0x0f, 0x6c, 0x2a, 0x54, 0xce, 0x26, 0xa2, 0xfe, 0x80, + 0xbd, 0x63, 0x53, 0x81, 0x0d, 0x17, 0x3d, 0x0f, 0x13, 0x5d, 0xd3, 0x57, 0x41, 0x81, 0xaa, 0x2a, + 0x0c, 0xbb, 0x69, 0xc8, 0xab, 0xfc, 0x33, 0x95, 0xcc, 0x98, 0x3c, 0xec, 0xc8, 0xc3, 0xf3, 0xc9, + 0x77, 0x85, 0x17, 0x60, 0x5c, 0x37, 0xe4, 0xfe, 0xcd, 0xd7, 0x5d, 0x1b, 0x1b, 0x2e, 0x7a, 0x0e, + 0xc6, 0x8e, 0x58, 0xe0, 0x10, 0xb3, 0xf3, 0xd1, 0xbd, 0xe5, 0xbe, 0x24, 0x62, 0xcd, 0x43, 0x07, + 0x30, 0x4b, 0x1e, 0xa5, 0x87, 0xcd, 0xbc, 0x7a, 0x46, 0x7a, 0x51, 0xb6, 0xd3, 0x8d, 0x34, 0x6b, + 0xf8, 0xab, 0x50, 0x3f, 0x48, 0xe5, 0xcf, 0x05, 0x40, 0xd9, 0x41, 0x0a, 0xdd, 0x4d, 0x3d, 0x94, + 0xbc, 0xd0, 0xf7, 0x50, 0x72, 0x3b, 0xab, 0x91, 0x78, 0x27, 0xf9, 0xa9, 0x05, 0x53, 0x8e, 0x7a, + 0x8e, 0xd3, 0x8f, 0x6f, 0x66, 0xda, 0xfa, 0xee, 0x25, 0x4a, 0xf8, 0xfc, 0x57, 0x3d, 0x9d, 0xf2, + 0xeb, 0x09, 0x53, 0x38, 0x65, 0x18, 0xfd, 0xd2, 0x82, 0x99, 0x80, 0x38, 0x01, 0xb1, 0x05, 0x31, + 0xbe, 0xe8, 0x6b, 0xd0, 0xee, 0x25, 0x7c, 0xc1, 0x06, 0x68, 0xa8, 0x37, 0xe8, 0xec, 0xb4, 0x3c, + 0x83, 0x53, 0xe6, 0x70, 0x9f, 0x79, 0xf4, 0x33, 0x0b, 0xa6, 0x03, 0xe6, 0xba, 0xd4, 0x6f, 0x19, + 0x87, 0xf2, 0xca, 0x21, 0x7c, 0x19, 0x87, 0x34, 0xce, 0x50, 0x7f, 0xe6, 0x54, 0x9b, 0x4e, 0x1a, + 0xc3, 0x69, 0xdb, 0xc8, 0x81, 0x62, 0x40, 0x38, 0xeb, 0x04, 0x0e, 0xe1, 0xa6, 0x25, 0xac, 0x9e, + 0x3f, 0x53, 0x61, 0x23, 0x2e, 0xab, 0x80, 0x06, 0x44, 0x5a, 0xe5, 0x71, 0x0f, 0x0c, 0xb9, 0x1c, + 0xc7, 0xb8, 0xa8, 0x27, 0xcb, 0xe0, 0x90, 0xb8, 0xb2, 0x35, 0xe4, 0x2e, 0x99, 0x07, 0xd9, 0x35, + 0x56, 0x1b, 0x0a, 0x53, 0x8f, 0x8d, 0x89, 0xca, 0x92, 0x44, 0x6c, 0x0c, 0xa2, 0x5f, 0x58, 0x30, + 0x69, 0x27, 0xae, 0xe9, 0x7a, 0x76, 0x3d, 0xb8, 0x1e, 0x07, 0x32, 0x37, 0xf3, 0xe8, 0x0d, 0x38, + 0x79, 0x25, 0x4f, 0xda, 0x47, 0xdb, 0x70, 0xcb, 0x76, 0x04, 0xed, 0x92, 0x7b, 0xc4, 0x6e, 0xba, + 0xd4, 0x8f, 0x3a, 0xb8, 0xee, 0x69, 0xcf, 0x9c, 0x9d, 0x96, 0x6f, 0xad, 0x0d, 0x12, 0xc0, 0x83, + 0xf5, 0x16, 0x5e, 0x83, 0xc9, 0x44, 0x1c, 0x2e, 0x32, 0x75, 0x2e, 0xbc, 0x01, 0x37, 0xae, 0x74, + 0x3b, 0xff, 0xe3, 0x28, 0x54, 0x32, 0x3d, 0x46, 0xbd, 0xea, 0xae, 0x1f, 0xdb, 0x7e, 0x2b, 0x4c, + 0xf8, 0x1a, 0x14, 0xed, 0x8e, 0x60, 0x9e, 0x2d, 0xa8, 0xa3, 0x80, 0x0b, 0x71, 0xba, 0xac, 0x85, + 0x0c, 0x1c, 0xcb, 0xa0, 0xbb, 0x30, 0x13, 0x9d, 0x9f, 0xb2, 0x99, 0xea, 0x09, 0xa0, 0xa8, 0xab, + 0x6b, 0x3d, 0xc5, 0xc1, 0x7d, 0x92, 0xd1, 0x83, 0x40, 0xee, 0xba, 0x1e, 0x04, 0xde, 0x0e, 0x9f, + 0x66, 0xd5, 0xea, 0x48, 0x53, 0xad, 0xcf, 0x3c, 0x97, 0xf6, 0x3d, 0xb7, 0x26, 0x25, 0xf0, 0x00, + 0xad, 0xca, 0x47, 0x16, 0x3c, 0x33, 0xf4, 0xf6, 0x88, 0x58, 0xf8, 0x02, 0x66, 0xa9, 0x1c, 0x7d, + 0xfb, 0xda, 0xae, 0xa6, 0xbd, 0xc1, 0x0f, 0x61, 0x77, 0x0b, 0xbf, 0xfe, 0x6d, 0x79, 0xe4, 0xc3, + 0x7f, 0x2d, 0x8d, 0x54, 0xfe, 0x6b, 0xc1, 0x9d, 0x21, 0xba, 0x57, 0xf9, 0xf4, 0xf0, 0x1b, 0x0b, + 0xe6, 0x68, 0x7f, 0x3e, 0x98, 0xb3, 0x60, 0xff, 0x3a, 0x96, 0x97, 0x49, 0xb6, 0xfa, 0x2d, 0x79, + 0x2b, 0xc8, 0x90, 0x71, 0xd6, 0x8d, 0xca, 0x67, 0x16, 0xcc, 0x6c, 0x3c, 0x22, 0xce, 0x03, 0xf2, + 0xc1, 0x0e, 0x6b, 0xbe, 0xc5, 0xd8, 0x49, 0xf2, 0x03, 0x8d, 0x35, 0xfc, 0x03, 0x0d, 0x5a, 0x87, + 0x1c, 0xf1, 0xbb, 0x17, 0xfa, 0x38, 0x34, 0x69, 0xc2, 0x96, 0xdb, 0xf0, 0xbb, 0x58, 0x6a, 0xcb, + 0xe1, 0x3a, 0x95, 0xba, 0x2a, 0x63, 0x8b, 0xf1, 0x70, 0x9d, 0xca, 0x73, 0x9c, 0x96, 0x55, 0x63, + 0x0b, 0x73, 0x3b, 0xb2, 0x34, 0xf2, 0xb1, 0xa3, 0x07, 0x9a, 0x84, 0x43, 0x5e, 0xe5, 0x6f, 0xa3, + 0x30, 0xdd, 0xa0, 0x47, 0xc4, 0xe9, 0x39, 0x2e, 0x51, 0x2b, 0xfc, 0x1e, 0x4c, 0x1f, 0xd9, 0xd4, + 0xed, 0x04, 0x44, 0xef, 0xae, 0xd9, 0xd5, 0x97, 0x43, 0xab, 0xf7, 0x93, 0xcc, 0xcf, 0x4f, 0xcb, + 0x0b, 0x29, 0xf5, 0x14, 0x17, 0xa7, 0x91, 0xd0, 0x43, 0x00, 0x12, 0x85, 0xd3, 0x6c, 0xf2, 0xda, + 0x25, 0x36, 0x39, 0xbd, 0x27, 0x7a, 0xca, 0x8b, 0x69, 0x38, 0x61, 0x04, 0xb5, 0xe5, 0x08, 0xd9, + 0x52, 0xbb, 0xcd, 0xd5, 0x27, 0xb5, 0xc9, 0xd5, 0x6f, 0x5f, 0xc2, 0xe2, 0x9e, 0xc1, 0x50, 0xf6, + 0xa2, 0xd6, 0x14, 0x52, 0xd5, 0x1c, 0x6a, 0x7e, 0x56, 0xfe, 0x37, 0x0a, 0x4b, 0x4f, 0x9a, 0x02, + 0x64, 0xff, 0x92, 0x73, 0x2e, 0xeb, 0x88, 0xb0, 0xb9, 0xeb, 0x3b, 0xbb, 0xea, 0x5f, 0x7b, 0x29, + 0x0e, 0xee, 0x93, 0x44, 0xef, 0x41, 0xae, 0x1d, 0x10, 0x13, 0xbe, 0xef, 0x5c, 0x62, 0x31, 0xa9, + 0x0d, 0xab, 0x4f, 0xc8, 0x9c, 0xdb, 0x09, 0x08, 0x96, 0xa8, 0x12, 0xdc, 0xa3, 0x4d, 0xd3, 0x1b, + 0xaf, 0x09, 0x7c, 0x8b, 0x36, 0xb1, 0x44, 0x45, 0x3f, 0x80, 0x7c, 0x9b, 0x71, 0x61, 0xa6, 0x99, + 0xab, 0xa3, 0x17, 0x64, 0x97, 0xd9, 0x61, 0x5c, 0x60, 0x85, 0x5b, 0xf9, 0x4f, 0x1e, 0xca, 0x4f, + 0x98, 0x77, 0xd0, 0x26, 0xcc, 0xeb, 0x57, 0x84, 0x1d, 0x12, 0x50, 0xd6, 0x4c, 0x87, 0xff, 0x8e, + 0xba, 0xe5, 0x67, 0xd9, 0x78, 0x90, 0x0e, 0xfa, 0x16, 0xcc, 0x52, 0x5f, 0x90, 0xa0, 0x6b, 0xbb, + 0x21, 0x8c, 0x7e, 0x37, 0x99, 0xd7, 0x0f, 0x9f, 0x29, 0x16, 0xee, 0x97, 0x1d, 0x90, 0x03, 0xb9, + 0xa7, 0xce, 0x01, 0x17, 0x66, 0x3c, 0xfb, 0x51, 0xe2, 0x3d, 0xc2, 0xc4, 0x74, 0xf8, 0x77, 0xac, + 0x8e, 0xa0, 0x6e, 0x55, 0x7f, 0x83, 0xaf, 0x6e, 0xfa, 0x62, 0x3b, 0xd8, 0x15, 0x01, 0xf5, 0x5b, + 0xda, 0xda, 0x56, 0x0a, 0x0b, 0xf7, 0x61, 0xa3, 0x77, 0xa1, 0xe0, 0xd9, 0x8f, 0x76, 0x3b, 0x41, + 0x2b, 0xbc, 0x13, 0x5e, 0xdc, 0x8e, 0x7a, 0x57, 0xdb, 0x32, 0x28, 0x38, 0xc2, 0x0b, 0xb3, 0x79, + 0xe2, 0x0b, 0xc9, 0xe6, 0x30, 0xe1, 0x0a, 0x5f, 0x50, 0xc2, 0x7d, 0x64, 0xc1, 0x54, 0xb2, 0x35, + 0x64, 0x5b, 0xb6, 0x75, 0x81, 0x96, 0xbd, 0x09, 0xa3, 0x82, 0x99, 0xba, 0xbe, 0xe0, 0x58, 0x02, + 0xc6, 0xc0, 0xe8, 0x1e, 0xc3, 0xa3, 0x82, 0xd5, 0x97, 0x3f, 0x7e, 0xbc, 0x38, 0xf2, 0xc9, 0xe3, + 0xc5, 0x91, 0x4f, 0x1f, 0x2f, 0x8e, 0x7c, 0x78, 0xb6, 0x68, 0x7d, 0x7c, 0xb6, 0x68, 0x7d, 0x72, + 0xb6, 0x68, 0x7d, 0x7a, 0xb6, 0x68, 0x7d, 0x76, 0xb6, 0x68, 0xfd, 0xea, 0xdf, 0x8b, 0x23, 0xef, + 0x8e, 0x76, 0x57, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x9f, 0x1e, 0x38, 0xf9, 0x22, 0x00, + 0x00, } diff --git a/pkg/apps/apis/apps/v1/generated.proto b/pkg/apps/apis/apps/v1/generated.proto index eaef6d5d4ee7..a9bbd918a2fd 100644 --- a/pkg/apps/apis/apps/v1/generated.proto +++ b/pkg/apps/apis/apps/v1/generated.proto @@ -130,6 +130,7 @@ message DeploymentConfigRollbackSpec { // DeploymentConfigSpec represents the desired state of the deployment. message DeploymentConfigSpec { // Strategy describes how a deployment is executed. + // +optional optional DeploymentStrategy strategy = 1; // MinReadySeconds is the minimum number of seconds for which a newly created pod should @@ -140,9 +141,11 @@ message DeploymentConfigSpec { // Triggers determine how updates to a DeploymentConfig result in new deployments. If no triggers // are defined, a new deployment can only occur as a result of an explicit client update to the // DeploymentConfig with a new LatestVersion. If null, defaults to having a config change trigger. + // +optional optional DeploymentTriggerPolicies triggers = 2; // Replicas is the number of desired replicas. + // +optional optional int32 replicas = 3; // RevisionHistoryLimit is the number of old ReplicationControllers to retain to allow for rollbacks. @@ -153,6 +156,7 @@ message DeploymentConfigSpec { // Test ensures that this deployment config will have zero replicas except while a deployment is running. This allows the // deployment config to be used as a continuous deployment test - triggering on images, running the deployment, and then succeeding // or failing. Post strategy hooks and After actions can be used to integrate successful deployment with an action. + // +optional optional bool test = 5; // Paused indicates that the deployment config is paused resulting in no new deployments on template diff --git a/pkg/apps/apis/apps/v1/types.go b/pkg/apps/apis/apps/v1/types.go index 912bd913b659..a1be00fa5e4e 100644 --- a/pkg/apps/apis/apps/v1/types.go +++ b/pkg/apps/apis/apps/v1/types.go @@ -33,12 +33,13 @@ type DeploymentConfig struct { Spec DeploymentConfigSpec `json:"spec" protobuf:"bytes,2,opt,name=spec"` // Status represents the current deployment state. - Status DeploymentConfigStatus `json:"status" protobuf:"bytes,3,opt,name=status"` + Status DeploymentConfigStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } // DeploymentConfigSpec represents the desired state of the deployment. type DeploymentConfigSpec struct { // Strategy describes how a deployment is executed. + // +optional Strategy DeploymentStrategy `json:"strategy" protobuf:"bytes,1,opt,name=strategy"` // MinReadySeconds is the minimum number of seconds for which a newly created pod should @@ -49,10 +50,12 @@ type DeploymentConfigSpec struct { // Triggers determine how updates to a DeploymentConfig result in new deployments. If no triggers // are defined, a new deployment can only occur as a result of an explicit client update to the // DeploymentConfig with a new LatestVersion. If null, defaults to having a config change trigger. + // +optional Triggers DeploymentTriggerPolicies `json:"triggers" protobuf:"bytes,2,rep,name=triggers"` // Replicas is the number of desired replicas. - Replicas int32 `json:"replicas" protobuf:"varint,3,opt,name=replicas"` + // +optional + Replicas *int32 `json:"replicas" protobuf:"varint,3,opt,name=replicas"` // RevisionHistoryLimit is the number of old ReplicationControllers to retain to allow for rollbacks. // This field is a pointer to allow for differentiation between an explicit zero and not specified. @@ -62,6 +65,7 @@ type DeploymentConfigSpec struct { // Test ensures that this deployment config will have zero replicas except while a deployment is running. This allows the // deployment config to be used as a continuous deployment test - triggering on images, running the deployment, and then succeeding // or failing. Post strategy hooks and After actions can be used to integrate successful deployment with an action. + // +optional Test bool `json:"test" protobuf:"varint,5,opt,name=test"` // Paused indicates that the deployment config is paused resulting in no new deployments on template diff --git a/pkg/apps/apis/apps/v1/zz_generated.conversion.go b/pkg/apps/apis/apps/v1/zz_generated.conversion.go index 4f4a6eded667..25f103328469 100644 --- a/pkg/apps/apis/apps/v1/zz_generated.conversion.go +++ b/pkg/apps/apis/apps/v1/zz_generated.conversion.go @@ -357,7 +357,9 @@ func autoConvert_v1_DeploymentConfigSpec_To_apps_DeploymentConfigSpec(in *Deploy } else { out.Triggers = nil } - out.Replicas = in.Replicas + if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { + return err + } out.RevisionHistoryLimit = (*int32)(unsafe.Pointer(in.RevisionHistoryLimit)) out.Test = in.Test out.Paused = in.Paused @@ -395,7 +397,9 @@ func autoConvert_apps_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *apps.D } else { out.Triggers = make(DeploymentTriggerPolicies, 0) } - out.Replicas = in.Replicas + if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { + return err + } out.RevisionHistoryLimit = (*int32)(unsafe.Pointer(in.RevisionHistoryLimit)) out.Test = in.Test out.Paused = in.Paused diff --git a/pkg/apps/apis/apps/v1/zz_generated.deepcopy.go b/pkg/apps/apis/apps/v1/zz_generated.deepcopy.go index 940ac7411d06..0cfa96d66d84 100644 --- a/pkg/apps/apis/apps/v1/zz_generated.deepcopy.go +++ b/pkg/apps/apis/apps/v1/zz_generated.deepcopy.go @@ -192,6 +192,11 @@ func DeepCopy_v1_DeploymentConfigSpec(in interface{}, out interface{}, c *conver } } } + if in.Replicas != nil { + in, out := &in.Replicas, &out.Replicas + *out = new(int32) + **out = **in + } if in.RevisionHistoryLimit != nil { in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit *out = new(int32) diff --git a/pkg/apps/cmd/generate.go b/pkg/apps/cmd/generate.go index 2d18af8846e1..d0caf26c3e71 100644 --- a/pkg/apps/cmd/generate.go +++ b/pkg/apps/cmd/generate.go @@ -30,7 +30,7 @@ func (BasicDeploymentConfigController) Generate(genericParams map[string]interfa ObjectMeta: t.ObjectMeta, Spec: deployapi.DeploymentConfigSpec{ Selector: t.Spec.Selector, - Replicas: *t.Spec.Replicas, // the generator never leaves this nil + Replicas: t.Spec.Replicas, // the generator never leaves this nil Template: t.Spec.Template, }, } diff --git a/pkg/image/apis/image/v1/generated.proto b/pkg/image/apis/image/v1/generated.proto index 34c91b297553..bfdb3c8183a8 100644 --- a/pkg/image/apis/image/v1/generated.proto +++ b/pkg/image/apis/image/v1/generated.proto @@ -461,6 +461,7 @@ message TagReference { optional string name = 1; // Optional; if specified, annotations that are applied to images retrieved via ImageStreamTags. + // +optional map annotations = 2; // Optional; if specified, a reference to another image that this tag should point to. Valid values @@ -478,6 +479,7 @@ message TagReference { // to import the newest remote tag. To trigger a new import, clients may set this value to zero which // will reset the generation to the latest stream generation. Legacy clients will send this value as // nil which will be merged with the current tag generation. + // +optional optional int64 generation = 5; // ImportPolicy is information that controls how images may be imported by the server. diff --git a/pkg/image/apis/image/v1/types.go b/pkg/image/apis/image/v1/types.go index 556875b81811..49fb45044611 100644 --- a/pkg/image/apis/image/v1/types.go +++ b/pkg/image/apis/image/v1/types.go @@ -203,6 +203,7 @@ type TagReference struct { // Name of the tag Name string `json:"name" protobuf:"bytes,1,opt,name=name"` // Optional; if specified, annotations that are applied to images retrieved via ImageStreamTags. + // +optional Annotations map[string]string `json:"annotations" protobuf:"bytes,2,rep,name=annotations"` // Optional; if specified, a reference to another image that this tag should point to. Valid values // are ImageStreamTag, ImageStreamImage, and DockerImage. @@ -217,6 +218,7 @@ type TagReference struct { // to import the newest remote tag. To trigger a new import, clients may set this value to zero which // will reset the generation to the latest stream generation. Legacy clients will send this value as // nil which will be merged with the current tag generation. + // +optional Generation *int64 `json:"generation" protobuf:"varint,5,opt,name=generation"` // ImportPolicy is information that controls how images may be imported by the server. ImportPolicy TagImportPolicy `json:"importPolicy,omitempty" protobuf:"bytes,6,opt,name=importPolicy"` diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go index b474ca9081ff..9116ef442d2c 100644 --- a/pkg/openapi/zz_generated.openapi.go +++ b/pkg/openapi/zz_generated.openapi.go @@ -192,7 +192,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope }, }, }, - Required: []string{"spec", "status"}, + Required: []string{"spec"}, }, }, Dependencies: []string{ @@ -429,7 +429,6 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope }, }, }, - Required: []string{"strategy", "triggers", "replicas", "test"}, }, }, Dependencies: []string{ @@ -6741,7 +6740,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope }, }, }, - Required: []string{"name", "annotations", "generation"}, + Required: []string{"name"}, }, }, Dependencies: []string{