From 8a79c5cde71c3317c7358d7c7619c8748e104759 Mon Sep 17 00:00:00 2001 From: Simon Behar Date: Thu, 16 Jan 2020 15:34:20 -0800 Subject: [PATCH] fix: Fixed grammar on TTLStrategy --- api/openapi-spec/swagger.json | 6 +- .../cronworkflow/cron-workflow.swagger.json | 6 +- cmd/server/workflow/workflow.swagger.json | 6 +- .../workflow-archive.swagger.json | 6 +- examples/gc-ttl.yaml | 8 +- pkg/apis/workflow/v1alpha1/generated.pb.go | 297 +++++++++--------- pkg/apis/workflow/v1alpha1/generated.proto | 6 +- .../workflow/v1alpha1/openapi_generated.go | 6 +- pkg/apis/workflow/v1alpha1/workflow_types.go | 8 +- .../v1alpha1/zz_generated.deepcopy.go | 8 +- workflow/ttlcontroller/ttlcontroller.go | 14 +- workflow/ttlcontroller/ttlcontroller_test.go | 26 +- workflow/util/util.go | 6 +- 13 files changed, 201 insertions(+), 202 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 653f13d2569d..22c2e23608b3 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -1201,11 +1201,11 @@ "description": "TTLStrategy is the strategy for the time to live depending on if the workflow succeded or failed", "type": "object", "properties": { - "secondsAfterCompleted": { + "secondsAfterCompletion": { "type": "integer", "format": "int32" }, - "secondsAfterFailed": { + "secondsAfterFailure": { "type": "integer", "format": "int32" }, @@ -1763,7 +1763,7 @@ "x-kubernetes-patch-strategy": "merge" }, "ttlSecondsAfterFinished": { - "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution (Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be deleted after ttlSecondsAfterFinished expires. If this field is unset, ttlSecondsAfterFinished will not expire. If this field is set to zero, ttlSecondsAfterFinished expires immediately after the Workflow finishes. DEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead.", + "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution (Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be deleted after ttlSecondsAfterFinished expires. If this field is unset, ttlSecondsAfterFinished will not expire. If this field is set to zero, ttlSecondsAfterFinished expires immediately after the Workflow finishes. DEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead.", "type": "integer", "format": "int32" }, diff --git a/cmd/server/cronworkflow/cron-workflow.swagger.json b/cmd/server/cronworkflow/cron-workflow.swagger.json index 39a8e718a1a8..2f4a3912abd2 100644 --- a/cmd/server/cronworkflow/cron-workflow.swagger.json +++ b/cmd/server/cronworkflow/cron-workflow.swagger.json @@ -3598,7 +3598,7 @@ "v1alpha1TTLStrategy": { "type": "object", "properties": { - "secondsAfterCompleted": { + "secondsAfterCompletion": { "type": "integer", "format": "int32" }, @@ -3606,7 +3606,7 @@ "type": "integer", "format": "int32" }, - "secondsAfterFailed": { + "secondsAfterFailure": { "type": "integer", "format": "int32" } @@ -3940,7 +3940,7 @@ "ttlSecondsAfterFinished": { "type": "integer", "format": "int32", - "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution\n(Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be\ndeleted after ttlSecondsAfterFinished expires. If this field is unset,\nttlSecondsAfterFinished will not expire. If this field is set to zero,\nttlSecondsAfterFinished expires immediately after the Workflow finishes.\nDEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead." + "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution\n(Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be\ndeleted after ttlSecondsAfterFinished expires. If this field is unset,\nttlSecondsAfterFinished will not expire. If this field is set to zero,\nttlSecondsAfterFinished expires immediately after the Workflow finishes.\nDEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead." }, "ttlStrategy": { "$ref": "#/definitions/v1alpha1TTLStrategy", diff --git a/cmd/server/workflow/workflow.swagger.json b/cmd/server/workflow/workflow.swagger.json index 8693decd3156..520762be2275 100644 --- a/cmd/server/workflow/workflow.swagger.json +++ b/cmd/server/workflow/workflow.swagger.json @@ -3905,7 +3905,7 @@ "v1alpha1TTLStrategy": { "type": "object", "properties": { - "secondsAfterCompleted": { + "secondsAfterCompletion": { "type": "integer", "format": "int32" }, @@ -3913,7 +3913,7 @@ "type": "integer", "format": "int32" }, - "secondsAfterFailed": { + "secondsAfterFailure": { "type": "integer", "format": "int32" } @@ -4277,7 +4277,7 @@ "ttlSecondsAfterFinished": { "type": "integer", "format": "int32", - "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution\n(Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be\ndeleted after ttlSecondsAfterFinished expires. If this field is unset,\nttlSecondsAfterFinished will not expire. If this field is set to zero,\nttlSecondsAfterFinished expires immediately after the Workflow finishes.\nDEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead." + "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution\n(Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be\ndeleted after ttlSecondsAfterFinished expires. If this field is unset,\nttlSecondsAfterFinished will not expire. If this field is set to zero,\nttlSecondsAfterFinished expires immediately after the Workflow finishes.\nDEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead." }, "ttlStrategy": { "$ref": "#/definitions/v1alpha1TTLStrategy", diff --git a/cmd/server/workflowarchive/workflow-archive.swagger.json b/cmd/server/workflowarchive/workflow-archive.swagger.json index 24cf7c490a6d..fc2520f668ba 100644 --- a/cmd/server/workflowarchive/workflow-archive.swagger.json +++ b/cmd/server/workflowarchive/workflow-archive.swagger.json @@ -3235,7 +3235,7 @@ "v1alpha1TTLStrategy": { "type": "object", "properties": { - "secondsAfterCompleted": { + "secondsAfterCompletion": { "type": "integer", "format": "int32" }, @@ -3243,7 +3243,7 @@ "type": "integer", "format": "int32" }, - "secondsAfterFailed": { + "secondsAfterFailure": { "type": "integer", "format": "int32" } @@ -3607,7 +3607,7 @@ "ttlSecondsAfterFinished": { "type": "integer", "format": "int32", - "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution\n(Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be\ndeleted after ttlSecondsAfterFinished expires. If this field is unset,\nttlSecondsAfterFinished will not expire. If this field is set to zero,\nttlSecondsAfterFinished expires immediately after the Workflow finishes.\nDEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead." + "description": "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution\n(Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be\ndeleted after ttlSecondsAfterFinished expires. If this field is unset,\nttlSecondsAfterFinished will not expire. If this field is set to zero,\nttlSecondsAfterFinished expires immediately after the Workflow finishes.\nDEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead." }, "ttlStrategy": { "$ref": "#/definitions/v1alpha1TTLStrategy", diff --git a/examples/gc-ttl.yaml b/examples/gc-ttl.yaml index 408524b4a930..1e425ee219f4 100644 --- a/examples/gc-ttl.yaml +++ b/examples/gc-ttl.yaml @@ -7,10 +7,10 @@ kind: Workflow metadata: generateName: gc-ttl- spec: - TTLStrategy: - secondsAfterCompleted: 10 # Time to live after workflow is completed, replaces ttlSecondsAfterFinished - secondsAfterSuccess: 5 # Time to live after workflow is successful - secondsAfterFailed: 5 # Time to live after workflow fails + ttlStrategy: + secondsAfterCompletion: 10 # Time to live after workflow is completed, replaces ttlSecondsAfterFinished + secondsAfterSuccess: 5 # Time to live after workflow is successful + secondsAfterFailure: 5 # Time to live after workflow fails entrypoint: whalesay templates: - name: whalesay diff --git a/pkg/apis/workflow/v1alpha1/generated.pb.go b/pkg/apis/workflow/v1alpha1/generated.pb.go index 07ee0c134a3f..8e4fc8498028 100644 --- a/pkg/apis/workflow/v1alpha1/generated.pb.go +++ b/pkg/apis/workflow/v1alpha1/generated.pb.go @@ -1585,15 +1585,15 @@ func init() { } var fileDescriptor_c23edafa7e7ea072 = []byte{ - // 5190 bytes of a gzipped FileDescriptorProto + // 5183 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7c, 0x4d, 0x6c, 0x1c, 0xc9, 0x75, 0xbf, 0x86, 0xe4, 0x0c, 0x67, 0xde, 0x90, 0x22, 0x55, 0xa2, 0xa4, 0x59, 0x5a, 0xcb, 0x91, 0x7b, 0xff, 0xde, 0xbf, 0x9c, 0xec, 0x0e, 0xbd, 0x92, 0x9d, 0xac, 0xd7, 0xd9, 0x5d, 0x73, 0x48, 0x51, 0xa2, 0x24, 0x52, 0xcc, 0x1b, 0x4a, 0x8a, 0xb3, 0x0b, 0x3b, 0xcd, 0xee, 0x9a, 0x99, 0x16, 0x67, 0xba, 0x7b, 0xbb, 0x7a, 0xc4, 0x65, 0x36, 0x40, 0x36, 0x41, 0x82, 0x24, 0x08, 0x0c, 0xd8, 0x17, 0xc7, 0x80, 0x2f, 0x41, 0x0e, 0x09, 0x10, 0xe4, 0x12, 0x20, 0xa7, 0x1c, 0x7c, 0x30, 0x72, - 0x58, 0xf8, 0x92, 0x45, 0x2e, 0xd9, 0x43, 0x40, 0x78, 0x19, 0x20, 0x08, 0x90, 0x00, 0x41, 0x72, - 0x09, 0xa2, 0x53, 0x50, 0x1f, 0x5d, 0xfd, 0x31, 0x4d, 0xad, 0x34, 0x43, 0x29, 0x09, 0xec, 0x13, + 0x58, 0xf8, 0x92, 0x45, 0x2e, 0xd9, 0x43, 0x40, 0x78, 0x19, 0x20, 0x08, 0x90, 0x00, 0x01, 0x72, + 0x31, 0xa2, 0x53, 0x50, 0x1f, 0x5d, 0xfd, 0x31, 0x4d, 0xad, 0x34, 0x43, 0x29, 0x09, 0xec, 0x13, 0xa7, 0xdf, 0x7b, 0xf5, 0x7b, 0xf5, 0xf9, 0xaa, 0xde, 0xab, 0x57, 0x84, 0xd5, 0x8e, 0x13, 0x76, 0x07, 0xbb, 0x0d, 0xcb, 0xeb, 0x2f, 0x9b, 0x41, 0xc7, 0xf3, 0x03, 0xef, 0x81, 0xf8, 0xb1, 0xec, 0xef, 0x75, 0x96, 0x4d, 0xdf, 0x61, 0xcb, 0xfb, 0x5e, 0xb0, 0xd7, 0xee, 0x79, 0xfb, 0xcb, 0x0f, @@ -1603,28 +1603,28 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0x07, 0x6d, 0xf1, 0x25, 0x3e, 0xc4, 0x2f, 0xa9, 0x63, 0xd1, 0xd8, 0x7b, 0x9d, 0x35, 0x1c, 0x8f, 0x57, 0x69, 0xd9, 0xf2, 0x02, 0xba, 0xfc, 0x70, 0xa8, 0x1e, 0x8b, 0x5f, 0x8e, 0x65, 0xfa, 0xa6, 0xd5, 0x75, 0x5c, 0x1a, 0x1c, 0xc4, 0xed, 0xe8, 0xd3, 0xd0, 0xcc, 0x2b, 0xb5, 0x7c, 0x5c, 0xa9, - 0x60, 0xe0, 0x86, 0x4e, 0x9f, 0x0e, 0x15, 0xf8, 0x85, 0xcf, 0x2a, 0xc0, 0xac, 0x2e, 0xed, 0x9b, - 0xd9, 0x72, 0xc6, 0xdf, 0x16, 0x60, 0x6e, 0x25, 0xb0, 0xba, 0xce, 0x43, 0xda, 0x0a, 0x39, 0xa3, + 0x60, 0xe0, 0x86, 0x4e, 0x9f, 0x0e, 0x15, 0xf8, 0xa5, 0xcf, 0x2a, 0xc0, 0xac, 0x2e, 0xed, 0x9b, + 0xd9, 0x72, 0xc6, 0xdf, 0x17, 0x60, 0x6e, 0x25, 0xb0, 0xba, 0xce, 0x43, 0xda, 0x0a, 0x39, 0xa3, 0x73, 0x40, 0xde, 0x81, 0xc9, 0xd0, 0x0c, 0x6a, 0x85, 0x4b, 0x85, 0xcb, 0xd5, 0x2b, 0x5f, 0x6f, 0x8c, 0xd0, 0x91, 0x8d, 0x1d, 0x33, 0x88, 0xe0, 0x9a, 0xd3, 0x47, 0x87, 0xf5, 0xc9, 0x1d, 0x33, 0x40, 0x8e, 0x4a, 0xbe, 0x05, 0x53, 0xae, 0xe7, 0xd2, 0xda, 0x84, 0x40, 0x5f, 0x19, 0x09, 0x7d, - 0xcb, 0x73, 0x75, 0x6d, 0x9b, 0xe5, 0xa3, 0xc3, 0xfa, 0x14, 0xa7, 0xa0, 0x00, 0x36, 0xfe, 0xad, + 0xcb, 0x73, 0x75, 0x6d, 0x9b, 0xe5, 0xa3, 0xc3, 0xfa, 0x14, 0xa7, 0xa0, 0x00, 0x36, 0xfe, 0xa3, 0x00, 0x95, 0x95, 0xa0, 0x33, 0xe8, 0x53, 0x37, 0x64, 0x24, 0x00, 0xf0, 0xcd, 0xc0, 0xec, 0xd3, 0x90, 0x06, 0xac, 0x56, 0xb8, 0x34, 0x79, 0xb9, 0x7a, 0xe5, 0xad, 0x91, 0x94, 0x6e, 0x47, 0x30, 0x4d, 0xf2, 0xd1, 0x61, 0xfd, 0xd4, 0xd1, 0x61, 0x1d, 0x34, 0x89, 0x61, 0x42, 0x0b, 0x71, 0xa1, 0x62, 0x06, 0xa1, 0xd3, 0x36, 0xad, 0x90, 0xd5, 0x26, 0x84, 0xca, 0x37, 0x47, 0x52, 0xb9, 0xa2, - 0x50, 0x9a, 0x67, 0x94, 0xc6, 0x4a, 0x44, 0x61, 0x18, 0xab, 0x30, 0xfe, 0x65, 0x12, 0xca, 0x11, + 0x50, 0x9a, 0x67, 0x94, 0xc6, 0x4a, 0x44, 0x61, 0x18, 0xab, 0x30, 0xfe, 0x6d, 0x12, 0xca, 0x11, 0x83, 0x5c, 0x82, 0x29, 0xd7, 0xec, 0x53, 0x31, 0x7a, 0x95, 0xe6, 0x8c, 0x2a, 0x38, 0xb5, 0x65, 0xf6, 0x79, 0x07, 0x99, 0x7d, 0xca, 0x25, 0x7c, 0x33, 0xec, 0x8a, 0x11, 0x48, 0x48, 0x6c, 0x9b, 0x61, 0x17, 0x05, 0x87, 0x5c, 0x84, 0xa9, 0xbe, 0x67, 0xd3, 0xda, 0xe4, 0xa5, 0xc2, 0xe5, 0xa2, 0xec, 0xe0, 0x4d, 0xcf, 0xa6, 0x28, 0xa8, 0xbc, 0x7c, 0x3b, 0xf0, 0xfa, 0xb5, 0xa9, 0x74, 0xf9, - 0xf5, 0xc0, 0xeb, 0xa3, 0xe0, 0x90, 0x3f, 0x2c, 0xc0, 0x7c, 0x54, 0xbd, 0xdb, 0x9e, 0x65, 0x86, + 0xf5, 0xc0, 0xeb, 0xa3, 0xe0, 0x90, 0x3f, 0x2e, 0xc0, 0x7c, 0x54, 0xbd, 0xdb, 0x9e, 0x65, 0x86, 0x8e, 0xe7, 0xd6, 0x8a, 0x62, 0xc0, 0xaf, 0x8d, 0xd5, 0x11, 0x11, 0x58, 0xb3, 0xa6, 0xb4, 0xce, 0x67, 0x39, 0x38, 0xa4, 0x98, 0x5c, 0x01, 0xe8, 0xf4, 0xbc, 0x5d, 0xb3, 0xc7, 0xfb, 0xa0, 0x56, 0x12, 0xb5, 0xd6, 0x43, 0x78, 0x5d, 0x73, 0x30, 0x21, 0x45, 0xf6, 0x60, 0xda, 0x94, 0xab, 0xa2, 0x36, 0x2d, 0xea, 0xbd, 0x36, 0x62, 0xbd, 0x53, 0x2b, 0xab, 0x59, 0x3d, 0x3a, 0xac, 0x4f, 0x2b, 0x22, 0x46, 0x1a, 0xc8, 0x2b, 0x50, 0xf6, 0x7c, 0x5e, 0x55, 0xb3, 0x57, 0x2b, 0x5f, 0x2a, 0x5c, - 0x2e, 0x37, 0xe7, 0x55, 0xf5, 0xca, 0x77, 0x14, 0x1d, 0xb5, 0x84, 0xf1, 0x47, 0x45, 0x18, 0x6a, + 0x2e, 0x37, 0xe7, 0x55, 0xf5, 0xca, 0x77, 0x14, 0x1d, 0xb5, 0x84, 0xf1, 0x27, 0x45, 0x18, 0x6a, 0x35, 0x79, 0x0d, 0xaa, 0x0a, 0xed, 0xb6, 0xd7, 0x61, 0x62, 0xf0, 0xcb, 0xcd, 0xb9, 0xa3, 0xc3, 0x7a, 0x75, 0x25, 0x26, 0x63, 0x52, 0x86, 0xdc, 0x87, 0x09, 0x76, 0x55, 0x2d, 0xc3, 0xb7, 0x47, 0x6a, 0x5d, 0xeb, 0xaa, 0x9e, 0xa0, 0xa5, 0xa3, 0xc3, 0xfa, 0x44, 0xeb, 0x2a, 0x4e, 0xb0, 0xab, @@ -1638,9 +1638,9 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0xf7, 0x98, 0x23, 0x1a, 0x48, 0xdb, 0x64, 0x19, 0x2a, 0x96, 0xe7, 0xb6, 0x9d, 0xce, 0xa6, 0xe9, 0x2b, 0xc3, 0xa4, 0x2d, 0xda, 0x6a, 0xc4, 0xc0, 0x58, 0x86, 0xbc, 0x08, 0x93, 0x7b, 0xf4, 0x40, 0x59, 0xa8, 0xaa, 0x12, 0x9d, 0xbc, 0x45, 0x0f, 0x90, 0xd3, 0x8d, 0x1f, 0x16, 0xe0, 0x6c, 0x4e, - 0xe7, 0xf2, 0x62, 0x83, 0xa0, 0xa7, 0x34, 0xe8, 0x62, 0x77, 0xf1, 0x36, 0x72, 0x3a, 0xf9, 0xbd, + 0xe7, 0xf2, 0x62, 0x83, 0xa0, 0xa7, 0x34, 0xe8, 0x62, 0x77, 0xf1, 0x36, 0x72, 0x3a, 0xf9, 0x83, 0x02, 0xcc, 0x25, 0x7a, 0x7b, 0x65, 0xa0, 0x8c, 0xe0, 0xe8, 0xab, 0x3b, 0x85, 0xd5, 0xbc, 0xa0, - 0x34, 0xce, 0x65, 0x18, 0x98, 0xd5, 0x6a, 0xfc, 0xbd, 0xd8, 0x75, 0x53, 0x34, 0x62, 0xc2, 0xe9, + 0x34, 0xce, 0x65, 0x18, 0x98, 0xd5, 0x6a, 0xfc, 0xa3, 0xd8, 0x75, 0x53, 0x34, 0x62, 0xc2, 0xe9, 0x01, 0xa3, 0x01, 0x37, 0xd1, 0x2d, 0x6a, 0x05, 0x34, 0x54, 0x1b, 0xf0, 0x17, 0x1a, 0x72, 0x6b, 0xe7, 0xb5, 0x68, 0xf0, 0x53, 0x46, 0xe3, 0xe1, 0x6b, 0x0d, 0x29, 0x71, 0x8b, 0x1e, 0xb4, 0x68, 0x8f, 0x72, 0x8c, 0x26, 0x39, 0x3a, 0xac, 0x9f, 0xbe, 0x9b, 0x02, 0xc0, 0x0c, 0x20, 0x57, 0xe1, @@ -1652,7 +1652,7 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0x19, 0xdf, 0x00, 0x58, 0xf5, 0xdc, 0xd0, 0x71, 0x07, 0xf4, 0x8e, 0x4b, 0x5e, 0x82, 0x22, 0x0d, 0x02, 0x2f, 0x50, 0x96, 0x72, 0x56, 0x15, 0x2f, 0x5e, 0xe3, 0x44, 0x94, 0x3c, 0x59, 0x23, 0xa7, 0x47, 0x6d, 0x51, 0xa3, 0x72, 0xb2, 0x46, 0x9c, 0x8a, 0x8a, 0x6b, 0xfc, 0x78, 0x02, 0x66, 0x56, - 0x03, 0xcf, 0xbd, 0xaf, 0x66, 0x08, 0xf9, 0x35, 0x28, 0xf3, 0x83, 0x9d, 0x6d, 0x86, 0xa6, 0x1a, + 0x03, 0xcf, 0xbd, 0xaf, 0x66, 0x08, 0xf9, 0x0d, 0x28, 0xf3, 0x83, 0x9d, 0x6d, 0x86, 0xa6, 0x1a, 0xc4, 0x2f, 0x25, 0x7a, 0x58, 0x9f, 0xcf, 0xe2, 0xb9, 0xc5, 0xa5, 0x79, 0x9f, 0xdf, 0xd9, 0x7d, 0x40, 0xad, 0x70, 0x93, 0x86, 0x66, 0xbc, 0x43, 0xc5, 0x34, 0xd4, 0xa8, 0xa4, 0x03, 0x53, 0xcc, 0xa7, 0x96, 0x1a, 0xbf, 0xd1, 0x36, 0xd5, 0x64, 0x95, 0x5b, 0x3e, 0xb5, 0xe2, 0xad, 0x9c, 0x7f, @@ -1672,11 +1672,11 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0x16, 0xd9, 0xc0, 0xb2, 0x28, 0x63, 0xed, 0x41, 0xef, 0xa6, 0xb7, 0xcb, 0x6e, 0x38, 0x8c, 0xdb, 0xeb, 0xdb, 0x4e, 0xdf, 0x09, 0xc5, 0x26, 0x5d, 0x6c, 0x2e, 0x1d, 0x1d, 0xd6, 0x17, 0x5b, 0xc7, 0x4a, 0xe1, 0x63, 0x10, 0x08, 0xc2, 0x79, 0x69, 0x42, 0x86, 0xb0, 0xa7, 0x05, 0xf6, 0xe2, 0xd1, - 0x61, 0xfd, 0xfc, 0x7a, 0xae, 0x04, 0x1e, 0x53, 0x92, 0x8f, 0x20, 0xf7, 0xf7, 0x7e, 0x9d, 0xfb, - 0x58, 0xe5, 0xf4, 0x08, 0xee, 0x28, 0x3a, 0x6a, 0x09, 0xe3, 0xef, 0x0a, 0x40, 0x86, 0x17, 0x27, + 0x61, 0xfd, 0xfc, 0x7a, 0xae, 0x04, 0x1e, 0x53, 0x92, 0x8f, 0x20, 0xf7, 0xf7, 0x7e, 0x93, 0xfb, + 0x58, 0xe5, 0xf4, 0x08, 0xee, 0x28, 0x3a, 0x6a, 0x09, 0xe3, 0x1f, 0x0a, 0x40, 0x86, 0x17, 0x27, 0xb9, 0x05, 0x25, 0xd3, 0x0a, 0xf9, 0xe9, 0x57, 0x7a, 0x4c, 0x2f, 0xe5, 0x6d, 0x10, 0xd2, 0x30, 0x21, 0x6d, 0x53, 0x3e, 0x6a, 0x34, 0x5e, 0xd1, 0x2b, 0xa2, 0x28, 0x2a, 0x08, 0xe2, 0xc1, 0x99, - 0x9e, 0xc9, 0xc2, 0x68, 0xfe, 0xd8, 0xbc, 0x1a, 0xca, 0x70, 0xfd, 0xdc, 0x93, 0xad, 0x62, 0x5e, + 0x9e, 0xc9, 0xc2, 0x68, 0xfe, 0xd8, 0xbc, 0x1a, 0xca, 0x70, 0xfd, 0xc2, 0x93, 0xad, 0x62, 0x5e, 0xa2, 0x79, 0x8e, 0xcf, 0xa6, 0xdb, 0x59, 0x20, 0x1c, 0xc6, 0x36, 0x7e, 0x54, 0x82, 0xe9, 0xb5, 0x95, 0xeb, 0x3b, 0x26, 0xdb, 0x7b, 0x02, 0x77, 0x88, 0x77, 0x18, 0xed, 0xfb, 0x3d, 0x33, 0x1c, 0x9a, 0xf2, 0x3b, 0x8a, 0x8e, 0x5a, 0x82, 0x78, 0xdc, 0xb7, 0x53, 0xce, 0xa5, 0x32, 0x89, 0x6f, @@ -1693,11 +1693,11 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0xf1, 0xdc, 0x6b, 0xef, 0x3b, 0x61, 0xad, 0x2a, 0x2a, 0xa5, 0x57, 0xed, 0x1d, 0x41, 0x45, 0xc5, 0x35, 0x7e, 0x54, 0x80, 0x2a, 0x5f, 0x44, 0xd1, 0xc4, 0x7f, 0x19, 0x4a, 0xa1, 0x19, 0x74, 0xd4, 0xb1, 0x34, 0x51, 0x6e, 0x47, 0x50, 0x51, 0x71, 0x89, 0x09, 0xc5, 0xd0, 0x64, 0x7b, 0xd1, 0x66, - 0xfa, 0x4b, 0x23, 0xb5, 0x45, 0xad, 0xde, 0x78, 0x1f, 0xe5, 0x5f, 0x0c, 0x25, 0x32, 0xb9, 0x0c, + 0xfa, 0x2b, 0x23, 0xb5, 0x45, 0xad, 0xde, 0x78, 0x1f, 0xe5, 0x5f, 0x0c, 0x25, 0x32, 0xb9, 0x0c, 0x65, 0x6e, 0xfc, 0xd6, 0x4d, 0x26, 0xbd, 0xcc, 0x72, 0x73, 0x86, 0xaf, 0xd6, 0x75, 0x45, 0x43, 0xcd, 0x35, 0xde, 0x85, 0xd3, 0xd7, 0xde, 0xa7, 0xd6, 0x20, 0xf4, 0x02, 0xe9, 0x67, 0x90, 0x9b, 0x40, 0x18, 0x0d, 0x1e, 0x3a, 0x16, 0x5d, 0xb1, 0x2c, 0x6f, 0xe0, 0x86, 0x5b, 0xb1, 0x75, 0x58, - 0x54, 0xda, 0x48, 0x6b, 0x48, 0x02, 0x73, 0x4a, 0x19, 0x7f, 0x31, 0x05, 0xd5, 0x84, 0xa7, 0xca, + 0x54, 0xda, 0x48, 0x6b, 0x48, 0x02, 0x73, 0x4a, 0x19, 0x7f, 0x35, 0x05, 0xd5, 0x84, 0xa7, 0xca, 0x47, 0x3b, 0xa0, 0xbe, 0x97, 0xb5, 0x35, 0xdc, 0x17, 0x42, 0xc1, 0xe1, 0xb6, 0x26, 0xa0, 0x0f, 0x1d, 0xc6, 0x0f, 0xae, 0x19, 0x5b, 0x83, 0x8a, 0x8e, 0x5a, 0x82, 0xd4, 0xa1, 0x68, 0x53, 0x3f, 0xec, 0x8a, 0x46, 0x4e, 0x35, 0x2b, 0xbc, 0x23, 0xd6, 0x38, 0x01, 0x25, 0x9d, 0x0b, 0xb4, 0x69, @@ -1709,9 +1709,9 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0x4f, 0x08, 0xf3, 0xcb, 0x1a, 0x3f, 0x2e, 0xc0, 0x4c, 0xd2, 0x39, 0x27, 0x0c, 0xa0, 0xbb, 0xb6, 0xde, 0x92, 0x33, 0x53, 0x9d, 0xfb, 0xde, 0x1e, 0xd9, 0xe7, 0x97, 0x30, 0xb1, 0xdf, 0x10, 0xd3, 0x30, 0xa1, 0xe6, 0x09, 0xa2, 0x7f, 0x2f, 0x41, 0xb1, 0xed, 0x05, 0x16, 0x55, 0x6b, 0x4b, 0xaf, - 0xc1, 0x75, 0x4e, 0x44, 0xc9, 0x33, 0xfe, 0xb9, 0x00, 0x09, 0x0d, 0xe4, 0x37, 0x61, 0x96, 0xeb, + 0xc1, 0x75, 0x4e, 0x44, 0xc9, 0x33, 0xfe, 0xb5, 0x00, 0x09, 0x0d, 0xe4, 0xb7, 0x61, 0x96, 0xeb, 0xb8, 0x15, 0xec, 0xa6, 0x5a, 0xd3, 0x1c, 0xb9, 0x35, 0x1a, 0xa9, 0x79, 0x4e, 0xe9, 0x9f, 0x4d, - 0x91, 0x31, 0xad, 0x8f, 0xfc, 0x3c, 0x54, 0x4c, 0xdb, 0x0e, 0x28, 0x63, 0x54, 0x9a, 0x9e, 0x4a, + 0x91, 0x31, 0xad, 0x8f, 0xfc, 0x22, 0x54, 0x4c, 0xdb, 0x0e, 0x28, 0x63, 0x54, 0x9a, 0x9e, 0x4a, 0x73, 0x56, 0xec, 0xa9, 0x11, 0x11, 0x63, 0x3e, 0x5f, 0x86, 0x5d, 0xbb, 0xcd, 0xf8, 0xcc, 0x56, 0xc7, 0x55, 0xbd, 0x0c, 0xb9, 0x12, 0x4e, 0x47, 0x2d, 0x61, 0x7c, 0x7b, 0x0a, 0xd2, 0xba, 0x89, 0x0d, 0x73, 0x7b, 0xc1, 0xee, 0xea, 0xaa, 0x69, 0x75, 0x47, 0xf2, 0xd5, 0xcf, 0x1e, 0x1d, 0xd6, @@ -1722,8 +1722,8 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0x5b, 0x74, 0x39, 0xaf, 0x35, 0x5a, 0x28, 0xd9, 0xa0, 0xf3, 0xdc, 0x36, 0xdf, 0x1a, 0xc2, 0xc1, 0x1c, 0x6c, 0xf2, 0x0d, 0xb8, 0xb0, 0x17, 0xec, 0x2a, 0x43, 0xbe, 0x1d, 0x38, 0xae, 0xe5, 0xf8, 0xa9, 0x08, 0x70, 0x5d, 0x55, 0xf7, 0xc2, 0xad, 0x7c, 0x31, 0x3c, 0xae, 0xbc, 0xf1, 0x2a, 0xcc, - 0x24, 0x23, 0x88, 0x9f, 0x11, 0x75, 0x32, 0xfe, 0xb5, 0x00, 0xa5, 0x0d, 0xd7, 0x1f, 0xfc, 0x94, - 0x5c, 0x46, 0xfc, 0xc9, 0x14, 0x4c, 0xf1, 0x23, 0x1a, 0xb9, 0x0c, 0x53, 0xe1, 0x81, 0x2f, 0xf7, + 0x24, 0x23, 0x88, 0x9f, 0x11, 0x75, 0x32, 0xfe, 0xbd, 0x00, 0xa5, 0x0d, 0xd7, 0x1f, 0xfc, 0x8c, + 0x5c, 0x46, 0xfc, 0xd9, 0x14, 0x4c, 0xf1, 0x23, 0x1a, 0xb9, 0x0c, 0x53, 0xe1, 0x81, 0x2f, 0xf7, 0xd6, 0xc9, 0xe6, 0x42, 0x64, 0x68, 0x76, 0x0e, 0x7c, 0xfa, 0x48, 0xfd, 0x45, 0x21, 0x41, 0xde, 0x82, 0x92, 0x3b, 0xe8, 0xdf, 0x33, 0x7b, 0xca, 0x28, 0xbd, 0x1c, 0x1d, 0x2d, 0xb6, 0x04, 0xf5, 0xd1, 0x61, 0x7d, 0x81, 0xba, 0x96, 0x67, 0x3b, 0x6e, 0x67, 0xf9, 0x01, 0xf3, 0xdc, 0xc6, 0xd6, @@ -1734,12 +1734,12 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0x38, 0x30, 0xdd, 0x73, 0x58, 0xc8, 0xf5, 0x95, 0xc6, 0x98, 0x15, 0x5c, 0xdf, 0x3d, 0xb3, 0x37, 0xa0, 0x71, 0x0f, 0xdc, 0x96, 0xb0, 0x18, 0xe1, 0x2f, 0x1e, 0x40, 0x35, 0x51, 0x23, 0x32, 0x2f, 0x23, 0xad, 0x62, 0xf2, 0x8a, 0xe0, 0x2a, 0xd9, 0x81, 0xe2, 0x43, 0x8e, 0xa1, 0x8c, 0xcd, 0x98, - 0x35, 0x41, 0x09, 0xf6, 0xc6, 0xc4, 0xeb, 0x85, 0x37, 0xca, 0xdf, 0xff, 0xe3, 0xfa, 0xa9, 0x0f, - 0xff, 0xe1, 0xd2, 0x29, 0xe3, 0x6f, 0x26, 0xa1, 0xa2, 0x45, 0xfe, 0x6f, 0xcf, 0x94, 0x20, 0x33, + 0x35, 0x41, 0x09, 0xf6, 0xc6, 0xc4, 0xeb, 0x85, 0x37, 0xca, 0xdf, 0xff, 0xd3, 0xfa, 0xa9, 0x0f, + 0xff, 0xe9, 0xd2, 0x29, 0xe3, 0xef, 0x26, 0xa1, 0xa2, 0x45, 0xfe, 0x6f, 0xcf, 0x94, 0x20, 0x33, 0x53, 0x6e, 0x8e, 0xd7, 0x5f, 0x4f, 0x34, 0x5d, 0x56, 0xd2, 0xd3, 0x65, 0xa6, 0xf9, 0xff, 0x13, 0x43, 0xfd, 0xe8, 0xb0, 0x5e, 0x4b, 0x77, 0x02, 0x9a, 0xfb, 0x9b, 0x94, 0x31, 0xb3, 0x43, 0xe3, 0x69, 0xf0, 0xd5, 0xcf, 0x9a, 0x06, 0x0b, 0xc9, 0x69, 0x50, 0xc9, 0x1f, 0xc6, 0x0f, 0x27, 0xa1, - 0xbc, 0x19, 0x45, 0xd1, 0x7e, 0xb7, 0x00, 0x55, 0xd3, 0x75, 0xbd, 0x50, 0xc4, 0x5b, 0x23, 0xf3, + 0xbc, 0x19, 0x45, 0xd1, 0x7e, 0xbf, 0x00, 0x55, 0xd3, 0x75, 0xbd, 0x50, 0xc4, 0x5b, 0x23, 0xf3, 0xb6, 0x35, 0x52, 0x77, 0x44, 0xa0, 0x8d, 0x95, 0x18, 0x50, 0x76, 0x89, 0xde, 0x99, 0x12, 0x1c, 0x4c, 0xea, 0x25, 0xef, 0x41, 0xa9, 0x67, 0xee, 0xd2, 0x5e, 0x64, 0xed, 0x36, 0xc6, 0xab, 0xc1, 0x6d, 0x81, 0x95, 0x19, 0x0f, 0x49, 0x44, 0xa5, 0x68, 0xf1, 0x2d, 0x98, 0xcf, 0x56, 0xf4, 0x69, @@ -1765,9 +1765,9 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0xb4, 0xa8, 0xea, 0xd7, 0x46, 0xdb, 0x51, 0x04, 0x44, 0x13, 0xb8, 0xb9, 0x92, 0xbf, 0x51, 0xc1, 0x12, 0x0b, 0xa6, 0xbd, 0x41, 0x28, 0x34, 0xcc, 0x09, 0x0d, 0xa3, 0x05, 0x69, 0xee, 0x48, 0x0c, 0x99, 0xd4, 0xa0, 0x3e, 0x30, 0x42, 0xe6, 0xed, 0xb5, 0xba, 0x4e, 0xcf, 0x0e, 0xa8, 0x5b, 0x9b, - 0x17, 0xfe, 0x98, 0x68, 0xef, 0xaa, 0xa2, 0xa1, 0xe6, 0x92, 0x5f, 0x84, 0x59, 0x6f, 0x10, 0x8a, + 0x17, 0xfe, 0x98, 0x68, 0xef, 0xaa, 0xa2, 0xa1, 0xe6, 0x92, 0x5f, 0x86, 0x59, 0x6f, 0x10, 0x8a, 0x79, 0xc3, 0xa7, 0x1d, 0xab, 0x9d, 0x11, 0xe2, 0x67, 0xf8, 0x2c, 0xbe, 0x93, 0x64, 0x60, 0x5a, - 0xce, 0x38, 0x0d, 0x33, 0xc9, 0x4c, 0x20, 0xe3, 0xbb, 0x13, 0x10, 0xd5, 0xe3, 0xa7, 0xe1, 0xa8, + 0xce, 0x38, 0x0d, 0x33, 0xc9, 0x4c, 0x20, 0xe3, 0xbb, 0x13, 0x10, 0xd5, 0xe3, 0x67, 0xe1, 0xa8, 0x4d, 0x0c, 0x28, 0x05, 0x94, 0x0d, 0x7a, 0xa1, 0xb2, 0xd4, 0x62, 0xac, 0x51, 0x50, 0x50, 0x71, 0x8c, 0x7d, 0x98, 0xe5, 0xb5, 0xed, 0xf5, 0x68, 0xaf, 0x15, 0x52, 0x9f, 0x91, 0x36, 0x14, 0x19, 0xff, 0xa1, 0xfa, 0x64, 0xcc, 0x7b, 0xa6, 0x90, 0xfa, 0xf1, 0x7c, 0x17, 0x0a, 0x50, 0xc2, 0x1b, @@ -1785,132 +1785,131 @@ var fileDescriptor_c23edafa7e7ea072 = []byte{ 0xf0, 0xce, 0xbe, 0x4b, 0x03, 0x7d, 0xb9, 0xa4, 0x6e, 0x00, 0x5f, 0x88, 0x6e, 0x15, 0x5b, 0x59, 0x01, 0x1c, 0x2e, 0x23, 0xb6, 0x6e, 0x79, 0xf9, 0xb6, 0xea, 0xb9, 0xb6, 0xa3, 0xb3, 0xd0, 0x92, 0x5b, 0x77, 0x86, 0x8f, 0x43, 0x25, 0x38, 0x4a, 0xdb, 0x74, 0x7a, 0x83, 0x80, 0xc6, 0x28, 0xa5, - 0x34, 0xca, 0x7a, 0x86, 0x8f, 0x43, 0x25, 0x8c, 0x7f, 0x2a, 0xc0, 0x2c, 0xd2, 0x30, 0x38, 0xd0, + 0x34, 0xca, 0x7a, 0x86, 0x8f, 0x43, 0x25, 0x8c, 0x7f, 0x29, 0xc0, 0x2c, 0xd2, 0x30, 0x38, 0xd0, 0x9d, 0x52, 0x87, 0x62, 0x4f, 0xdc, 0xf5, 0x15, 0xc4, 0x5d, 0x9f, 0x98, 0xc9, 0xf2, 0x6a, 0x4f, 0xd2, 0xc9, 0x1a, 0x54, 0x03, 0x5e, 0x42, 0xdd, 0xab, 0xca, 0x0e, 0x37, 0xa2, 0xd3, 0x18, 0xc6, 0xac, 0x47, 0xe9, 0x4f, 0x4c, 0x16, 0x23, 0x2e, 0x4c, 0xef, 0xca, 0x7c, 0x0c, 0x75, 0x5d, 0x35, 0x9a, 0xb1, 0x57, 0x39, 0x1d, 0x22, 0x06, 0x13, 0x25, 0x78, 0x3c, 0x8a, 0x7f, 0x62, 0xa4, 0xc4, 0xf8, 0x7e, 0x01, 0x20, 0x4e, 0x0c, 0x23, 0x7b, 0x50, 0x66, 0x57, 0x9b, 0x03, 0x6b, 0x4f, 0xc7, 0xc8, 0x46, 0xbc, 0x72, 0x51, 0x20, 0x89, 0xfb, 0x68, 0x45, 0x41, 0xad, 0xe0, 0xb3, 0xd2, 0x86, - 0xfe, 0x72, 0x12, 0x74, 0x29, 0x3e, 0x27, 0xa9, 0x6b, 0xfb, 0x9e, 0xe3, 0x86, 0xd9, 0xe4, 0x94, + 0xfe, 0x7a, 0x12, 0x74, 0x29, 0x3e, 0x27, 0xa9, 0x6b, 0xfb, 0x9e, 0xe3, 0x86, 0xd9, 0xe4, 0x94, 0x6b, 0x8a, 0x8e, 0x5a, 0x82, 0x2f, 0x93, 0x5d, 0xd9, 0x88, 0x89, 0xf4, 0x32, 0x51, 0x75, 0x50, 0x5c, 0x2e, 0x17, 0xd0, 0x4e, 0x9c, 0x97, 0xa2, 0xe5, 0x50, 0x50, 0x51, 0x71, 0xf9, 0xee, 0x18, 0x05, 0x89, 0xd5, 0xd4, 0x16, 0xbb, 0x63, 0x14, 0x4f, 0x46, 0xcd, 0x25, 0x5d, 0x98, 0x33, 0xc5, 0x8c, 0x8c, 0x03, 0xdf, 0x4f, 0x15, 0xc3, 0x8f, 0x93, 0x92, 0xd2, 0x28, 0x98, 0x85, 0xe5, 0x9a, 0x58, 0x5c, 0xfc, 0xe9, 0x43, 0xf9, 0x5a, 0x53, 0x2b, 0x8d, 0x82, 0x59, 0x58, 0x7e, 0x30, 0x0c, - 0xbc, 0x1e, 0x5d, 0xc1, 0x2d, 0x75, 0x00, 0xd5, 0x07, 0x43, 0x94, 0x64, 0x8c, 0xf8, 0xc6, 0xef, - 0x17, 0xe0, 0x74, 0xcb, 0x0a, 0x1c, 0x3f, 0xd4, 0x26, 0x6b, 0x4b, 0x64, 0x93, 0x85, 0x26, 0x3f, + 0xbc, 0x1e, 0x5d, 0xc1, 0x2d, 0x75, 0x00, 0xd5, 0x07, 0x43, 0x94, 0x64, 0x8c, 0xf8, 0xc6, 0x1f, + 0x16, 0xe0, 0x74, 0xcb, 0x0a, 0x1c, 0x3f, 0xd4, 0x26, 0x6b, 0x4b, 0x64, 0x93, 0x85, 0x26, 0x3f, 0xb2, 0xa9, 0x39, 0xf5, 0xe2, 0x31, 0x31, 0x44, 0x29, 0x94, 0x4a, 0x36, 0x93, 0x24, 0x8c, 0x21, 0x84, 0xa7, 0x2f, 0x8c, 0x62, 0x76, 0x6c, 0x5b, 0x82, 0x8a, 0x8a, 0x6b, 0xfc, 0xa0, 0x00, 0x65, 0x7d, 0xb3, 0xf7, 0x12, 0x14, 0xc5, 0x45, 0x90, 0x9a, 0x3b, 0x7a, 0x0f, 0x5c, 0xe5, 0x44, 0x94, 0x3c, 0x2e, 0x24, 0x4e, 0xa1, 0x0a, 0x38, 0xb1, 0x51, 0x9a, 0x41, 0x88, 0x92, 0xc7, 0x27, 0x2d, 0x75, 0x6d, 0x35, 0x5f, 0xf4, 0xa4, 0xbd, 0xe6, 0xda, 0xc8, 0xe9, 0x22, 0x09, 0xc9, 0x0b, 0xfa, 0x66, 0x98, 0x8d, 0x43, 0xac, 0x0b, 0x2a, 0x2a, 0xae, 0xf1, 0x36, 0xcc, 0xa9, 0xb4, 0x08, 0xdd, - 0x51, 0x4f, 0x95, 0x7f, 0x65, 0xfc, 0x7b, 0x01, 0xaa, 0x3b, 0x3b, 0xb7, 0xb5, 0x7d, 0xba, 0x03, - 0xe7, 0x98, 0xcc, 0x83, 0x58, 0x69, 0x87, 0x34, 0x58, 0xf5, 0xfa, 0x7e, 0x8f, 0x86, 0xd4, 0x56, - 0xf6, 0xea, 0x85, 0xa3, 0xc3, 0xfa, 0xb9, 0x56, 0x9e, 0x00, 0xe6, 0x97, 0x23, 0x1b, 0x70, 0x36, - 0xc9, 0x50, 0xa6, 0x57, 0x65, 0x7b, 0xc9, 0xfb, 0x99, 0x61, 0x36, 0xe6, 0x95, 0x21, 0xeb, 0x40, - 0x92, 0x64, 0x99, 0x22, 0xa1, 0xd2, 0x95, 0xcf, 0xcb, 0x1b, 0xbc, 0x2c, 0x17, 0x73, 0x4a, 0x18, - 0xb3, 0x50, 0x4d, 0x64, 0xaa, 0x1b, 0xff, 0x71, 0x01, 0xf4, 0x9d, 0xff, 0xcf, 0x32, 0x07, 0x46, - 0x72, 0x97, 0x2d, 0xed, 0xbc, 0x14, 0xc7, 0x77, 0x5e, 0xf4, 0x5c, 0xcf, 0x38, 0x30, 0x9d, 0xd8, - 0x81, 0x29, 0x9d, 0x80, 0x03, 0xa3, 0xad, 0xcf, 0x90, 0x13, 0xf3, 0x07, 0x05, 0x98, 0x71, 0x3d, - 0x9b, 0x46, 0x36, 0xae, 0x36, 0x2d, 0x0e, 0xcd, 0x77, 0xc6, 0xea, 0xc4, 0xc6, 0x56, 0x02, 0x51, - 0x06, 0x96, 0x74, 0xf4, 0x23, 0xc9, 0xc2, 0x94, 0x6a, 0xb2, 0x0e, 0x65, 0xb3, 0xcd, 0xbd, 0xce, - 0xf0, 0x40, 0x25, 0x2f, 0x5c, 0xcc, 0xb3, 0x7a, 0x2b, 0x4a, 0x46, 0x6e, 0x28, 0xd1, 0x17, 0xea, - 0xb2, 0x7c, 0x47, 0xd6, 0xb9, 0x74, 0x95, 0x31, 0x76, 0xe4, 0x28, 0x42, 0x96, 0x38, 0xcb, 0x29, - 0x4a, 0x22, 0xb5, 0xce, 0x80, 0x92, 0xf4, 0x6b, 0x85, 0x53, 0x5f, 0x96, 0x2e, 0x8a, 0xf4, 0x79, - 0x51, 0x71, 0x48, 0x27, 0xf2, 0x48, 0xaa, 0xa2, 0x73, 0x9b, 0x23, 0x7b, 0x69, 0xda, 0xc9, 0xc9, - 0x77, 0x49, 0xc8, 0xcd, 0xe4, 0xc6, 0x31, 0xf3, 0x24, 0x1b, 0xc7, 0xec, 0xb1, 0x9b, 0x46, 0x07, - 0x4a, 0x4c, 0x6c, 0x4b, 0xc2, 0x99, 0xaf, 0x5e, 0x59, 0x1d, 0xed, 0x54, 0x93, 0xda, 0xd9, 0x64, - 0xef, 0x48, 0x1a, 0x2a, 0x78, 0xe2, 0x41, 0x39, 0x50, 0x87, 0x76, 0x15, 0x0f, 0x18, 0xed, 0x2e, - 0x22, 0x7b, 0xf2, 0x97, 0xf3, 0x23, 0xa2, 0xa2, 0x56, 0x42, 0xde, 0x81, 0x49, 0xdb, 0xec, 0xa8, - 0xc8, 0xc0, 0xd7, 0x47, 0x4e, 0xdf, 0x88, 0xd4, 0x88, 0x14, 0xf1, 0xb5, 0x95, 0xeb, 0xc8, 0x51, - 0xc9, 0x5e, 0x9c, 0xd3, 0x37, 0x3f, 0x46, 0xe6, 0x75, 0x66, 0xa7, 0x93, 0xbe, 0xe2, 0x50, 0x56, - 0xe0, 0x35, 0x98, 0x7e, 0xe8, 0xf5, 0x06, 0x7d, 0x15, 0x52, 0xa8, 0x5e, 0x59, 0xcc, 0x1b, 0xed, - 0x7b, 0x42, 0x24, 0x36, 0x02, 0xf2, 0x9b, 0x61, 0x54, 0x96, 0xfc, 0x76, 0x01, 0x4e, 0xf3, 0xa5, - 0xa3, 0xe7, 0x01, 0xab, 0x91, 0x31, 0x66, 0xea, 0x5d, 0xc6, 0x37, 0xc5, 0x68, 0x86, 0x9d, 0x57, - 0x6a, 0x4f, 0x6f, 0xa4, 0x34, 0x60, 0x46, 0x23, 0xf1, 0xa1, 0xcc, 0x1c, 0x9b, 0x5a, 0x66, 0xc0, - 0x6a, 0x67, 0x4f, 0x4c, 0x7b, 0x7c, 0x98, 0x56, 0xd8, 0xa8, 0xb5, 0x90, 0xdf, 0x11, 0xd9, 0xf2, - 0xea, 0xbd, 0x88, 0x7a, 0xc3, 0xb3, 0x70, 0x92, 0x6f, 0x78, 0xce, 0xca, 0x54, 0xf9, 0x94, 0x06, - 0xcc, 0xaa, 0xe4, 0xc7, 0x10, 0x99, 0x47, 0x98, 0x4d, 0xec, 0x3c, 0x27, 0x6e, 0x8b, 0xc4, 0x31, - 0x64, 0x25, 0x4f, 0x00, 0xf3, 0xcb, 0x91, 0x0f, 0x60, 0x36, 0x48, 0x3a, 0x62, 0xb5, 0xf3, 0x63, - 0xa4, 0x2a, 0xa4, 0x5c, 0x3a, 0x19, 0xb2, 0x4a, 0x91, 0x30, 0xad, 0x8b, 0xbc, 0x06, 0x55, 0x5f, - 0x59, 0x2a, 0x87, 0xf5, 0x6b, 0x17, 0x44, 0x1b, 0xc4, 0x8e, 0xba, 0x1d, 0x93, 0x31, 0x29, 0x43, - 0xee, 0x42, 0x35, 0xf4, 0x7a, 0x34, 0x50, 0xd7, 0x2a, 0x35, 0x31, 0xf8, 0x4b, 0x79, 0x33, 0x79, - 0x47, 0x8b, 0xc5, 0x41, 0xfb, 0x98, 0xc6, 0x30, 0x89, 0xc3, 0x1d, 0xfa, 0x28, 0x8f, 0x37, 0x10, - 0xd1, 0x8b, 0x17, 0xd2, 0x0e, 0x7d, 0x2b, 0xc9, 0xc4, 0xb4, 0x2c, 0x77, 0xd1, 0xfd, 0xc0, 0xf1, - 0x02, 0x27, 0x3c, 0x58, 0xed, 0x99, 0x8c, 0x09, 0x80, 0x45, 0x01, 0xa0, 0x5d, 0xf4, 0xed, 0xac, - 0x00, 0x0e, 0x97, 0xe1, 0x7e, 0x50, 0x44, 0xac, 0x7d, 0x4e, 0x1c, 0xdf, 0x84, 0x59, 0x8a, 0xca, - 0xa2, 0xe6, 0x1e, 0x93, 0xb8, 0x75, 0x71, 0x94, 0xc4, 0x2d, 0x62, 0xc3, 0x45, 0x73, 0x10, 0x7a, - 0x7d, 0x4e, 0x48, 0x17, 0xd9, 0xf1, 0xf6, 0xa8, 0x5b, 0xbb, 0x24, 0xf6, 0xaa, 0x4b, 0x47, 0x87, - 0xf5, 0x8b, 0x2b, 0x8f, 0x91, 0xc3, 0xc7, 0xa2, 0x90, 0x3e, 0x94, 0xa9, 0x4a, 0x3e, 0xab, 0x7d, - 0x7e, 0x8c, 0x4d, 0x22, 0x9d, 0xc1, 0x26, 0x3b, 0x28, 0xa2, 0xa1, 0x56, 0x41, 0x76, 0xa0, 0xda, - 0xf5, 0x58, 0xb8, 0xd2, 0x73, 0x4c, 0x46, 0x59, 0xed, 0x45, 0x31, 0x4f, 0x72, 0xf7, 0xb7, 0x1b, - 0x91, 0x58, 0x3c, 0x4d, 0x6e, 0xc4, 0x25, 0x31, 0x09, 0x43, 0xa8, 0x70, 0x0a, 0x07, 0x62, 0xd4, - 0x3c, 0x37, 0xa4, 0xef, 0x87, 0xb5, 0x25, 0xd1, 0x96, 0x97, 0xf3, 0x90, 0xb7, 0x3d, 0xbb, 0x95, - 0x96, 0x96, 0xab, 0x3c, 0x43, 0xc4, 0x2c, 0x26, 0x79, 0x1d, 0x66, 0x7c, 0xcf, 0x6e, 0xf9, 0xd4, - 0xda, 0x36, 0x43, 0xab, 0x5b, 0xab, 0xa7, 0x2f, 0x85, 0xb6, 0x13, 0x3c, 0x4c, 0x49, 0x2e, 0xbe, - 0x0d, 0x67, 0x86, 0xce, 0x53, 0x4f, 0x75, 0x83, 0xf6, 0xa7, 0xdc, 0xef, 0x49, 0x9c, 0x60, 0x4f, - 0xfa, 0xdc, 0x7f, 0x1d, 0xce, 0xa8, 0x37, 0xb8, 0x7c, 0xb3, 0xed, 0x0d, 0xf4, 0xab, 0x95, 0x44, - 0x38, 0x0b, 0xb3, 0x02, 0x38, 0x5c, 0xc6, 0xf8, 0xb3, 0x02, 0xcc, 0xa6, 0xcc, 0xf7, 0x89, 0x7b, - 0xc2, 0xeb, 0x40, 0xfa, 0x4e, 0x10, 0x78, 0x81, 0xdc, 0x03, 0x37, 0xf9, 0x5c, 0x66, 0xea, 0xf1, - 0x8b, 0x70, 0xab, 0x36, 0x87, 0xb8, 0x98, 0x53, 0xc2, 0xf8, 0xeb, 0x02, 0xc4, 0xf1, 0x52, 0x9d, - 0x71, 0x56, 0x38, 0x36, 0xe3, 0xec, 0x15, 0x28, 0x3f, 0x60, 0x9e, 0xbb, 0x1d, 0xe7, 0xa5, 0xe9, - 0x0e, 0xbd, 0xd9, 0xba, 0xb3, 0x25, 0x24, 0xb5, 0x84, 0x90, 0x7e, 0x6f, 0xdd, 0xe9, 0x85, 0xc3, - 0xd9, 0x5b, 0x37, 0x7f, 0x59, 0xd2, 0x51, 0x4b, 0x90, 0x65, 0xa8, 0xe8, 0x10, 0xbd, 0x72, 0xa1, - 0x75, 0x27, 0xe8, 0xf8, 0x34, 0xc6, 0x32, 0xc6, 0x0f, 0x27, 0xa0, 0xfc, 0x1c, 0x5f, 0xf2, 0x58, - 0xa9, 0x97, 0x3c, 0x27, 0xf0, 0xec, 0x23, 0xef, 0x15, 0xcf, 0x5e, 0xe6, 0x15, 0xcf, 0xea, 0x98, - 0x51, 0xff, 0xc7, 0xbe, 0xe0, 0xf9, 0xb8, 0x00, 0x33, 0xcf, 0xf1, 0xf5, 0xce, 0x6e, 0xfa, 0xf5, - 0xce, 0x9b, 0x63, 0x35, 0xed, 0x98, 0x97, 0x3b, 0x7f, 0xb5, 0x00, 0xa9, 0x57, 0x33, 0xc4, 0x85, - 0x4a, 0xb4, 0xc0, 0xa3, 0x9b, 0x94, 0x37, 0xc7, 0x72, 0x0a, 0xe3, 0x49, 0x19, 0x51, 0x18, 0xc6, - 0x2a, 0xc8, 0x15, 0x00, 0xca, 0x2d, 0x9b, 0x8c, 0x57, 0x4e, 0xa4, 0x2f, 0x1a, 0xae, 0x69, 0x0e, - 0x26, 0xa4, 0x9e, 0x7f, 0xc0, 0x21, 0x7f, 0x8b, 0x9e, 0x7a, 0x26, 0x5b, 0xf4, 0xc5, 0x13, 0xdf, - 0xa2, 0x5f, 0x7c, 0xf6, 0x5b, 0x74, 0xc2, 0x21, 0x29, 0x8e, 0xe1, 0x90, 0x7c, 0x00, 0x0b, 0xf2, - 0xe7, 0x6a, 0xcf, 0x74, 0xfa, 0x7a, 0xbe, 0xa8, 0xd4, 0xb1, 0x2f, 0xe6, 0x6e, 0xcc, 0x34, 0x60, - 0x0e, 0x0b, 0xa9, 0x1b, 0xde, 0x8b, 0x4b, 0xc6, 0x79, 0x07, 0xf7, 0x72, 0xe0, 0x30, 0x57, 0x49, - 0xf6, 0x04, 0x3b, 0xfd, 0x04, 0x27, 0xd8, 0x1f, 0x14, 0xe0, 0x9c, 0x99, 0xf7, 0x30, 0x58, 0xc5, - 0x31, 0x6e, 0x8e, 0xe5, 0x4f, 0xa4, 0x10, 0x95, 0x3f, 0x90, 0xc7, 0xc2, 0xfc, 0x3a, 0x90, 0x2f, - 0xc4, 0x2e, 0x69, 0x45, 0x4c, 0xaa, 0x7c, 0x67, 0xf2, 0xdb, 0xd9, 0x50, 0x10, 0x88, 0xde, 0x6e, - 0x8d, 0x6d, 0xb0, 0x4f, 0x20, 0x1c, 0x54, 0x1d, 0x23, 0x1c, 0x94, 0x71, 0x2f, 0x66, 0x4e, 0xc8, - 0xbd, 0x70, 0x61, 0xde, 0xe9, 0x9b, 0x1d, 0xba, 0x3d, 0xe8, 0xf5, 0x64, 0xd4, 0x9f, 0xd5, 0x66, - 0x05, 0x76, 0x6e, 0xbe, 0x2f, 0x77, 0xf7, 0x7a, 0xd9, 0x07, 0x65, 0xfa, 0x7e, 0x6d, 0x23, 0x83, - 0x84, 0x43, 0xd8, 0x7c, 0x5a, 0xf2, 0x63, 0xeb, 0x16, 0x0d, 0x79, 0x6f, 0x8b, 0x48, 0x89, 0xfa, - 0x07, 0x08, 0x37, 0x62, 0x32, 0x26, 0x65, 0xc8, 0x2d, 0xa8, 0xd8, 0x2e, 0x53, 0xb7, 0x6b, 0x73, - 0xc2, 0x4a, 0xbd, 0xca, 0x6d, 0xdb, 0xda, 0x56, 0x4b, 0xdf, 0xab, 0x5d, 0x1c, 0xfe, 0x0f, 0x2f, - 0x0d, 0xcd, 0xc7, 0xb8, 0x3c, 0xd9, 0x14, 0x60, 0x2a, 0xf9, 0x5d, 0x86, 0x36, 0x2e, 0x1d, 0x73, - 0x42, 0x5e, 0xdb, 0x8a, 0x72, 0xf5, 0x67, 0x95, 0x3a, 0x95, 0xd2, 0x1e, 0x23, 0x24, 0x5e, 0xe9, - 0x9c, 0x79, 0xdc, 0x2b, 0x1d, 0x72, 0x17, 0x2e, 0x84, 0x61, 0x2f, 0x15, 0xed, 0x56, 0x79, 0x29, - 0x22, 0x49, 0xa9, 0x28, 0x1f, 0x3e, 0xee, 0xec, 0xdc, 0xce, 0x13, 0xc1, 0xe3, 0xca, 0x8a, 0xd0, - 0x71, 0xd8, 0xd3, 0x1e, 0xf2, 0xd2, 0x38, 0xa1, 0xe3, 0xf8, 0x4a, 0x41, 0x85, 0x8e, 0x63, 0x02, - 0x26, 0xb5, 0x1c, 0xef, 0xe9, 0x9f, 0x1d, 0xd1, 0xd3, 0x4f, 0x3a, 0x97, 0x0b, 0x8f, 0x75, 0x2e, - 0x87, 0x9c, 0xe1, 0x73, 0x4f, 0xe1, 0x0c, 0xbf, 0x23, 0xd2, 0x7f, 0xae, 0xaf, 0xaa, 0x40, 0xc2, - 0x1b, 0xa3, 0xc5, 0x2f, 0x39, 0x82, 0xbc, 0x04, 0x16, 0x3f, 0x51, 0x62, 0x92, 0x6d, 0x58, 0xf0, - 0x3d, 0x7b, 0xc8, 0x97, 0x16, 0x91, 0x83, 0x44, 0xe2, 0xd8, 0x76, 0x8e, 0x0c, 0xe6, 0x96, 0x14, - 0x06, 0x3c, 0xa6, 0xd7, 0x6a, 0xa2, 0x63, 0xa4, 0x01, 0x8f, 0xc9, 0x98, 0x94, 0xc9, 0xba, 0x96, - 0x2f, 0x3c, 0x33, 0xd7, 0x72, 0xf1, 0x39, 0xb8, 0x96, 0x9f, 0x7b, 0x7e, 0xae, 0xe5, 0x9f, 0x57, - 0xe0, 0x74, 0xe6, 0x65, 0xad, 0xce, 0xbc, 0x2b, 0x3c, 0x69, 0xe6, 0x5d, 0x2a, 0x35, 0x6e, 0xe2, - 0x99, 0xa6, 0xc6, 0x4d, 0x9e, 0x78, 0x6a, 0x5c, 0x22, 0x05, 0x70, 0xea, 0x33, 0x52, 0x00, 0x57, - 0x60, 0xce, 0xf2, 0xfa, 0xbe, 0x78, 0xa2, 0xa3, 0x12, 0xc1, 0x64, 0xb2, 0x86, 0xbe, 0x57, 0x5e, - 0x4d, 0xb3, 0x31, 0x2b, 0x4f, 0x7e, 0x03, 0x8a, 0xae, 0x28, 0x58, 0x1a, 0x23, 0xf7, 0x38, 0x3d, - 0x60, 0x62, 0x77, 0x56, 0xe9, 0xbf, 0x51, 0xac, 0xb6, 0x28, 0x68, 0x8f, 0xa2, 0x1f, 0x28, 0x95, - 0x72, 0x47, 0xdf, 0x6b, 0xb7, 0x7b, 0x9e, 0x69, 0xc7, 0x09, 0xb9, 0xea, 0xda, 0x43, 0x3b, 0xfa, - 0x77, 0xb2, 0x02, 0x38, 0x5c, 0x86, 0x9f, 0x97, 0xe6, 0xd2, 0x19, 0xa4, 0xac, 0x56, 0x11, 0x2d, - 0xfa, 0x95, 0x93, 0x68, 0x51, 0x3a, 0x5d, 0x55, 0xb5, 0x2d, 0xbe, 0xbc, 0x4f, 0x73, 0x31, 0x5b, - 0x13, 0x12, 0xc0, 0x79, 0x3f, 0xef, 0x34, 0xc9, 0xd4, 0xe5, 0xd8, 0xe3, 0xce, 0xb4, 0x4b, 0x4a, - 0xcb, 0xf9, 0xdc, 0xf3, 0x28, 0xc3, 0x63, 0x90, 0x93, 0x19, 0x8b, 0xe5, 0x67, 0x95, 0xb1, 0xb8, - 0x78, 0x20, 0x33, 0xa9, 0x8f, 0x4d, 0xc2, 0xbe, 0x9b, 0x7e, 0x18, 0xf1, 0xf6, 0x88, 0xff, 0xba, - 0x4c, 0x8f, 0x7c, 0x22, 0x01, 0xfc, 0xb7, 0x0a, 0xb0, 0x90, 0x37, 0x2c, 0x39, 0xb5, 0x68, 0xa5, - 0x6b, 0x31, 0x9e, 0xd7, 0x99, 0x34, 0x56, 0xdf, 0x2d, 0x25, 0x7c, 0xdc, 0x90, 0xfa, 0x3f, 0xbb, - 0x00, 0x1f, 0xe9, 0x02, 0x3c, 0xf5, 0x08, 0xbe, 0xf8, 0x1c, 0x1f, 0xc1, 0x97, 0x46, 0x78, 0x04, - 0x3f, 0xfd, 0x3c, 0x1f, 0xc1, 0x97, 0x9f, 0xf0, 0x11, 0x7c, 0xe5, 0x7f, 0xcf, 0x23, 0xf8, 0x4f, - 0x0b, 0x30, 0x9f, 0xcd, 0xc9, 0x7f, 0x0e, 0x31, 0xc1, 0xbd, 0x54, 0x4c, 0x70, 0x63, 0x2c, 0xa3, - 0xaf, 0xdf, 0x01, 0x1c, 0x13, 0x1b, 0x34, 0x7e, 0x52, 0x80, 0xa1, 0x77, 0x07, 0xcf, 0x21, 0x6c, - 0xf7, 0x20, 0x1d, 0xb6, 0xbb, 0x76, 0x22, 0x8d, 0x3c, 0x26, 0x7c, 0xf7, 0x9f, 0x39, 0x4d, 0xfc, - 0x1f, 0x09, 0xe3, 0xa5, 0x4c, 0xe0, 0xc4, 0xb3, 0x37, 0x81, 0xcd, 0xc6, 0x47, 0x9f, 0x2e, 0x9d, - 0xfa, 0xf8, 0xd3, 0xa5, 0x53, 0x9f, 0x7c, 0xba, 0x74, 0xea, 0xc3, 0xa3, 0xa5, 0xc2, 0x47, 0x47, - 0x4b, 0x85, 0x8f, 0x8f, 0x96, 0x0a, 0x9f, 0x1c, 0x2d, 0x15, 0x7e, 0x72, 0xb4, 0x54, 0xf8, 0xce, - 0x3f, 0x2e, 0x9d, 0xfa, 0xd5, 0x72, 0x84, 0xfb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x06, - 0x64, 0xef, 0x7b, 0x55, 0x00, 0x00, + 0x51, 0x4f, 0x95, 0x7f, 0x65, 0xfc, 0xb4, 0x00, 0xd5, 0x9d, 0x9d, 0xdb, 0xda, 0x3e, 0x21, 0x9c, + 0x67, 0x32, 0x0f, 0x62, 0xa5, 0x1d, 0xd2, 0x60, 0xd5, 0xeb, 0xfb, 0x3d, 0xaa, 0xb1, 0x54, 0x72, + 0x42, 0x2b, 0x57, 0x02, 0x8f, 0x29, 0x49, 0x36, 0xe0, 0x6c, 0x92, 0xa3, 0xac, 0xaf, 0x4a, 0xf8, + 0x92, 0x57, 0x34, 0xc3, 0x6c, 0xcc, 0x2b, 0x93, 0x85, 0x52, 0x26, 0x58, 0xa5, 0x2c, 0x0f, 0x41, + 0x29, 0x36, 0xe6, 0x95, 0x31, 0x66, 0xa1, 0x9a, 0xc8, 0x57, 0x37, 0xfe, 0xf3, 0x02, 0xe8, 0x9b, + 0xff, 0x9f, 0xe7, 0x0f, 0x8c, 0xe4, 0x34, 0x5b, 0xda, 0x85, 0x29, 0x8e, 0xef, 0xc2, 0xe8, 0x19, + 0x9f, 0x71, 0x63, 0x3a, 0xb1, 0x1b, 0x53, 0x3a, 0x01, 0x37, 0x46, 0xdb, 0xa0, 0x21, 0x57, 0xe6, + 0x8f, 0x0a, 0x30, 0xe3, 0x7a, 0x36, 0x8d, 0x2c, 0x5d, 0x6d, 0x5a, 0x1c, 0x9d, 0xef, 0x8c, 0xd5, + 0x89, 0x8d, 0xad, 0x04, 0xa2, 0x0c, 0x2f, 0xe9, 0x18, 0x48, 0x92, 0x85, 0x29, 0xd5, 0x64, 0x1d, + 0xca, 0x66, 0x9b, 0xfb, 0x9e, 0xe1, 0x81, 0x4a, 0x61, 0xb8, 0x98, 0x67, 0xfb, 0x56, 0x94, 0x8c, + 0xdc, 0x56, 0xa2, 0x2f, 0xd4, 0x65, 0xf9, 0xbe, 0xac, 0x33, 0xea, 0x2a, 0x63, 0xec, 0xcb, 0x51, + 0x9c, 0x2c, 0x71, 0xa2, 0x53, 0x94, 0x44, 0x82, 0x9d, 0x01, 0x25, 0xe9, 0xdd, 0x0a, 0xd7, 0xbe, + 0x2c, 0x1d, 0x15, 0xe9, 0xf9, 0xa2, 0xe2, 0x90, 0x4e, 0xe4, 0x97, 0x54, 0x45, 0xe7, 0x36, 0x47, + 0xf6, 0xd5, 0xb4, 0xab, 0x93, 0xef, 0x98, 0x90, 0x9b, 0xc9, 0xed, 0x63, 0xe6, 0x49, 0xb6, 0x8f, + 0xd9, 0x63, 0xb7, 0x8e, 0x0e, 0x94, 0x98, 0xd8, 0x9c, 0x84, 0x4b, 0x5f, 0xbd, 0xb2, 0x3a, 0xda, + 0xd9, 0x26, 0xb5, 0xbf, 0xc9, 0xde, 0x91, 0x34, 0x54, 0xf0, 0xc4, 0x83, 0x72, 0xa0, 0x8e, 0xee, + 0x2a, 0x2a, 0x30, 0xda, 0x8d, 0x44, 0xf6, 0xfc, 0x2f, 0xe7, 0x47, 0x44, 0x45, 0xad, 0x84, 0xbc, + 0x03, 0x93, 0xb6, 0xd9, 0x51, 0xf1, 0x81, 0xaf, 0x8f, 0x9c, 0xc4, 0x11, 0xa9, 0x11, 0x89, 0xe2, + 0x6b, 0x2b, 0xd7, 0x91, 0xa3, 0x92, 0xbd, 0x38, 0xb3, 0x6f, 0x7e, 0x8c, 0xfc, 0xeb, 0xcc, 0x7e, + 0x27, 0x3d, 0xc6, 0xa1, 0xdc, 0xc0, 0x6b, 0x30, 0xfd, 0xd0, 0xeb, 0x0d, 0xfa, 0x2a, 0xb0, 0x50, + 0xbd, 0xb2, 0x98, 0x37, 0xda, 0xf7, 0x84, 0x48, 0x6c, 0x04, 0xe4, 0x37, 0xc3, 0xa8, 0x2c, 0xf9, + 0xdd, 0x02, 0x9c, 0xe6, 0x4b, 0x47, 0xcf, 0x03, 0x56, 0x23, 0x63, 0xcc, 0xd4, 0xbb, 0x8c, 0x6f, + 0x8c, 0xd1, 0x0c, 0x3b, 0xaf, 0xd4, 0x9e, 0xde, 0x48, 0x69, 0xc0, 0x8c, 0x46, 0xe2, 0x43, 0x99, + 0x39, 0x36, 0xb5, 0xcc, 0x80, 0xd5, 0xce, 0x9e, 0x98, 0xf6, 0xf8, 0x48, 0xad, 0xb0, 0x51, 0x6b, + 0x21, 0xbf, 0x27, 0x72, 0xe6, 0xd5, 0xab, 0x11, 0xf5, 0x92, 0x67, 0xe1, 0x24, 0x5f, 0xf2, 0x9c, + 0x95, 0x09, 0xf3, 0x29, 0x0d, 0x98, 0x55, 0x49, 0xee, 0xc0, 0x39, 0x99, 0x4d, 0x98, 0x4d, 0xef, + 0x3c, 0x27, 0xee, 0x8c, 0x5e, 0x38, 0x3a, 0xac, 0x9f, 0x5b, 0xc9, 0x13, 0xc0, 0xfc, 0x72, 0xe4, + 0x03, 0x98, 0x0d, 0x92, 0xee, 0x58, 0xed, 0xfc, 0x18, 0x09, 0x0b, 0x29, 0xc7, 0x4e, 0x06, 0xae, + 0x52, 0x24, 0x4c, 0xeb, 0x22, 0xaf, 0x41, 0xd5, 0x57, 0x96, 0xca, 0x61, 0xfd, 0xda, 0x05, 0xd1, + 0x06, 0xb1, 0xa3, 0x6e, 0xc7, 0x64, 0x4c, 0xca, 0x90, 0xbb, 0x50, 0x0d, 0xbd, 0x1e, 0x0d, 0xd4, + 0xe5, 0x4a, 0x4d, 0x0c, 0xfe, 0x52, 0xde, 0x4c, 0xde, 0xd1, 0x62, 0x71, 0xe8, 0x3e, 0xa6, 0x31, + 0x4c, 0xe2, 0x70, 0xb7, 0x3e, 0xca, 0xe6, 0x0d, 0x44, 0x0c, 0xe3, 0x85, 0xb4, 0x5b, 0xdf, 0x4a, + 0x32, 0x31, 0x2d, 0xcb, 0x1d, 0x75, 0x3f, 0x70, 0xbc, 0xc0, 0x09, 0x0f, 0x56, 0x7b, 0x26, 0x63, + 0x02, 0x60, 0x51, 0x00, 0x68, 0x47, 0x7d, 0x3b, 0x2b, 0x80, 0xc3, 0x65, 0xb8, 0x37, 0x14, 0x11, + 0x6b, 0x9f, 0x13, 0x07, 0x38, 0x61, 0x96, 0xa2, 0xb2, 0xa8, 0xb9, 0xc7, 0xa4, 0x6f, 0x5d, 0x1c, + 0x25, 0x7d, 0x8b, 0xd8, 0x70, 0xd1, 0x1c, 0x84, 0x5e, 0x9f, 0x13, 0xd2, 0x45, 0x76, 0xbc, 0x3d, + 0xea, 0xd6, 0x2e, 0x89, 0xbd, 0xea, 0xd2, 0xd1, 0x61, 0xfd, 0xe2, 0xca, 0x63, 0xe4, 0xf0, 0xb1, + 0x28, 0xa4, 0x0f, 0x65, 0xaa, 0x52, 0xd0, 0x6a, 0x9f, 0x1f, 0x63, 0x93, 0x48, 0xe7, 0xb1, 0xc9, + 0x0e, 0x8a, 0x68, 0xa8, 0x55, 0x90, 0x1d, 0xa8, 0x76, 0x3d, 0x16, 0xae, 0xf4, 0x1c, 0x93, 0x51, + 0x56, 0x7b, 0x51, 0xcc, 0x93, 0xdc, 0xfd, 0xed, 0x46, 0x24, 0x16, 0x4f, 0x93, 0x1b, 0x71, 0x49, + 0x4c, 0xc2, 0x10, 0x2a, 0x5c, 0xc3, 0x81, 0x18, 0x35, 0xcf, 0x0d, 0xe9, 0xfb, 0x61, 0x6d, 0x49, + 0xb4, 0xe5, 0xe5, 0x3c, 0xe4, 0x6d, 0xcf, 0x6e, 0xa5, 0xa5, 0xe5, 0x2a, 0xcf, 0x10, 0x31, 0x8b, + 0x49, 0x5e, 0x87, 0x19, 0xdf, 0xb3, 0x5b, 0x3e, 0xb5, 0xb6, 0xcd, 0xd0, 0xea, 0xd6, 0xea, 0xe9, + 0xab, 0xa1, 0xed, 0x04, 0x0f, 0x53, 0x92, 0x8b, 0x6f, 0xc3, 0x99, 0xa1, 0xf3, 0xd4, 0x53, 0xdd, + 0xa3, 0xfd, 0x39, 0xf7, 0x7e, 0x12, 0x27, 0xd8, 0x93, 0x3e, 0xf7, 0x5f, 0x87, 0x33, 0xea, 0x25, + 0x2e, 0xdf, 0x6c, 0x7b, 0x03, 0xfd, 0x76, 0x25, 0x11, 0xd4, 0xc2, 0xac, 0x00, 0x0e, 0x97, 0x31, + 0xfe, 0xa2, 0x00, 0xb3, 0x29, 0xf3, 0x7d, 0xe2, 0xfe, 0xf0, 0x3a, 0x90, 0xbe, 0x13, 0x04, 0x5e, + 0x20, 0xf7, 0xc0, 0x4d, 0x3e, 0x97, 0x99, 0x7a, 0x02, 0x23, 0x52, 0x70, 0x36, 0x87, 0xb8, 0x98, + 0x53, 0xc2, 0xf8, 0xdb, 0x02, 0xc4, 0x51, 0x53, 0x9d, 0x77, 0x56, 0x38, 0x36, 0xef, 0xec, 0x15, + 0x28, 0x3f, 0x60, 0x9e, 0xbb, 0x1d, 0x67, 0xa7, 0xe9, 0x0e, 0xbd, 0xd9, 0xba, 0xb3, 0x25, 0x24, + 0xb5, 0x84, 0x90, 0x7e, 0x6f, 0xdd, 0xe9, 0x85, 0xc3, 0x39, 0x5c, 0x37, 0x7f, 0x55, 0xd2, 0x51, + 0x4b, 0x90, 0x65, 0xa8, 0xe8, 0x40, 0xbd, 0x72, 0xa4, 0x75, 0x27, 0xe8, 0x28, 0x35, 0xc6, 0x32, + 0xc6, 0x0f, 0x27, 0xa0, 0xfc, 0x1c, 0xdf, 0xf3, 0x58, 0xa9, 0xf7, 0x3c, 0x27, 0xf0, 0xf8, 0x23, + 0xef, 0x2d, 0xcf, 0x5e, 0xe6, 0x2d, 0xcf, 0xea, 0x98, 0xb1, 0xff, 0xc7, 0xbe, 0xe3, 0xf9, 0xb8, + 0x00, 0x33, 0xcf, 0xf1, 0x0d, 0xcf, 0x6e, 0xfa, 0x0d, 0xcf, 0x9b, 0x63, 0x35, 0xed, 0x98, 0xf7, + 0x3b, 0x7f, 0xb3, 0x00, 0xa9, 0xb7, 0x33, 0xc4, 0x85, 0x4a, 0xb4, 0xc0, 0xa3, 0xfb, 0x94, 0x37, + 0xc7, 0x72, 0x0a, 0xe3, 0x49, 0x19, 0x51, 0x18, 0xc6, 0x2a, 0xc8, 0x15, 0x00, 0xca, 0x2d, 0x9b, + 0x8c, 0x5a, 0x4e, 0xa4, 0xaf, 0x1b, 0xae, 0x69, 0x0e, 0x26, 0xa4, 0x9e, 0x7f, 0xc0, 0x21, 0x7f, + 0x8b, 0x9e, 0x7a, 0x26, 0x5b, 0xf4, 0xc5, 0x13, 0xdf, 0xa2, 0x5f, 0x7c, 0xf6, 0x5b, 0x74, 0xc2, + 0x21, 0x29, 0x8e, 0xe1, 0x90, 0x7c, 0x00, 0x0b, 0xf2, 0xe7, 0x6a, 0xcf, 0x74, 0xfa, 0x7a, 0xbe, + 0xa8, 0x04, 0xb2, 0x2f, 0xe6, 0x6e, 0xcc, 0x34, 0x60, 0x0e, 0x0b, 0xa9, 0x1b, 0xde, 0x8b, 0x4b, + 0xc6, 0xd9, 0x07, 0xf7, 0x72, 0xe0, 0x30, 0x57, 0x49, 0xf6, 0x04, 0x3b, 0xfd, 0x04, 0x27, 0xd8, + 0x1f, 0x14, 0xe0, 0x9c, 0x99, 0xf7, 0x3c, 0x58, 0xc5, 0x31, 0x6e, 0x8e, 0xe5, 0x4f, 0xa4, 0x10, + 0x95, 0x3f, 0x90, 0xc7, 0xc2, 0xfc, 0x3a, 0x90, 0x2f, 0xc4, 0x2e, 0x69, 0x45, 0x4c, 0xaa, 0x7c, + 0x67, 0xf2, 0xdb, 0xd9, 0x50, 0x10, 0x88, 0xde, 0x6e, 0x8d, 0x6d, 0xb0, 0x4f, 0x20, 0x1c, 0x54, + 0x1d, 0x23, 0x1c, 0x94, 0x71, 0x2f, 0x66, 0x4e, 0xc8, 0xbd, 0x70, 0x61, 0xde, 0xe9, 0x9b, 0x1d, + 0xba, 0x3d, 0xe8, 0xf5, 0x64, 0xec, 0x9f, 0xd5, 0x66, 0x05, 0x76, 0x6e, 0xd6, 0x2f, 0x77, 0xf7, + 0x7a, 0xd9, 0x67, 0x65, 0xfa, 0x96, 0x6d, 0x23, 0x83, 0x84, 0x43, 0xd8, 0x7c, 0x5a, 0xf2, 0x63, + 0xeb, 0x16, 0x0d, 0x79, 0x6f, 0x8b, 0x48, 0x89, 0xfa, 0x37, 0x08, 0x37, 0x62, 0x32, 0x26, 0x65, + 0xc8, 0x2d, 0xa8, 0xd8, 0x2e, 0x53, 0x77, 0x6c, 0x73, 0xc2, 0x4a, 0xbd, 0xca, 0x6d, 0xdb, 0xda, + 0x56, 0x4b, 0xdf, 0xae, 0x5d, 0x1c, 0xfe, 0x3f, 0x2f, 0x0d, 0xcd, 0xc7, 0xb8, 0x3c, 0xd9, 0x14, + 0x60, 0x2a, 0x05, 0x5e, 0x86, 0x36, 0x2e, 0x1d, 0x73, 0x42, 0x5e, 0xdb, 0x8a, 0x32, 0xf6, 0x67, + 0x95, 0x3a, 0x95, 0xd8, 0x1e, 0x23, 0x24, 0xde, 0xea, 0x9c, 0x79, 0xdc, 0x5b, 0x1d, 0x72, 0x17, + 0x2e, 0x84, 0x61, 0x2f, 0x15, 0xef, 0x56, 0xd9, 0x29, 0x22, 0x55, 0xa9, 0x28, 0x9f, 0x3f, 0xee, + 0xec, 0xdc, 0xce, 0x13, 0xc1, 0xe3, 0xca, 0x8a, 0xd0, 0x71, 0xd8, 0xd3, 0x1e, 0xf2, 0xd2, 0x38, + 0xa1, 0xe3, 0xf8, 0x62, 0x41, 0x85, 0x8e, 0x63, 0x02, 0x26, 0xb5, 0x1c, 0xef, 0xe9, 0x9f, 0x1d, + 0xd1, 0xd3, 0x4f, 0x3a, 0x97, 0x0b, 0x8f, 0x75, 0x2e, 0x87, 0x9c, 0xe1, 0x73, 0x4f, 0xe1, 0x0c, + 0xbf, 0x23, 0x92, 0x80, 0xae, 0xaf, 0xaa, 0x40, 0xc2, 0x1b, 0xa3, 0xc5, 0x2f, 0x39, 0x82, 0xbc, + 0x0a, 0x16, 0x3f, 0x51, 0x62, 0x92, 0x6d, 0x58, 0xf0, 0x3d, 0x7b, 0xc8, 0x97, 0x16, 0x91, 0x83, + 0x44, 0xfa, 0xd8, 0x76, 0x8e, 0x0c, 0xe6, 0x96, 0x14, 0x06, 0x3c, 0xa6, 0xd7, 0x6a, 0xa2, 0x63, + 0xa4, 0x01, 0x8f, 0xc9, 0x98, 0x94, 0xc9, 0xba, 0x96, 0x2f, 0x3c, 0x33, 0xd7, 0x72, 0xf1, 0x39, + 0xb8, 0x96, 0x9f, 0x7b, 0x7e, 0xae, 0xe5, 0x5f, 0x56, 0xe0, 0x74, 0xe6, 0x7d, 0xad, 0xce, 0xbf, + 0x2b, 0x3c, 0x69, 0xfe, 0x5d, 0x2a, 0x41, 0x6e, 0xe2, 0x99, 0x26, 0xc8, 0x4d, 0x9e, 0x78, 0x82, + 0x5c, 0x22, 0x11, 0x70, 0xea, 0x33, 0x12, 0x01, 0x57, 0x60, 0xce, 0xf2, 0xfa, 0xbe, 0x78, 0xa8, + 0xa3, 0xd2, 0xc1, 0x64, 0xca, 0x86, 0xbe, 0x5d, 0x5e, 0x4d, 0xb3, 0x31, 0x2b, 0x4f, 0x7e, 0x0b, + 0x8a, 0xae, 0x28, 0x58, 0x1a, 0x23, 0x03, 0x39, 0x3d, 0x60, 0x62, 0x77, 0x56, 0x49, 0xc0, 0x51, + 0xac, 0xb6, 0x28, 0x68, 0x8f, 0xa2, 0x1f, 0x28, 0x95, 0x72, 0x47, 0xdf, 0x6b, 0xb7, 0x7b, 0x9e, + 0x69, 0xc7, 0x69, 0xb9, 0xea, 0xda, 0x43, 0x3b, 0xfa, 0x77, 0xb2, 0x02, 0x38, 0x5c, 0x86, 0x9f, + 0x97, 0xe6, 0xd2, 0x79, 0xa4, 0xac, 0x56, 0x11, 0x2d, 0xfa, 0xb5, 0x93, 0x68, 0x51, 0x3a, 0x69, + 0x55, 0xb5, 0x2d, 0xbe, 0xc2, 0x4f, 0x73, 0x31, 0x5b, 0x13, 0x12, 0xc0, 0x79, 0x3f, 0xef, 0x34, + 0xc9, 0xd4, 0xe5, 0xd8, 0xe3, 0xce, 0xb4, 0x4b, 0x4a, 0xcb, 0xf9, 0xdc, 0xf3, 0x28, 0xc3, 0x63, + 0x90, 0x93, 0x79, 0x8b, 0xe5, 0x67, 0x95, 0xb7, 0xb8, 0x78, 0x20, 0xf3, 0xa9, 0x8f, 0x4d, 0xc5, + 0xbe, 0x9b, 0x7e, 0x1e, 0xf1, 0xf6, 0x88, 0xff, 0xc0, 0x4c, 0x8f, 0x7c, 0x22, 0x0d, 0xfc, 0x77, + 0x0a, 0xb0, 0x90, 0x37, 0x2c, 0x39, 0xb5, 0x68, 0xa5, 0x6b, 0x31, 0x9e, 0xd7, 0x99, 0x34, 0x56, + 0xdf, 0x2d, 0x25, 0x7c, 0xdc, 0x90, 0xfa, 0x3f, 0xbf, 0x00, 0x1f, 0xe9, 0x02, 0x3c, 0xf5, 0x14, + 0xbe, 0xf8, 0x1c, 0x9f, 0xc2, 0x97, 0x46, 0x78, 0x0a, 0x3f, 0xfd, 0x3c, 0x9f, 0xc2, 0x97, 0x9f, + 0xf0, 0x29, 0x7c, 0xe5, 0x7f, 0xcf, 0x53, 0xf8, 0x4f, 0x0b, 0x30, 0x9f, 0xcd, 0xcc, 0x7f, 0x0e, + 0x31, 0xc1, 0xbd, 0x54, 0x4c, 0x70, 0x63, 0x2c, 0xa3, 0xaf, 0x5f, 0x03, 0x1c, 0x13, 0x1b, 0x34, + 0x7e, 0x52, 0x80, 0xa1, 0xd7, 0x07, 0xcf, 0x21, 0x6c, 0xf7, 0x20, 0x1d, 0xb6, 0xbb, 0x76, 0x22, + 0x8d, 0x3c, 0x26, 0x7c, 0xf7, 0xd3, 0x9c, 0x26, 0xfe, 0x8f, 0x84, 0xf1, 0x52, 0x26, 0x70, 0xe2, + 0xd9, 0x9b, 0xc0, 0x66, 0xe3, 0xa3, 0x4f, 0x97, 0x4e, 0x7d, 0xfc, 0xe9, 0xd2, 0xa9, 0x4f, 0x3e, + 0x5d, 0x3a, 0xf5, 0xe1, 0xd1, 0x52, 0xe1, 0xa3, 0xa3, 0xa5, 0xc2, 0xc7, 0x47, 0x4b, 0x85, 0x4f, + 0x8e, 0x96, 0x0a, 0x3f, 0x39, 0x5a, 0x2a, 0x7c, 0xe7, 0x9f, 0x97, 0x4e, 0xfd, 0x7a, 0x39, 0xc2, + 0xfd, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xea, 0x03, 0xa1, 0x34, 0x81, 0x55, 0x00, 0x00, } func (m *ArchiveStrategy) Marshal() (dAtA []byte, err error) { @@ -4127,8 +4126,8 @@ func (m *TTLStrategy) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.SecondsAfterFailed != nil { - i = encodeVarintGenerated(dAtA, i, uint64(*m.SecondsAfterFailed)) + if m.SecondsAfterFailure != nil { + i = encodeVarintGenerated(dAtA, i, uint64(*m.SecondsAfterFailure)) i-- dAtA[i] = 0x18 } @@ -4137,8 +4136,8 @@ func (m *TTLStrategy) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.SecondsAfterCompleted != nil { - i = encodeVarintGenerated(dAtA, i, uint64(*m.SecondsAfterCompleted)) + if m.SecondsAfterCompletion != nil { + i = encodeVarintGenerated(dAtA, i, uint64(*m.SecondsAfterCompletion)) i-- dAtA[i] = 0x8 } @@ -6368,14 +6367,14 @@ func (m *TTLStrategy) Size() (n int) { } var l int _ = l - if m.SecondsAfterCompleted != nil { - n += 1 + sovGenerated(uint64(*m.SecondsAfterCompleted)) + if m.SecondsAfterCompletion != nil { + n += 1 + sovGenerated(uint64(*m.SecondsAfterCompletion)) } if m.SecondsAfterSuccess != nil { n += 1 + sovGenerated(uint64(*m.SecondsAfterSuccess)) } - if m.SecondsAfterFailed != nil { - n += 1 + sovGenerated(uint64(*m.SecondsAfterFailed)) + if m.SecondsAfterFailure != nil { + n += 1 + sovGenerated(uint64(*m.SecondsAfterFailure)) } return n } @@ -7415,9 +7414,9 @@ func (this *TTLStrategy) String() string { return "nil" } s := strings.Join([]string{`&TTLStrategy{`, - `SecondsAfterCompleted:` + valueToStringGenerated(this.SecondsAfterCompleted) + `,`, + `SecondsAfterCompletion:` + valueToStringGenerated(this.SecondsAfterCompletion) + `,`, `SecondsAfterSuccess:` + valueToStringGenerated(this.SecondsAfterSuccess) + `,`, - `SecondsAfterFailed:` + valueToStringGenerated(this.SecondsAfterFailed) + `,`, + `SecondsAfterFailure:` + valueToStringGenerated(this.SecondsAfterFailure) + `,`, `}`, }, "") return s @@ -15035,7 +15034,7 @@ func (m *TTLStrategy) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SecondsAfterCompleted", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SecondsAfterCompletion", wireType) } var v int32 for shift := uint(0); ; shift += 7 { @@ -15052,7 +15051,7 @@ func (m *TTLStrategy) Unmarshal(dAtA []byte) error { break } } - m.SecondsAfterCompleted = &v + m.SecondsAfterCompletion = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SecondsAfterSuccess", wireType) @@ -15075,7 +15074,7 @@ func (m *TTLStrategy) Unmarshal(dAtA []byte) error { m.SecondsAfterSuccess = &v case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SecondsAfterFailed", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SecondsAfterFailure", wireType) } var v int32 for shift := uint(0); ; shift += 7 { @@ -15092,7 +15091,7 @@ func (m *TTLStrategy) Unmarshal(dAtA []byte) error { break } } - m.SecondsAfterFailed = &v + m.SecondsAfterFailure = &v default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/pkg/apis/workflow/v1alpha1/generated.proto b/pkg/apis/workflow/v1alpha1/generated.proto index d90a5c9b9f39..cab086cbe606 100644 --- a/pkg/apis/workflow/v1alpha1/generated.proto +++ b/pkg/apis/workflow/v1alpha1/generated.proto @@ -628,11 +628,11 @@ message SuspendTemplate { // TTLStrategy is the strategy for the time to live depending on if the workflow succeded or failed message TTLStrategy { - optional int32 secondsAfterCompleted = 1; + optional int32 secondsAfterCompletion = 1; optional int32 secondsAfterSuccess = 2; - optional int32 secondsAfterFailed = 3; + optional int32 secondsAfterFailure = 3; } // TarStrategy will tar and gzip the file or directory when saving @@ -921,7 +921,7 @@ message WorkflowSpec { // deleted after ttlSecondsAfterFinished expires. If this field is unset, // ttlSecondsAfterFinished will not expire. If this field is set to zero, // ttlSecondsAfterFinished expires immediately after the Workflow finishes. - // DEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead. + // DEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead. optional int32 ttlSecondsAfterFinished = 18; // TTLStrategy limits the lifetime of a Workflow that has finished execution depending on if it diff --git a/pkg/apis/workflow/v1alpha1/openapi_generated.go b/pkg/apis/workflow/v1alpha1/openapi_generated.go index e2d6a21bd9c4..b39068df871a 100644 --- a/pkg/apis/workflow/v1alpha1/openapi_generated.go +++ b/pkg/apis/workflow/v1alpha1/openapi_generated.go @@ -2195,7 +2195,7 @@ func schema_pkg_apis_workflow_v1alpha1_TTLStrategy(ref common.ReferenceCallback) Description: "TTLStrategy is the strategy for the time to live depending on if the workflow succeded or failed", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "secondsAfterCompleted": { + "secondsAfterCompletion": { SchemaProps: spec.SchemaProps{ Type: []string{"integer"}, Format: "int32", @@ -2207,7 +2207,7 @@ func schema_pkg_apis_workflow_v1alpha1_TTLStrategy(ref common.ReferenceCallback) Format: "int32", }, }, - "secondsAfterFailed": { + "secondsAfterFailure": { SchemaProps: spec.SchemaProps{ Type: []string{"integer"}, Format: "int32", @@ -3152,7 +3152,7 @@ func schema_pkg_apis_workflow_v1alpha1_WorkflowSpec(ref common.ReferenceCallback }, "ttlSecondsAfterFinished": { SchemaProps: spec.SchemaProps{ - Description: "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution (Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be deleted after ttlSecondsAfterFinished expires. If this field is unset, ttlSecondsAfterFinished will not expire. If this field is set to zero, ttlSecondsAfterFinished expires immediately after the Workflow finishes. DEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead.", + Description: "TTLSecondsAfterFinished limits the lifetime of a Workflow that has finished execution (Succeeded, Failed, Error). If this field is set, once the Workflow finishes, it will be deleted after ttlSecondsAfterFinished expires. If this field is unset, ttlSecondsAfterFinished will not expire. If this field is set to zero, ttlSecondsAfterFinished expires immediately after the Workflow finishes. DEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead.", Type: []string{"integer"}, Format: "int32", }, diff --git a/pkg/apis/workflow/v1alpha1/workflow_types.go b/pkg/apis/workflow/v1alpha1/workflow_types.go index 3ffb2a4a0637..0d24d368bc27 100644 --- a/pkg/apis/workflow/v1alpha1/workflow_types.go +++ b/pkg/apis/workflow/v1alpha1/workflow_types.go @@ -131,9 +131,9 @@ var _ TemplateStorage = &Workflow{} // TTLStrategy is the strategy for the time to live depending on if the workflow succeded or failed type TTLStrategy struct { - SecondsAfterCompleted *int32 `json:"secondsAfterCompleted,omitempty" protobuf:"bytes,1,opt,name=secondsAfterCompleted"` - SecondsAfterSuccess *int32 `json:"secondsAfterSuccess,omitempty" protobuf:"bytes,2,opt,name=secondsAfterSuccess"` - SecondsAfterFailed *int32 `json:"secondsAfterFailed,omitempty" protobuf:"bytes,3,opt,name=secondsAfterFailed"` + SecondsAfterCompletion *int32 `json:"secondsAfterCompletion,omitempty" protobuf:"bytes,1,opt,name=secondsAfterCompletion"` + SecondsAfterSuccess *int32 `json:"secondsAfterSuccess,omitempty" protobuf:"bytes,2,opt,name=secondsAfterSuccess"` + SecondsAfterFailure *int32 `json:"secondsAfterFailure,omitempty" protobuf:"bytes,3,opt,name=secondsAfterFailure"` } // WorkflowSpec is the specification of a Workflow. @@ -229,7 +229,7 @@ type WorkflowSpec struct { // deleted after ttlSecondsAfterFinished expires. If this field is unset, // ttlSecondsAfterFinished will not expire. If this field is set to zero, // ttlSecondsAfterFinished expires immediately after the Workflow finishes. - // DEPRECATED: Use TTLStrategy.SecondsAfterCompleted instead. + // DEPRECATED: Use TTLStrategy.SecondsAfterCompletion instead. TTLSecondsAfterFinished *int32 `json:"ttlSecondsAfterFinished,omitempty" protobuf:"bytes,18,opt,name=ttlSecondsAfterFinished"` // TTLStrategy limits the lifetime of a Workflow that has finished execution depending on if it diff --git a/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go index d529011aed96..8ffc99fe7982 100644 --- a/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go @@ -1036,8 +1036,8 @@ func (in *SuspendTemplate) DeepCopy() *SuspendTemplate { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TTLStrategy) DeepCopyInto(out *TTLStrategy) { *out = *in - if in.SecondsAfterCompleted != nil { - in, out := &in.SecondsAfterCompleted, &out.SecondsAfterCompleted + if in.SecondsAfterCompletion != nil { + in, out := &in.SecondsAfterCompletion, &out.SecondsAfterCompletion *out = new(int32) **out = **in } @@ -1046,8 +1046,8 @@ func (in *TTLStrategy) DeepCopyInto(out *TTLStrategy) { *out = new(int32) **out = **in } - if in.SecondsAfterFailed != nil { - in, out := &in.SecondsAfterFailed, &out.SecondsAfterFailed + if in.SecondsAfterFailure != nil { + in, out := &in.SecondsAfterFailure, &out.SecondsAfterFailure *out = new(int32) **out = **in } diff --git a/workflow/ttlcontroller/ttlcontroller.go b/workflow/ttlcontroller/ttlcontroller.go index 6c4c6a21463a..0fa067b8482c 100644 --- a/workflow/ttlcontroller/ttlcontroller.go +++ b/workflow/ttlcontroller/ttlcontroller.go @@ -203,14 +203,14 @@ func (c *Controller) ttlExpired(wf *wfv1.Workflow) bool { return false } now := c.clock.Now() - if wf.Status.Failed() && wf.Spec.TTLStrategy != nil && wf.Spec.TTLStrategy.SecondsAfterFailed != nil { - expiry := wf.Status.FinishedAt.Add(time.Second * time.Duration(*wf.Spec.TTLStrategy.SecondsAfterFailed)) + if wf.Status.Failed() && wf.Spec.TTLStrategy != nil && wf.Spec.TTLStrategy.SecondsAfterFailure != nil { + expiry := wf.Status.FinishedAt.Add(time.Second * time.Duration(*wf.Spec.TTLStrategy.SecondsAfterFailure)) return now.After(expiry) } else if wf.Status.Successful() && wf.Spec.TTLStrategy != nil && wf.Spec.TTLStrategy.SecondsAfterSuccess != nil { expiry := wf.Status.FinishedAt.Add(time.Second * time.Duration(*wf.Spec.TTLStrategy.SecondsAfterSuccess)) return now.After(expiry) } else { - expiry := wf.Status.FinishedAt.Add(time.Second * time.Duration(*wf.Spec.TTLStrategy.SecondsAfterCompleted)) + expiry := wf.Status.FinishedAt.Add(time.Second * time.Duration(*wf.Spec.TTLStrategy.SecondsAfterCompletion)) return now.After(expiry) } } @@ -224,16 +224,16 @@ func timeLeft(wf *wfv1.Workflow, since *time.Time) (*time.Duration, *time.Time) if finishAtUTC.After(sinceUTC) { log.Infof("Warning: Found Workflow %s/%s finished in the future. This is likely due to time skew in the cluster. Workflow cleanup will be deferred.", wf.Namespace, wf.Name) } - if wf.Status.Failed() && wf.Spec.TTLStrategy.SecondsAfterFailed != nil { - expireAtUTC := finishAtUTC.Add(time.Duration(*wf.Spec.TTLStrategy.SecondsAfterFailed) * time.Second) + if wf.Status.Failed() && wf.Spec.TTLStrategy.SecondsAfterFailure != nil { + expireAtUTC := finishAtUTC.Add(time.Duration(*wf.Spec.TTLStrategy.SecondsAfterFailure) * time.Second) remaining := expireAtUTC.Sub(sinceUTC) return &remaining, &expireAtUTC } else if wf.Status.Successful() && wf.Spec.TTLStrategy.SecondsAfterSuccess != nil { expireAtUTC := finishAtUTC.Add(time.Duration(*wf.Spec.TTLStrategy.SecondsAfterSuccess) * time.Second) remaining := expireAtUTC.Sub(sinceUTC) return &remaining, &expireAtUTC - } else if wf.Spec.TTLStrategy.SecondsAfterCompleted != nil { - expireAtUTC := finishAtUTC.Add(time.Duration(*wf.Spec.TTLStrategy.SecondsAfterCompleted) * time.Second) + } else if wf.Spec.TTLStrategy.SecondsAfterCompletion != nil { + expireAtUTC := finishAtUTC.Add(time.Duration(*wf.Spec.TTLStrategy.SecondsAfterCompletion) * time.Second) remaining := expireAtUTC.Sub(sinceUTC) return &remaining, &expireAtUTC } else { diff --git a/workflow/ttlcontroller/ttlcontroller_test.go b/workflow/ttlcontroller/ttlcontroller_test.go index dc4587a13b71..d203faabdd72 100644 --- a/workflow/ttlcontroller/ttlcontroller_test.go +++ b/workflow/ttlcontroller/ttlcontroller_test.go @@ -187,7 +187,7 @@ func TestTTLStrategyFailed(t *testing.T) { // Veirfy we do not enqueue if not completed wf := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailed: &ten} + wf.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailure: &ten} wf.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-5 * time.Second)} un, err = util.ToUnstructured(wf) assert.NoError(t, err) @@ -195,7 +195,7 @@ func TestTTLStrategyFailed(t *testing.T) { assert.Equal(t, 0, controller.workqueue.Len()) wf1 := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf1.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailed: &ten} + wf1.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailure: &ten} wf1.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-11 * time.Second)} un, err = util.ToUnstructured(wf1) assert.NoError(t, err) @@ -243,7 +243,7 @@ func TestNoTTLStrategyFailedButTTLSecondsAfterFinished(t *testing.T) { wf1 := test.LoadWorkflowFromBytes([]byte(failedWf)) wf1.Spec.TTLSecondsAfterFinished = &ten - ttlstrategy := wfv1.TTLStrategy{SecondsAfterFailed: &ten} + ttlstrategy := wfv1.TTLStrategy{SecondsAfterFailure: &ten} wf1.Spec.TTLStrategy = &ttlstrategy wf1.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-11 * time.Second)} un, err = util.ToUnstructured(wf1) @@ -260,7 +260,7 @@ func TestTTLStrategyFromUnstructured(t *testing.T) { controller := newTTLController() wf := test.LoadWorkflowFromBytes([]byte(failedWf)) wf.Spec.TTLSecondsAfterFinished = &ten - ttlstrategy := wfv1.TTLStrategy{SecondsAfterFailed: &five} + ttlstrategy := wfv1.TTLStrategy{SecondsAfterFailure: &five} wf.Spec.TTLStrategy = &ttlstrategy wf.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-6 * time.Second)} un, err = util.ToUnstructured(wf) @@ -271,7 +271,7 @@ func TestTTLStrategyFromUnstructured(t *testing.T) { controller1 := newTTLController() wf1 := test.LoadWorkflowFromBytes([]byte(failedWf)) wf1.Spec.TTLSecondsAfterFinished = &ten - ttlstrategy1 := wfv1.TTLStrategy{SecondsAfterCompleted: &five} + ttlstrategy1 := wfv1.TTLStrategy{SecondsAfterCompletion: &five} wf1.Spec.TTLStrategy = &ttlstrategy1 wf1.Status.FinishedAt = metav1.Time{Time: controller1.clock.Now().Add(-6 * time.Second)} un, err = util.ToUnstructured(wf1) @@ -282,7 +282,7 @@ func TestTTLStrategyFromUnstructured(t *testing.T) { controller2 := newTTLController() wf2 := test.LoadWorkflowFromBytes([]byte(failedWf)) wf2.Spec.TTLSecondsAfterFinished = &ten - ttlstrategy2 := wfv1.TTLStrategy{SecondsAfterFailed: &five} + ttlstrategy2 := wfv1.TTLStrategy{SecondsAfterFailure: &five} wf2.Spec.TTLStrategy = &ttlstrategy2 wf2.Status.FinishedAt = metav1.Time{Time: controller2.clock.Now().Add(-6 * time.Second)} un, err = util.ToUnstructured(wf2) @@ -307,31 +307,31 @@ func TestTTLlExpired(t *testing.T) { var ten int32 = 10 wf := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailed: &ten} + wf.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailure: &ten} wf.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-11 * time.Second)} assert.Equal(t, true, wf.Status.Failed()) now := controller.clock.Now() - assert.Equal(t, true, now.After(wf.Status.FinishedAt.Add(time.Second*time.Duration(*wf.Spec.TTLStrategy.SecondsAfterFailed)))) - assert.Equal(t, true, wf.Status.Failed() && wf.Spec.TTLStrategy.SecondsAfterFailed != nil) + assert.Equal(t, true, now.After(wf.Status.FinishedAt.Add(time.Second*time.Duration(*wf.Spec.TTLStrategy.SecondsAfterFailure)))) + assert.Equal(t, true, wf.Status.Failed() && wf.Spec.TTLStrategy.SecondsAfterFailure != nil) assert.Equal(t, true, controller.ttlExpired(wf)) wf1 := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf1.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailed: &ten} + wf1.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailure: &ten} wf1.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-5 * time.Second)} assert.Equal(t, false, controller.ttlExpired(wf1)) wf2 := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf2.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailed: &ten} + wf2.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterFailure: &ten} wf2.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-11 * time.Second)} assert.Equal(t, true, controller.ttlExpired(wf2)) wf3 := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf3.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterCompleted: &ten} + wf3.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterCompletion: &ten} wf3.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-5 * time.Second)} assert.Equal(t, false, controller.ttlExpired(wf3)) wf4 := test.LoadWorkflowFromBytes([]byte(failedWf)) - wf4.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterCompleted: &ten} + wf4.Spec.TTLStrategy = &wfv1.TTLStrategy{SecondsAfterCompletion: &ten} wf4.Status.FinishedAt = metav1.Time{Time: controller.clock.Now().Add(-11 * time.Second)} assert.Equal(t, true, controller.ttlExpired(wf4)) diff --git a/workflow/util/util.go b/workflow/util/util.go index 0309119b01d5..71ab21ff9aa9 100644 --- a/workflow/util/util.go +++ b/workflow/util/util.go @@ -125,10 +125,10 @@ func FromUnstructured(un *unstructured.Unstructured) (*wfv1.Workflow, error) { err := runtime.DefaultUnstructuredConverter.FromUnstructured(un.Object, &wf) if wf.Spec.TTLSecondsAfterFinished != nil { if wf.Spec.TTLStrategy == nil { - ttlstrategy := wfv1.TTLStrategy{SecondsAfterCompleted: wf.Spec.TTLSecondsAfterFinished} + ttlstrategy := wfv1.TTLStrategy{SecondsAfterCompletion: wf.Spec.TTLSecondsAfterFinished} wf.Spec.TTLStrategy = &ttlstrategy - } else if wf.Spec.TTLStrategy.SecondsAfterCompleted == nil { - wf.Spec.TTLStrategy.SecondsAfterCompleted = wf.Spec.TTLSecondsAfterFinished + } else if wf.Spec.TTLStrategy.SecondsAfterCompletion == nil { + wf.Spec.TTLStrategy.SecondsAfterCompletion = wf.Spec.TTLSecondsAfterFinished } } return &wf, err