pgbouncer by bitnamy is replaced with icoretech/pgbouncer-docker

Author: shcherbak

charts/synapse/Chart.yaml

@@ -1,3 +1,3 @@
 ---
 name: synapse
-version: 0.41.0
+version: 0.42.0

charts/synapse/templates/pgbouncer-configmap.yaml

@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: synapse-pgbouncer
+  metadata:
+    labels:
+      app: synapse-pgbouncer
+data:
+  pgbouncer.ini: |
+    [databases]
+    synapse=host={{ .Values.synapse.postgres.host }} port=5432 dbname={{ .Values.synapse.postgres.dbname }}
+    [pgbouncer]
+    listen_port=5432
+    listen_addr=0.0.0.0
+    unix_socket_dir=/tmp/
+    unix_socket_mode=0777
+    auth_file = /app/users/userlist.txt
+    server_reset_query = SELECT pg_advisory_unlock_all()
+    server_reset_query_always = 1
+    admin_users={{ .Values.synapse.postgres.user }}
+    pool_mode={{ .Values.synapse.pgbouncer.poolMode }}
+    auth_type={{ .Values.synapse.pgbouncer.authType }}
+    default_pool_size={{ .Values.synapse.pgbouncer.poolSize }}
+    max_client_conn={{ .Values.synapse.pgbouncer.maxClientConn }}
+{{- range $key, $val := .Values.synapse.pgbouncer.extraParameters }}
+    {{ $key }} = {{ $val }}
+{{- end }}

charts/synapse/templates/pgbouncer-deployment.yaml

@@ -25,29 +25,29 @@ spec:
         imagePullPolicy: {{ .Values.synapse.pgbouncer.image.pullPolicy }}
         resources:
           {{ toYaml .Values.synapse.pgbouncer.resources | nindent 10 }}
+        {{- if .Values.synapse.pgbouncer.extraEnvs }}
         env:
-          - name: PGBOUNCER_PORT
-            value: "5432"
-          - name: POSTGRESQL_HOST
-            value: {{ .Values.synapse.postgres.host | quote }}
-          - name: PGBOUNCER_DATABASE
-            value: {{ .Values.synapse.postgres.dbname | quote }}
-          - name: POSTGRESQL_USERNAME
-            value: {{ .Values.synapse.postgres.user | quote }}
-          - name: POSTGRESQL_PASSWORD
-            value: {{ .Values.synapse.postgres.password | quote }}
-          - name: PGBOUNCER_AUTH_TYPE
-            value: {{ .Values.synapse.pgbouncer.authType | quote }}
-          - name: PGBOUNCER_MAX_CLIENT_CONN
-            value: {{ .Values.synapse.pgbouncer.maxClientConn | quote }}
-          - name: PGBOUNCER_DEFAULT_POOL_SIZE
-            value: {{ .Values.synapse.pgbouncer.poolSize | quote }}
-          - name: PGBOUNCER_POOL_MODE
-            value: {{ .Values.synapse.pgbouncer.poolMode | quote }}
+        {{ toYaml .Values.synapse.pgbouncer.extraEnvs | trimSuffix "\n" | nindent 10 }}
+        {{- end }}
         ports:
           - containerPort: 5432
             name: pgbouncer
             protocol: TCP
+        readinessProbe:
+          tcpSocket:
+            port: 5432
+          initialDelaySeconds: 10
+          periodSeconds: 5
+        livenessProbe:
+          tcpSocket:
+            port: 5432
+          initialDelaySeconds: 60
+          periodSeconds: 10
+        volumeMounts:
+        - name: config
+          mountPath: /etc/pgbouncer/
+        - name: userlist
+          mountPath: /etc/userlist/
       {{- if .Values.synapse.pgbouncer.nodeSelector }}
       nodeSelector:
         {{ toYaml .Values.synapse.pgbouncer.nodeSelector | nindent 8 }}
@@ -68,3 +68,10 @@ spec:
       priorityClassName: "{{ .Values.synapse.pgbouncer.priorityClassName }}"
       {{- end }}
       terminationGracePeriodSeconds: 10
+      volumes:
+      - name: config
+        configMap:
+          name: synapse-pgbouncer
+      - name: userlist
+        secret:
+          secretName: synapse-pgbouncer

charts/synapse/templates/pgbouncer-secret.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: synapse-pgbouncer
+  metadata:
+    labels:
+      app: synapse-pgbouncer
+data:
+  userlist.txt: |
+    {{ .Values.synapse.postgres.user | quote }} {{ .Values.synapse.postgres.password | quote }}

charts/synapse/templates/pgbouncer-service.yaml

@@ -3,8 +3,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: synapse-pgbouncer
-  annotations:
-    cloud.google.com/neg: '{"ingress":false}'
+  metadata:
+    labels:
+      app: synapse-pgbouncer
 spec:
   selector:
     app: synapse-pgbouncer

charts/synapse/values.yaml

@@ -13,7 +13,9 @@ synapse:
   # cfg --
   image:
     repository: "ghcr.io/code-tool/matrix-stack/synapse"
-    # varsion with git+https://github.com/davefatkin/synapse-s3-storage-provider.git#egg=synapse-s3-storage-provider
+    # this is patched version of mainstream synamse
+    # please find patches by link: https://github.com/code-tool/matrix-stack/tree/main/build
+    # also this ghcr contains synapse:v1.142.1-e2e-optimized with e2e_room_key query patches
     tag: "v1.142.1"
     pullPolicy: IfNotPresent
   autoscaling:
@@ -149,8 +151,8 @@ synapse:
     password: "NOT-CONFIGURED"
   pgbouncer:
     image:
-      repository: "bitnamilegacy/pgbouncer"
-      tag: "1.24.1-debian-12-r10"
+      repository: "bghcr.io/icoretech/pgbouncer-docker"
+      tag: "1.24.1"
       pullPolicy: IfNotPresent
     replicas: 2
     # set thish gt 0 if you want to enable serveice sessionAffinity by ClientIP
@@ -176,6 +178,23 @@ synapse:
         maxSurge: 25%
     priorityClassName: ''
     topologySpreadConstraints: []
+    extraParameters: {}
+    #  pidfile: /tmp/pgbouncer.pid
+    #  client_tls_sslmode: disable
+    #  server_tls_sslmode: disable
+    #  ignore_startup_parameters: extra_float_digits
+    #  stats_period: 60
+    #  server_round_robin: 0
+    #  server_fast_close: 0
+    # additional pgbouncer environment variables
+    extraEnvs: []
+    # - name: var1
+    #   value: val1
+    # - name: var2
+    #   valueFrom:
+    #     secretKeyRef:
+    #       key: my-secret-key
+    #       name: my-secret
 
   redis:
     enabled: true