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

Merge branch 'unstable' into add-xdebug

This commit is contained in:
pcaseiro 2024-10-11 09:37:02 +02:00
parent a62394970b de24eb0026
commit 4a74606ec0
9 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,28 +7,6 @@ configurations:
resources:
- ./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:
- target:
group: apps

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

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

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

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

1
components/hydra-oidc/kustomization.yaml
View File

@ -11,6 +11,7 @@ generatorOptions:
configMapGenerator:
- name: hydra-oidc-env
behavior: create
literals:
- APP_ENV=prod
- APP_DEBUG=false

1
components/hydra-sql/kustomization.yaml
View File

@ -11,6 +11,7 @@ generatorOptions:
configMapGenerator:
- name: hydra-sql-env
behavior: create
literals:
- ISSUER_URL="http://localhost:8000"
- BASE_URL='http://localhost:8080'

4
components/hydra-sql/resources/hydra-sql-deployment.yaml
View File

@ -21,7 +21,7 @@ spec:
spec:
containers:
- name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.9.24-develop.1300.fe4d683
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.10-develop.1026.8e56433
imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
@ -66,7 +66,7 @@ spec:
mountPath: /etc/php81/conf.d/50_xdebug.ini
subPath: 50_xdebug.ini
- name: hydra-sql-caddy
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.9.24-develop.1300.fe4d683
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.10-develop.1026.8e56433
imagePullPolicy: Always
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
readinessProbe:

1
resources/hydra/kustomization.yaml
View File

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