Add a global job timeout

DIRACGrid · Oct 18, 2023 · ce28d48 · ce28d48
1 parent 27d8a82
commit ce28d48
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -122,6 +122,7 @@ TODO
 | diracxWeb.service.port | int | `8080` |  |
 | diracxWeb.service.type | string | `"ClusterIP"` |  |
 | fullnameOverride | string | `""` |  |
+| global.activeDeadlineSeconds | int | `900` |  |
 | global.batchJobTTL | int | `600` |  |
 | global.imagePullPolicy | string | `"Always"` |  |
 | image.repository | string | `"ghcr.io/diracgrid/diracx/server"` |  |

diff --git a/diracx/templates/init-cs/job.yaml b/diracx/templates/init-cs/job.yaml
@@ -25,7 +25,7 @@ metadata:
     "helm.sh/hook": pre-install
 spec:
   ttlSecondsAfterFinished: {{ .Values.global.batchJobTTL }}
-  activeDeadlineSeconds: 300
+  activeDeadlineSeconds: {{ .Values.global.activeDeadlineSeconds }}
   template:
     metadata:
       annotations:

diff --git a/diracx/templates/init-secrets/job.yaml b/diracx/templates/init-secrets/job.yaml
@@ -11,7 +11,7 @@ metadata:
     "helm.sh/hook-weight": "-1"
 spec:
   ttlSecondsAfterFinished: {{ .Values.global.batchJobTTL }}
-  activeDeadlineSeconds: 300
+  activeDeadlineSeconds: {{ .Values.global.activeDeadlineSeconds }}
   template:
     metadata:
       annotations:

diff --git a/diracx/templates/init-sql/job.yaml b/diracx/templates/init-sql/job.yaml
@@ -24,7 +24,7 @@ metadata:
     "helm.sh/hook": post-install,pre-upgrade
 spec:
   ttlSecondsAfterFinished: {{ .Values.global.batchJobTTL }}
-  activeDeadlineSeconds: 300
+  activeDeadlineSeconds: {{ .Values.global.activeDeadlineSeconds }}
   template:
     metadata:
       annotations:

diff --git a/diracx/values.yaml b/diracx/values.yaml
@@ -10,6 +10,8 @@ global:
   # For now we override it to Always to avoid confusion around having an
   # outdated reference to the "latest" tag.
   imagePullPolicy: Always
+  # timeout for job deadlines
+  activeDeadlineSeconds: 900
 
 replicaCount: 1