Skip to content

Commit 17c3318

Browse files
HeloiseJoffealdbr
authored andcommitted
fix: add resources limit and quote schedule
1 parent 2ac141e commit 17c3318

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

diracx/templates/diracx/cleanup-authdb/_cleanup-authdb.sh.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
set -euo pipefail
33
IFS=$'\n\t'
44

5-
python -m diracx.logic cleanup-authdb --db-url "${DIRACX_DB_URL_AUTHDB}"
5+
python -m diracx.logic cleanup-authdb

diracx/templates/diracx/cleanup-authdb/cronjob.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ metadata:
2020
name: {{ template "cleanupAuthDB.fullname" . }}
2121
namespace: {{ .Release.Namespace }}
2222
spec:
23-
schedule: {{ $.Values.cleanupAuthDB.schedule }}
23+
schedule: {{ $.Values.cleanupAuthDB.schedule | quote }}
2424
jobTemplate:
2525
spec:
2626
template:
@@ -45,6 +45,8 @@ spec:
4545
subPath: jwks.json
4646
- name: scripts
4747
mountPath: /scripts
48+
resources:
49+
{{- toYaml .Values.cleanupAuthDB.resources | nindent 16 }}
4850
volumes:
4951
- name: keystore
5052
secret:

diracx/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ diracx:
155155
DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS: '["http://anything:8000/docs/oauth2-redirect"]'
156156

157157
# -- Tune the AuthDB cleanup cronjob retention periods
158-
# -- DIRACX_SERVICE_AUTH_REVOKED_REFRESH_TOKEN_RETENTION_DAYS: <days>
158+
# -- DIRACX_SERVICE_AUTH_REVOKED_REFRESH_TOKEN_RETENTION_MINUTES: <minutes>
159159
# -- DIRACX_SERVICE_AUTH_COMPLETED_FLOW_RETENTION_MINUTES: <minutes>
160160

161161
# -- legacy exchange key for DIRAC legacy (see https://github.com/DIRACGrid/diracx/blob/7f766158a674fde0eed011cd2745d359e507f846/diracx-routers/src/diracx/routers/auth/token.py#L264)

k3s/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ git add default.yml
263263
git commit -m 'Initial config'
264264
```
265265

266-
267266
## Post-install tips
268267

269268
In case you would like to make us of the services installed (e.g. MySQL or OpenSearch) from outisde the kubernetes cluster, there are different solutions and configurations to make. LoadBalancer, NodePort, or Ingress are the options. One of these would need to be set out.

0 commit comments

Comments
 (0)