Compare commits
1 Commits
cc31ab5091
...
f780023daf
Author | SHA1 | Date |
---|---|---|
wpetit | f780023daf |
|
@ -29,7 +29,7 @@ vars:
|
||||||
fieldref:
|
fieldref:
|
||||||
fieldpath: metadata.name
|
fieldpath: metadata.name
|
||||||
|
|
||||||
patches:
|
patchesJson6902:
|
||||||
- target:
|
- target:
|
||||||
group: apps
|
group: apps
|
||||||
version: v1
|
version: v1
|
||||||
|
@ -42,9 +42,3 @@ patches:
|
||||||
kind: Job
|
kind: Job
|
||||||
name: hydra-migrate
|
name: hydra-migrate
|
||||||
path: patches/hydra-migrate-job.yaml
|
path: patches/hydra-migrate-job.yaml
|
||||||
- target:
|
|
||||||
group: batch
|
|
||||||
version: v1
|
|
||||||
kind: CronJob
|
|
||||||
name: hydra-janitor
|
|
||||||
path: patches/hydra-janitor-cronjob.yaml
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
- 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,7 +9,6 @@ resources:
|
||||||
- ./resources/hydra-serviceaccount.yaml
|
- ./resources/hydra-serviceaccount.yaml
|
||||||
- ./resources/hydra-migrate-job.yaml
|
- ./resources/hydra-migrate-job.yaml
|
||||||
- ./resources/hydra-maester
|
- ./resources/hydra-maester
|
||||||
- ./resources/hydra-janitor-cronjob.yaml
|
|
||||||
|
|
||||||
secretGenerator:
|
secretGenerator:
|
||||||
- name: hydra-secret
|
- name: hydra-secret
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
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