CadolesKube/sso-kustom
15
0
Fork 0
Code Issues 20 Pull Requests 6 Projects Releases Wiki Activity

Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 89 commits from unstable into master
pull from: unstable
merge into: CadolesKube:master
Conversation 0 Commits 89 Files Changed 64 +5 -1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e5670dcdf - Show all commits

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

@ -26,4 +26,4 @@
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):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)" value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)&max_idle_conns=$(HYDRA_DATABASE_MAX_IDLE_CONNS)&max_conn_lifetime=$(HYDRA_DATABASE_MAX_CONN_LIFETIME)&max_conn_idle_time=$(HYDRA_DATABASE_MAX_CONN_IDLE_TIME)&connect_timeout=$(HYDRA_DATABASE_CONNECT_TIMEOUT)"

4
resources/hydra/kustomization.yaml
View File

@ -31,6 +31,10 @@ configMapGenerator:
- 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" - HYDRA_DATABASE_MAX_CONN="10"
- HYDRA_DATABASE_MAX_IDLE_CONNS="5"
- HYDRA_DATABASE_MAX_CONN_LIFETIME="0" # Unlimited. ms, s, m, h
- HYDRA_DATABASE_MAX_CONN_IDLE_TIME="0" # Unlimited. ms, s, m, h
- HYDRA_DATABASE_CONNECT_TIMEOUT="0" # Unlimited
- SERVE_ADMIN_REQUEST_LOG_DISABLE_FOR_HEALTH="true" - SERVE_ADMIN_REQUEST_LOG_DISABLE_FOR_HEALTH="true"
- LOG_LEVEL=info - LOG_LEVEL=info