Skip to content

Commit b461b2f

Browse files
committed
disable h/c background-worker,event-persister,pusher
1 parent c9563fa commit b461b2f

3 files changed

Lines changed: 34 additions & 1 deletion

File tree

charts/synapse/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
name: synapse
3-
version: 1.1.1
3+
version: 1.1.2

charts/synapse/templates/_helpers.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ containers:
7474
- containerPort: 9092
7575
name: metrics
7676
protocol: TCP
77+
{{- if not (has .worker (list "background_worker" "event_persister" "pusher")) }}
7778
startupProbe:
7879
httpGet:
7980
path: /health
@@ -91,6 +92,7 @@ containers:
9192
path: /health
9293
port: http
9394
periodSeconds: 10
95+
{{- end }}
9496
volumeMounts:
9597
- name: synapse-{{ .name }}-secret
9698
mountPath: /data
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: synapse-pgbouncer-exporter
5+
labels:
6+
app: synapse-pgbouncer
7+
data:
8+
userlist.txt: |
9+
{{ printf "\"%s\" \"%s\"" .Values.synapse.postgres.user .Values.synapse.postgres.password | b64enc }}
10+
type: Opaque
11+
12+
- name: PGBOUNCER_USER
13+
valueFrom:
14+
secretKeyRef:
15+
name: {{ .Values.config.existingAdminSecret | default (printf "%s-secret" (include "common.names.fullname" .)) }}
16+
key: {{ .Values.config.adminUserKey | default "adminUser" }}
17+
- name: PGBOUNCER_PASS
18+
valueFrom:
19+
secretKeyRef:
20+
name: {{ .Values.config.existingAdminSecret | default (printf "%s-secret" (include "common.names.fullname" .)) }}
21+
key: {{ .Values.config.adminPasswordKey | default "adminPassword" }}
22+
- name: PGUSER
23+
valueFrom:
24+
secretKeyRef:
25+
name: {{ .Values.config.existingAdminSecret | default (printf "%s-secret" (include "common.names.fullname" .)) }}
26+
key: {{ .Values.config.adminUserKey | default "adminUser" }}
27+
- name: PGPASSWORD
28+
valueFrom:
29+
secretKeyRef:
30+
name: {{ .Values.config.existingAdminSecret | default (printf "%s-secret" (include "common.names.fullname" .)) }}
31+
key: {{ .Values.config.adminPasswordKey | default "adminPassword" }}

0 commit comments

Comments
 (0)