From a2ba171b7233fd4a11be68042349352c1844e708 Mon Sep 17 00:00:00 2001 From: Gurnank Date: Mon, 16 Dec 2024 12:02:01 +0000 Subject: [PATCH 1/2] Revert "MAP-1937 move ttlSecondsAfterFinished to correct nest (#745)" This reverts commit 719b6c86af9d6fbe455c349f1c27a00511e24ad5. --- helm_deploy/use-of-force/templates/job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm_deploy/use-of-force/templates/job.yaml b/helm_deploy/use-of-force/templates/job.yaml index a3f77f15..5b1a8bc9 100644 --- a/helm_deploy/use-of-force/templates/job.yaml +++ b/helm_deploy/use-of-force/templates/job.yaml @@ -9,8 +9,8 @@ spec: startingDeadlineSeconds: 300 successfulJobsHistoryLimit: 5 jobTemplate: + ttlSecondsAfterFinished: 100 spec: - ttlSecondsAfterFinished: 100 template: spec: restartPolicy: Never From 730fcc92b9fb22ff0fcff78c6c7649c8764a4b2d Mon Sep 17 00:00:00 2001 From: Gurnank Date: Mon, 16 Dec 2024 12:02:13 +0000 Subject: [PATCH 2/2] Revert "MAP-1937 give jobs longer time to complete. (#744)" This reverts commit d9c7faec11af4e090bfa6bebb765c9b9af2029af. --- helm_deploy/use-of-force/templates/job.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/helm_deploy/use-of-force/templates/job.yaml b/helm_deploy/use-of-force/templates/job.yaml index 5b1a8bc9..1c010096 100644 --- a/helm_deploy/use-of-force/templates/job.yaml +++ b/helm_deploy/use-of-force/templates/job.yaml @@ -3,18 +3,17 @@ kind: CronJob metadata: name: send-reminders spec: - schedule: "*/15 * * * *" + schedule: "*/5 * * * *" concurrencyPolicy: Replace failedJobsHistoryLimit: 5 startingDeadlineSeconds: 300 successfulJobsHistoryLimit: 5 jobTemplate: - ttlSecondsAfterFinished: 100 spec: template: spec: restartPolicy: Never - activeDeadlineSeconds: 600 + activeDeadlineSeconds: 298 containers: - name: use-of-force image: {{ with index .Values "generic-service" }}{{ .image.repository }}:{{ .image.tag }}{{ end }}