From d2bd74a486c6b4eecc4616d98b98f7abbc809260 Mon Sep 17 00:00:00 2001
From: michalnawrockidj <92578842+michalnawrockidj@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:32:49 +0100
Subject: [PATCH] MAP-1651 fixing cron job (#721)

* MAP-1651 fixing cron job

* MAP-1651 fixing cron job

* MAP-1651 clean up
---
 helm_deploy/use-of-force/templates/job.yaml | 6 +++---
 helm_deploy/use-of-force/values.yaml        | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/helm_deploy/use-of-force/templates/job.yaml b/helm_deploy/use-of-force/templates/job.yaml
index 8e3c5de3..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" . | nindent 12 }}
-          restartPolicy: Never
-          activeDeadlineSeconds: 240
+{{- include "deployment.envs" (index .Values "generic-service") | nindent 12 }}
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