Merge pull request 'feat(postgres): adding max_conns hydra parameter support for cnpg component' (#47) from feat-hydra-pooler into unstable
Reviewed-on: #47 Reviewed-by: Laurent Gourvenec <lgourvenec@cadoles.com> Reviewed-by: vfebvre <vfebvre@cadoles.com>
This commit is contained in:
commit
a0ff37edf6
|
@ -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
|
||||||
|
|
|
@ -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)"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue