From 5e5670dcdf5b31abd210790623d66b88dcf4f702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Gourv=C3=A9nec?= Date: Fri, 7 Mar 2025 15:31:59 +0100 Subject: [PATCH] feat(hydra-cnpg): configure DSN with more options --- components/hydra-cnpg-database/patches/hydra-deployment.yaml | 2 +- resources/hydra/kustomization.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/hydra-cnpg-database/patches/hydra-deployment.yaml b/components/hydra-cnpg-database/patches/hydra-deployment.yaml index db7d518..3ab2e3e 100644 --- a/components/hydra-cnpg-database/patches/hydra-deployment.yaml +++ b/components/hydra-cnpg-database/patches/hydra-deployment.yaml @@ -26,4 +26,4 @@ path: "/spec/template/spec/containers/0/env/-" value: 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)" diff --git a/resources/hydra/kustomization.yaml b/resources/hydra/kustomization.yaml index 166054d..7c82374 100644 --- a/resources/hydra/kustomization.yaml +++ b/resources/hydra/kustomization.yaml @@ -31,6 +31,10 @@ configMapGenerator: - URLS_LOGOUT=http://hydra-logout-app/logout - HYDRA_SERVE_ALL_ARGS=--dev - 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" - LOG_LEVEL=info