Skip to content

Commit 68e70b3

Browse files
committed
[G2P-3614] WIP. Beat producers confiruation was missing.
1 parent b2d5735 commit 68e70b3

File tree

1 file changed

+137
-30
lines changed

1 file changed

+137
-30
lines changed

charts/openg2p-pbms/values.yaml

Lines changed: 137 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -121,39 +121,81 @@ odoo:
121121
livenessProbe:
122122
enabled: false
123123

124-
extraEnvVars: '{{- include "pbms.baseEnvVars" (dict "envVars" (merge (deepCopy .Values.envVars) (deepCopy .Values.envVarsFrom)) "context" $) }}'
125-
126-
envVars:
127-
ODOO_SKIP_MODULES_UPDATE: "yes"
128-
LIMIT_TIME_REAL: "5000"
129-
LIST_DB: "False"
130-
SERVER_WIDE_MODULES: web,queue_job
131-
LOG_HANDLER: '[":INFO"]'
132-
LOG_DB: "False"
133-
ODOO_BOOTSTRAP_MODULES: >-
134-
base,
135-
g2p_app_filter,
136-
g2p_auth_oidc,
137-
g2p_auth_oidc_keycloak,
138-
EXTRA_ADDONS_URLS_TO_PULL: '{{ tpl .Values.extraAddonsUrlsToPull $ }}'
139-
S3_URL: http://{{ tpl .Values.global.minioInstallationName $ }}:9000
140-
S3_REGION: other
141-
142-
envVarsFrom:
143-
S3_ACCESS_KEY_ID:
144-
secretKeyRef:
145-
key: root-user
146-
name: '{{ tpl .Values.global.minioInstallationName $ }}'
147-
S3_SECRET_ACCESS_KEY:
148-
secretKeyRef:
149-
key: root-password
150-
name: '{{ tpl .Values.global.minioInstallationName $ }}'
124+
# TODO: Template the following variables from helm values, instead of hardcoding
125+
extraEnvVars:
126+
- name: ODOO_SKIP_MODULES_UPDATE
127+
value: "yes"
128+
- name: LIMIT_TIME_REAL
129+
value: "5000"
130+
- name: LIST_DB
131+
value: "False"
132+
- name: SERVER_WIDE_MODULES
133+
value: web,queue_job
134+
- name: LOG_HANDLER
135+
value: '[":INFO"]'
136+
- name: LOG_DB
137+
value: "False"
138+
- name: EXTRA_ADDONS_URLS_TO_PULL
139+
value: '{{ tpl .Values.extraAddonsUrlsToPull $ }}'
140+
- name: S3_URL
141+
value: http://{{ tpl .Values.global.minioInstallationName $ }}:9000
142+
- name: S3_REGION
143+
value: other
144+
- name: S3_ACCESS_KEY_ID
145+
value: admin
151146

152147

153148
beatProducers:
154149
enabled: true
155150
nameOverride: celery-beat-producer
156151

152+
podLabels: {}
153+
commonLabels: {}
154+
commonAnnotations: {}
155+
podAnnotations: {}
156+
157+
replicaCount: 1
158+
159+
updateStrategy:
160+
type: RollingUpdate
161+
162+
serviceAccount:
163+
create: false
164+
name: ""
165+
166+
image:
167+
repository: openg2p/openg2p-pbms-bg-task-celery-beat-producers
168+
tag: "3.0.0"
169+
pullPolicy: Always
170+
171+
hostAliases: []
172+
affinity: {}
173+
podAffinityPreset: ""
174+
podAntiAffinityPreset: soft
175+
176+
nodeAffinityPreset:
177+
type: ""
178+
key: ""
179+
values: []
180+
181+
nodeSelector: {}
182+
tolerations: []
183+
184+
priorityClassName: ""
185+
186+
podSecurityContext:
187+
enabled: false
188+
fsGroup: 1001
189+
190+
initContainers: []
191+
192+
lifecycleHooks: {}
193+
194+
containerSecurityContext:
195+
enabled: false
196+
runAsUser: 1001
197+
runAsNonRoot: true
198+
157199
envVars:
158200
BG_TASK_CELERY_BEAT_PRODUCER_FREQUENCY: 10
159201
BG_TASK_CELERY_BEAT_BATCH_SIZE: 500
@@ -180,9 +222,74 @@ beatProducers:
180222
BG_TASK_CELERY_BEAT_CELERY_BROKER_URL: redis://{{ tpl .Values.global.redisInstallationName $ }}:6379/0
181223
BG_TASK_CELERY_BEAT_CELERY_BACKEND_URL: redis://{{ tpl .Values.global.redisInstallationName $ }}:6379/0
182224

183-
serviceAccount:
184-
create: false
185-
name: ""
225+
envVarsFrom:
226+
BG_TASK_CELERY_BEAT_DB_PASSWORD:
227+
secretKeyRef:
228+
name: '{{ tpl .Values.global.pbmsBgTaskDBSecret $ }}'
229+
key: '{{ tpl .Values.global.pbmsBgTaskDBUserPasswordKey $ }}'
230+
BG_TASK_CELERY_BEAT_DB_PASSWORD_SR:
231+
secretKeyRef:
232+
name: '{{ tpl .Values.global.registryDBSecret $ }}'
233+
key: '{{ tpl .Values.global.registryDBUserPasswordKey $ }}'
234+
BG_TASK_CELERY_BEAT_DB_PASSWORD_PBMS :
235+
secretKeyRef:
236+
name: '{{ tpl .Values.global.pbmsDBSecret $ }}'
237+
key: '{{ tpl .Values.global.pbmsDBUserPasswordKey $ }}'
238+
239+
resources: {}
240+
241+
startupProbe:
242+
enabled: false
243+
httpGet:
244+
path: /ping
245+
port: http
246+
initialDelaySeconds: 0
247+
periodSeconds: 10
248+
timeoutSeconds: 5
249+
failureThreshold: 30
250+
successThreshold: 1
251+
252+
livenessProbe:
253+
enabled: false
254+
httpGet:
255+
path: /ping
256+
port: http
257+
initialDelaySeconds: 20
258+
periodSeconds: 30
259+
timeoutSeconds: 5
260+
failureThreshold: 6
261+
successThreshold: 1
262+
263+
readinessProbe:
264+
enabled: false
265+
httpGet:
266+
path: /ping
267+
port: http
268+
initialDelaySeconds: 0
269+
periodSeconds: 10
270+
timeoutSeconds: 5
271+
failureThreshold: 6
272+
successThreshold: 1
273+
274+
sidecars: []
275+
276+
postgresCheckerInit:
277+
enabled: true
278+
image:
279+
repository: jbergknoff/postgresql-client
280+
tag: latest
281+
pullPolicy: IfNotPresent
282+
command:
283+
- 'sh'
284+
- '-c'
285+
- >-
286+
until pg_isready
287+
-U ${BG_TASK_CELERY_BEAT_DB_USERNAME}
288+
-h ${BG_TASK_CELERY_BEAT_DB_HOSTNAME}
289+
-p ${BG_TASK_CELERY_BEAT_DB_PORT:-5432}
290+
-d ${BG_TASK_CELERY_BEAT_DB_DBNAME:-bgtaskdb};
291+
do sleep 3;
292+
done
186293
187294
redis:
188295
enabled: true

0 commit comments

Comments
 (0)