Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-7167 - add missing ConfigMap and concurrencyPolicy #4959

Merged
merged 5 commits into from
Apr 25, 2024
Merged

BC-7167 - add missing ConfigMap and concurrencyPolicy #4959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
835e556
add dedicated ConfigMap for the moin.schule users deletion queueing C…
bn-pass Apr 24, 2024
0816eca
add concurrencyPolicy: Forbid to the moin.schule integration CronJobs
bn-pass Apr 24, 2024
5f230b4
Merge branch 'main' into BC-7167-add-missing-configmap
bn-pass Apr 24, 2024
e95d9da
Merge branch 'main' into BC-7167-add-missing-configmap
bn-pass Apr 25, 2024
7072e6c
add EXIT_ON_ERROR: "true" to both of the moin.schule integration Cron…
bn-pass Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ansible/roles/moin-schule-sync/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 13 additions & 0 deletions ...s/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions ansible/roles/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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']
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob-configmap.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading