feat(hydra): add janitor cronjob

components/hydra-cnpg-database/kustomization.yaml

@@ -29,7 +29,7 @@ vars:
   fieldref:
     fieldpath: metadata.name
 
-patchesJson6902:
+patches:
 - target:
     group: apps
     version: v1
@@ -42,3 +42,9 @@ patchesJson6902:
     kind: Job
     name: hydra-migrate
   path: patches/hydra-migrate-job.yaml
+- target:
+    group: batch
+    version: v1
+    kind: CronJob
+    name: hydra-janitor
+  path: patches/hydra-janitor-cronjob.yaml

components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml

@@ -0,0 +1,21 @@
+- op: add
+  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_USER
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-user
+        key: username
+- op: add
+  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-user
+        key: password
+- op: add
+  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
+  value:
+    name: DSN
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"

resources/hydra/resources/hydra-janitor-cronjob.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name: hydra-janitor
 spec:
   concurrencyPolicy: Forbid
-  schedule: "* * * * *"
+  schedule: "0 */1 * * *"
   jobTemplate:
     spec:
       template:
@@ -24,14 +24,11 @@ spec:
                   name: hydra-env
               imagePullPolicy: IfNotPresent
               command: ["hydra"]
+              env: []
               args:
-                - --read-from-env
                 - janitor
+                - --read-from-env
                 - --grants
                 - --requests
                 - --tokens
-                - --batch-size
-                - "100"
-                - --limit
-                - "10000"
               resources: {}