BC-7167 - add missing ConfigMap and concurrencyPolicy (#4959)

* add dedicated ConfigMap for the moin.schule users deletion queueing CronJob * add concurrencyPolicy: Forbid to the moin.schule integration CronJobs * add EXIT_ON_ERROR: "true" to both of the moin.schule integration CronJobs
hpi-schul-cloud · Apr 25, 2024 · 321f98b · 321f98b
1 parent cef3efa
commit 321f98b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/ansible/roles/moin-schule-sync/tasks/main.yml b/ansible/roles/moin-schule-sync/tasks/main.yml
@@ -25,3 +25,10 @@
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: moin-schule-users-deletion-queueing-cronjob.yml.j2
+
+- name: unsynced moin.schule users deletion queueing CronJob ConfigMap
+  when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool == true and WITH_UNSYNCED_ENTITIES_DELETION is defined and WITH_UNSYNCED_ENTITIES_DELETION|bool == true
+  kubernetes.core.k8s:
+    kubeconfig: ~/.kube/config
+    namespace: "{{ NAMESPACE }}"
+    template: moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2
diff --git a/...s/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2 b/...s/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ NAMESPACE }}
+  name: moin-schule-users-deletion-queueing-cronjob-configmap
+  labels:
+    app: moin-schule-users-deletion-queueing-cronjob
+data:
+  NODE_OPTIONS: "--max-old-space-size=3072"
+  NEST_LOG_LEVEL: "info"
+  EXIT_ON_ERROR: "true"
+  SC_DOMAIN: "{{ DOMAIN }}"
+  FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob.yml.j2
@@ -14,6 +14,7 @@ metadata:
   name: moin-schule-users-deletion-queueing-cronjob
 spec:
   schedule: "{{ MOIN_SCHULE_USERS_DELETION_QUEUEING_CRONJOB_SCHEDULE|default("@hourly", true) }}"
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
       template:
@@ -22,6 +23,8 @@ spec:
           - name: moin-schule-users-deletion-queueing-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}
             envFrom:
+            - configMapRef:
+                name: moin-schule-users-deletion-queueing-cronjob-configmap
             - secretRef:
                 name: moin-schule-sync-secret
             command: ['/bin/sh','-c']

diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob-configmap.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob-configmap.yml.j2
@@ -8,5 +8,6 @@ metadata:
 data:
   NODE_OPTIONS: "--max-old-space-size=3072"
   NEST_LOG_LEVEL: "info"
+  EXIT_ON_ERROR: "true"
   SC_DOMAIN: "{{ DOMAIN }}"
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob.yml.j2
@@ -14,6 +14,7 @@ metadata:
   name: moin-schule-users-sync-cronjob
 spec:
   schedule: "{{ MOIN_SCHULE_USERS_SYNC_CRONJOB_SCHEDULE|default("@hourly", true) }}"
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
       template: