CadolesKube
/
sso-kustom
14
0
Fork 0
Code Issues 19 Pull Requests 4 Projects Releases Wiki Activity

Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 65 commits from unstable into master
pull from: unstable
merge into: CadolesKube:master
Conversation 0 Commits 65 Files Changed 36 +35 -36
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a0ff37edf6 - Show all commits

22
components/hydra-cnpg-database/kustomization.yaml
View File

@ -7,28 +7,6 @@ configurations:
resources: resources:
- ./resources/hydra-cnpg-cluster.yaml - ./resources/hydra-cnpg-cluster.yaml
secretGenerator:
- name: hydra-postgres-admin
type: Secret
literals:
- username=postgres
- password=NotSoSecret
- name: hydra-postgres-user
type: Secret
literals:
- username=hydra
- password=NotSoSecret
vars:
- name: HYDRA_DATABASE_SERVICE_NAME
objref:
name: hydra-postgres
kind: Cluster
apiVersion: postgresql.cnpg.io/v1
fieldref:
fieldpath: metadata.name
patches: patches:
- target: - target:
group: apps group: apps

14
components/hydra-cnpg-database/patches/hydra-deployment.yaml
View File

@ -4,7 +4,7 @@
name: HYDRA_DATABASE_USER name: HYDRA_DATABASE_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: username key: username
- op: add - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
@ -12,10 +12,18 @@
name: HYDRA_DATABASE_PASSWORD name: HYDRA_DATABASE_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: password key: password
- op: add
path: "/spec/template/spec/containers/0/env/-"
value:
name: HYDRA_DATABASE_SERVICE_NAME
valueFrom:
secretKeyRef:
name: hydra-postgres-app
key: host
- op: add - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
value: value:
name: DSN name: DSN
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable" value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)"

14
components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml
View File

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

14
components/hydra-cnpg-database/patches/hydra-migrate-job.yaml
View File

@ -4,7 +4,7 @@
name: HYDRA_DATABASE_USER name: HYDRA_DATABASE_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: username key: username
- op: add - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
@ -12,10 +12,18 @@
name: HYDRA_DATABASE_PASSWORD name: HYDRA_DATABASE_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: password key: password
- op: add
path: "/spec/template/spec/containers/0/env/-"
value:
name: HYDRA_DATABASE_SERVICE_NAME
valueFrom:
secretKeyRef:
name: hydra-postgres-app
key: host
- op: add - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
value: value:
name: DSN name: DSN
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable" value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"

4
components/hydra-cnpg-database/resources/hydra-cnpg-cluster.yaml
View File

@ -5,13 +5,9 @@ metadata:
spec: spec:
instances: 3 instances: 3
primaryUpdateStrategy: unsupervised primaryUpdateStrategy: unsupervised
superuserSecret:
name: hydra-postgres-admin
bootstrap: bootstrap:
initdb: initdb:
database: hydra database: hydra
owner: hydra owner: hydra
secret:
name: hydra-postgres-user
storage: storage:
size: 2Gi size: 2Gi

1
resources/hydra/kustomization.yaml
View File

@ -30,6 +30,7 @@ configMapGenerator:
- URLS_CONSENT=http://hydra-consent-app/consent - URLS_CONSENT=http://hydra-consent-app/consent
- URLS_LOGOUT=http://hydra-logout-app/logout - URLS_LOGOUT=http://hydra-logout-app/logout
- HYDRA_SERVE_ALL_ARGS=--dev - HYDRA_SERVE_ALL_ARGS=--dev
- HYDRA_DATABASE_MAX_CONN="10"
- LOG_LEVEL=info - LOG_LEVEL=info
vars: vars: