Merge pull request 'Ajout de la tâche programmée "janitor" pour Hydra' (#8) from hydra-janitor into develop
Reviewed-on: #8
This commit is contained in:
commit
4d29851350
|
@ -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
|
||||
|
|
|
@ -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"
|
|
@ -9,6 +9,7 @@ resources:
|
|||
- ./resources/hydra-serviceaccount.yaml
|
||||
- ./resources/hydra-migrate-job.yaml
|
||||
- ./resources/hydra-maester
|
||||
- ./resources/hydra-janitor-cronjob.yaml
|
||||
|
||||
secretGenerator:
|
||||
- name: hydra-secret
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: hydra-janitor
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-janitor
|
||||
spec:
|
||||
concurrencyPolicy: Forbid
|
||||
schedule: "0 */1 * * *"
|
||||
jobTemplate:
|
||||
spec:
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-janitor
|
||||
spec:
|
||||
restartPolicy: OnFailure
|
||||
serviceAccountName: hydra-sa
|
||||
containers:
|
||||
- name: janitor
|
||||
image: reg.cadoles.com/proxy_cache/oryd/hydra:v2.0.3
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-env
|
||||
imagePullPolicy: IfNotPresent
|
||||
command: ["hydra"]
|
||||
env: []
|
||||
args:
|
||||
- janitor
|
||||
- --read-from-env
|
||||
- --grants
|
||||
- --requests
|
||||
- --tokens
|
||||
resources: {}
|
Loading…
Reference in New Issue