Skip to content

Commit bc405d4

Browse files
committed
[G2P-3424] WIP. postgres-init added with multiple DB init.
1 parent 4b54d9e commit bc405d4

File tree

1 file changed

+24
-54
lines changed

1 file changed

+24
-54
lines changed

charts/openg2p-pbms/values.yaml

Lines changed: 24 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ global:
1313
pbmsOdooOidcClientID: 'openg2p-pbms-{{ .Release.Namespace }}'
1414
pbmsOdooOidcClientSecret: ''
1515

16+
minioInstallationName: openg2p-commons-minio
17+
1618
g2pPbmsBgTaskHostname: g2p-pbms-bg-task.dev.openg2p.org
1719

1820
keycloakBaseUrl: https://keycloak.openg2p.org
@@ -32,6 +34,27 @@ global:
3234
# TODO: change
3335
hostname: admin-pbms.devops.openg2p.org
3436

37+
postgres-init:
38+
enabled: true
39+
postgresql:
40+
host: '{{ .Values.global.postgresqlHost }}'
41+
port: 5432
42+
# Hard coding. Same as one defined under Odoo
43+
existingSecret: openg2p-commons-postgresql
44+
existingSecretPostgresPasswordKey: postgres-password
45+
databases:
46+
# Same as db in Odoo - make sure any changes to the name are synced with Odoo definitions
47+
- name: '{{ .Release.Name }}_db'
48+
user: '{{ .Release.Name}}_db_user'
49+
# Same as odoo.externalDatabase.existingSecret - make sure these two are same if any changes are made.
50+
secret: '{{ .Release.Name }}'
51+
# As convention same as user
52+
secretUserPasswordKey: '{{ .Release.Name}}_db_user'
53+
- name: '{{ .Release.Name }}_bgtask_db'
54+
user: '{{ .Release.Name}}_bgtask_db_user'
55+
secret: '{{ .Release.Name }}_bgtask'
56+
secretUserPasswordKey: '{{ .Release.Name}}_bgtask_db_user'
57+
3558
odoo:
3659
enabled: true
3760

@@ -102,7 +125,7 @@ odoo:
102125
- name: EXTRA_ADDONS_URLS_TO_PULL
103126
value: '{{ tpl .Values.extraAddonsUrlsToPull $ }}'
104127
- name: S3_URL
105-
value: http://{{ tpl .Values.minio.hostname $ }}:9000
128+
value: http://{{ tpl .Values.global.minioInstallationName $ }}:9000
106129
- name: S3_REGION
107130
value: other
108131
- name: S3_ACCESS_KEY_ID
@@ -235,59 +258,6 @@ redis:
235258
auth:
236259
enabled: false
237260

238-
minio:
239-
enabled: true
240-
image:
241-
registry: docker.io
242-
repository: openg2p/minio
243-
tag: 2023.12.23-debian-11-r2
244-
hostname: minio-pbms.openg2p.sandbox.net
245-
persistence:
246-
enabled: true
247-
size: 16Gi
248-
249-
oidcWellKnownConfigUrl: '{{ tpl .Values.global.keycloakIssuerUrl $ }}/.well-known/openid-configuration'
250-
oidcClientId: 'openg2p-pbms-minio-{{ .Release.Namespace }}'
251-
oidcClientSecret: ''
252-
253-
extraEnvVars:
254-
- name: MINIO_IDENTITY_OPENID_CONFIG_URL
255-
value: '{{ tpl .Values.oidcWellKnownConfigUrl $ }}'
256-
- name: MINIO_IDENTITY_OPENID_CLIENT_ID
257-
value: '{{ tpl .Values.oidcClientId $ }}'
258-
- name: MINIO_IDENTITY_OPENID_CLIENT_SECRET
259-
value: '{{ tpl .Values.oidcClientSecret $ }}'
260-
- name: MINIO_IDENTITY_OPENID_DISPLAY_NAME
261-
value: Keycloak
262-
- name: MINIO_IDENTITY_OPENID_CLAIM_NAME
263-
value: client_roles
264-
- name: MINIO_IDENTITY_OPENID_SCOPES
265-
value: openid,profile,email
266-
- name: MINIO_IDENTITY_OPENID_REDIRECT_URI_DYNAMIC
267-
value: "on"
268-
- name: MINIO_IDENTITY_OPENID_CLAIM_USERINFO
269-
value: "on"
270-
271-
istio:
272-
enabled: true
273-
virtualservice:
274-
enabled: true
275-
host: ""
276-
gateway: "internal"
277-
destination: '{{ include "common.names.fullname" .Subcharts.minio }}'
278-
destinationPort: "9001"
279-
gateway:
280-
enabled: false
281-
host: ""
282-
ingressController:
283-
istio: ingressgateway
284-
httpTlsRedirect: true
285-
httpEnabled: true
286-
httpsEnabled: false
287-
tls:
288-
mode: SIMPLE
289-
credentialName: ""
290-
291261
serviceProviderIngress:
292262
enabled: false
293263
selfServiceIngress:

0 commit comments

Comments
 (0)