Merge pull request #975 from ericvaandering/consistency_cron

Update the helm chart to allow us to use cron instead of jobber.

Author: ericvaandering

helm/rucio-consistency/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.4.1
+version: 3.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/rucio-consistency/templates/crontab-configmap.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "rucio-consistency.fullname" . }}-crontab
+data:
+  consistency-crontab: |+
+    # This is an auto-generated crontab. 
+    # It uses "DeterministicDelay" to space out the running of jobs within the interval specified.
+    # The deterministic delay script is at {{ $.Values.consistency.detDelay }}
+    SHELL=/bin/sh
+    
+    # Special scripts
+     0  0 * * * root /consistency/cleanup.sh
+     5  0 * * 5 root /consistency/RAL_Disk_pre.sh
+    30 23 * * 5 root /consistency/RAL_Disk_post.sh
+    10  0 * * 3 root /consistency/RAL_Tape_pre.sh
+    20 23 * * 3 root /consistency/RAL_Tape_post.sh
+
+    # Auto generated by looping over .Values.consistency.sites from the helm chart
+{{- range $site, $config := .Values.consistency.sites }}
+{{ if gt $config.interval 0.0 }}
+    0 0 * * * root {{ $.Values.consistency.detDelay }} -d {{ $config.interval }}d -f 1d /consistency/site.sh {{ $site }}
+    0 0 * * * root {{ $.Values.consistency.detDelay }} -d {{ $config.interval }}d -f 1d /consistency/unmerged_site.sh {{ $site }}
+{{- end }}
+{{- end }}

helm/rucio-consistency/templates/deployment.yaml

@@ -37,6 +37,14 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+{{- if .Values.consistency.useJobber}}
+            - name: RUCIO_USING_JOBBER
+              value: "1"
+{{- end }}
+{{- if .Values.consistency.useCron}}
+            - name: RUCIO_USING_CRON
+              value: "1"
+{{- end }}
             - name: RUCIO_CFG_COMMON_LOGLEVEL
               value: {{ .Values.consistency.logLevel }}
             - name: RUCIO_CFG_DATABASE_DEFAULT
@@ -80,6 +88,10 @@ spec:
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           volumeMounts:
+{{- if .Values.consistency.useCron}}
+            - mountPath: /etc/cron.rucio/
+              name: crontab
+{{- end }}
             - mountPath: /config/
               name: consistency-config
             - mountPath: /unmerged-config/
@@ -113,6 +125,13 @@ spec:
         secret:
           defaultMode: 420
           secretName: server-rucio-x509up
+{{- if .Values.consistency.useCron}}
+        - configMap:
+            defaultMode: 0644
+            name: {{ include "rucio-consistency.fullname" . }}-crontab
+          name: crontab
+{{- end }}
+# FIXME: Also value for use jobber when it's working
       - name: jobber-config
         configMap:
           defaultMode: 0644

helm/rucio-consistency/values.yaml

@@ -31,6 +31,9 @@ consistency:
   reportSize: 10Gi
   defaultRoot: "/path/to/nowhere"
   rucioCfgSecret: "this-one"
+  useCron: 0
+  useJobber: 1
+  detDelay: /DeterministicDelay
   filter: ""
   sites:
     {}
@@ -40,6 +43,8 @@ consistency:
     # Some_Site:
     #   interval: 0
 
+    # With useCron set, any interval is fine.
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""