Add extraCommands for workers

This commit is contained in:
Jack O'Sullivan 2021-06-29 22:28:04 +01:00
parent afc82bc672
commit db2a430b8a
2 changed files with 22 additions and 7 deletions

View file

@ -65,6 +65,15 @@ spec:
-e "s/@@REDIS_PASSWORD@@/${REDIS_PASSWORD:-}/" \ -e "s/@@REDIS_PASSWORD@@/${REDIS_PASSWORD:-}/" \
> /synapse/config/conf.d/secrets.yaml > /synapse/config/conf.d/secrets.yaml
{{- if (or $config.extraCommands $default.extraCommands) }}
{{- with $config.extraCommands | default $default.extraCommands }}
{{ range . }}
{{ . }}
{{- end }}
{{- end }}
{{- end }}
exec python -B -m synapse.app.{{ (not (not $config.generic)) | ternary "generic_worker" $worker }} \ exec python -B -m synapse.app.{{ (not (not $config.generic)) | ternary "generic_worker" $worker }} \
-c /synapse/config/homeserver.yaml \ -c /synapse/config/homeserver.yaml \
-c /synapse/config/conf.d/ \ -c /synapse/config/conf.d/ \

View file

@ -220,14 +220,14 @@ synapse:
## Liveness probe configuration to use ## Liveness probe configuration to use
## ##
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /health path: /health
port: http port: http
## Readiness probe configuration to use ## Readiness probe configuration to use
## ##
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /health
port: http port: http
@ -262,8 +262,8 @@ workers:
## A specific name for this worker, can't be set globally. ## A specific name for this worker, can't be set globally.
## Note that this can only be set when replicaCount is 1 ## Note that this can only be set when replicaCount is 1
#name: #name:
## Additional configuration to set for the worker, can't be set globally. ## Additional configuration to set for the worker, can't be set globally.
#extraConfig: {} #extraConfig: {}
@ -288,6 +288,12 @@ workers:
volumes: [] volumes: []
volumeMounts: [] volumeMounts: []
## Extra commands to run when starting Synapse
##
extraCommands: []
# - 'apt-get update -yqq && apt-get install patch -yqq'
# - 'patch -d/usr/local/lib/python3.7/site-packages/synapse -p2 < /synapse/patches/something.patch'
## Security context information to set to the worker. ## Security context information to set to the worker.
## ##
podSecurityContext: {} podSecurityContext: {}
@ -314,17 +320,17 @@ workers:
# requests: # requests:
# cpu: 100m # cpu: 100m
# memory: 128Mi # memory: 128Mi
## Liveness probe configuration to use ## Liveness probe configuration to use
## ##
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /health path: /health
port: listener port: listener
## Readiness probe configuration to use ## Readiness probe configuration to use
## ##
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /health
port: listener port: listener