From f2c2e8eaf7d02949aef1cb68dcd9d39422b2893a Mon Sep 17 00:00:00 2001
From: Michal Nawrocki <michal.nawrocki@digital.justice.gov.uk>
Date: Wed, 2 Oct 2024 09:59:05 +0100
Subject: [PATCH 1/3] MAP-1651 fixing cron job

---
 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 8e3c5de3..734675fb 100644
--- a/helm_deploy/use-of-force/templates/job.yaml
+++ b/helm_deploy/use-of-force/templates/job.yaml
@@ -18,6 +18,6 @@ spec:
             args:
             - node
             - job/sendReminders
-{{ include "deployment.envs" . | nindent 12 }}
+{{- include "deployment.envs" (index .Values "generic-service") | nindent 12 }
           restartPolicy: Never
           activeDeadlineSeconds: 240

From 2f4b51ac32d6eed604be06a6214a596a45d11b0f Mon Sep 17 00:00:00 2001
From: Michal Nawrocki <michal.nawrocki@digital.justice.gov.uk>
Date: Wed, 2 Oct 2024 10:05:16 +0100
Subject: [PATCH 2/3] MAP-1651 fixing cron job

---
 helm_deploy/use-of-force/templates/job.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm_deploy/use-of-force/templates/job.yaml b/helm_deploy/use-of-force/templates/job.yaml
index 734675fb..af7b38e0 100644
--- a/helm_deploy/use-of-force/templates/job.yaml
+++ b/helm_deploy/use-of-force/templates/job.yaml
@@ -12,12 +12,12 @@ spec:
     spec:
       template:
         spec:
+          restartPolicy: Never
+          activeDeadlineSeconds: 240
           containers:
           - name: use-of-force
             image: {{ with index .Values "generic-service" }}{{ .image.repository }}:{{ .image.tag }}{{ end }}
             args:
             - node
             - job/sendReminders
-{{- include "deployment.envs" (index .Values "generic-service") | nindent 12 }
-          restartPolicy: Never
-          activeDeadlineSeconds: 240
+{{- include "deployment.envs" (index .Values "generic-service") | nindent 12 }}

From 69ee868510d96d454a3e043ed449f4fe52685ee0 Mon Sep 17 00:00:00 2001
From: Michal Nawrocki <michal.nawrocki@digital.justice.gov.uk>
Date: Wed, 2 Oct 2024 10:33:34 +0100
Subject: [PATCH 3/3] MAP-1651 clean up

---
 helm_deploy/use-of-force/values.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/helm_deploy/use-of-force/values.yaml b/helm_deploy/use-of-force/values.yaml
index 690584dd..951393f9 100644
--- a/helm_deploy/use-of-force/values.yaml
+++ b/helm_deploy/use-of-force/values.yaml
@@ -49,9 +49,6 @@ generic-service:
       - moj_cloud_platform
       - digital_staff_and_mojo
 
-  jobs:
-    cronspec: "0 8,12,15 * * *"
-  # jobs will run at 9am, 1pm and 4pm
 generic-prometheus-alerts:
   targetApplication: use-of-force
   alertSeverity: digital-prison-service-dev