切换数据池镜像

Author: hhhhsc701

deployment/docker/datamate/docker-compose.yml

@@ -204,16 +204,15 @@ services:
   # ==============================
   label-studio-pgbouncer:
     container_name: label-studio-pgbouncer
-    image: pgbouncer/pgbouncer:latest
+    image: edoburu/pgbouncer:latest
     restart: on-failure
-    ports:
-      - "6432:6432"
     environment:
-      - DATABASES_HOST=datamate-database
-      - DATABASES_PORT=5432
-      - DATABASES_NAME=labelstudio
-      - DATABASES_USER=postgres
-      - DATABASES_PASSWORD=${DB_PASSWORD:-password}
+      - DB_HOST=datamate-database
+      - DB_PORT=5432
+      - DB_NAME=labelstudio
+      - DB_USER=postgres
+      - DB_PASSWORD=${DB_PASSWORD:-password}
+      - AUTH_TYPE=scram-sha-256
       - POOL_MODE=transaction
       - MAX_CLIENT_CONN=100
       - DEFAULT_POOL_SIZE=20
@@ -241,7 +240,7 @@ services:
       - POSTGRE_NAME=labelstudio
       - POSTGRE_USER=postgres
       - POSTGRE_PASSWORD=${DB_PASSWORD:-password}
-      - POSTGRE_PORT=6432
+      - POSTGRE_PORT=5432
       - POSTGRE_HOST=label-studio-pgbouncer
       - LABEL_STUDIO_HOST=${LABEL_STUDIO_HOST:-}
       - LOCAL_FILES_SERVING_ENABLED=true

deployment/helm/label-studio/templates/deployment.yaml

@@ -38,7 +38,7 @@ spec:
             - name: POSTGRE_PASSWORD
               value: {{ .Values.env.POSTGRE_PASSWORD | quote }}
             - name: POSTGRE_PORT
-              value: {{ if .Values.pgbouncer.enabled }}{{ "6432" | quote }}{{ else }}{{ .Values.env.POSTGRE_PORT | quote }}{{ end }}
+              value: 5432
             - name: POSTGRE_HOST
               value: {{ if .Values.pgbouncer.enabled }}{{ printf "%s-pgbouncer" (include "label-studio.fullname" .) | quote }}{{ else }}{{ .Values.env.POSTGRE_HOST | quote }}{{ end }}
             - name: LABEL_STUDIO_HOST

deployment/helm/label-studio/templates/pgbouncer-deployment.yaml

@@ -30,18 +30,18 @@ spec:
           imagePullPolicy: {{ .Values.pgbouncer.image.pullPolicy }}
           ports:
             - name: pgbouncer
-              containerPort: 6432
+              containerPort: 5432
               protocol: TCP
           env:
-            - name: DATABASES_HOST
+            - name: DB_HOST
               value: {{ .Values.env.POSTGRE_HOST | quote }}
-            - name: DATABASES_PORT
+            - name: DB_PORT
               value: {{ .Values.env.POSTGRE_PORT | quote }}
-            - name: DATABASES_NAME
+            - name: DB_NAME
               value: {{ .Values.env.POSTGRE_NAME | quote }}
-            - name: DATABASES_USER
+            - name: DB_USER
               value: {{ .Values.env.POSTGRE_USER | quote }}
-            - name: DATABASES_PASSWORD
+            - name: DB_PASSWORD
               value: {{ .Values.env.POSTGRE_PASSWORD | quote }}
             - name: POOL_MODE
               value: {{ .Values.pgbouncer.poolMode | quote }}
@@ -51,14 +51,16 @@ spec:
               value: {{ .Values.pgbouncer.defaultPoolSize | quote }}
             - name: MAX_DB_CONNECTIONS
               value: {{ .Values.pgbouncer.maxDbConnections | quote }}
+            - name: AUTH_TYPE
+              value: {{ .Values.pgbouncer.authType | quote }}
           livenessProbe:
             tcpSocket:
-              port: 6432
+              port: 5432
             initialDelaySeconds: 15
             periodSeconds: 20
           readinessProbe:
             tcpSocket:
-              port: 6432
+              port: 5432
             initialDelaySeconds: 5
             periodSeconds: 10
           resources:

deployment/helm/label-studio/templates/pgbouncer-service.yaml

@@ -11,7 +11,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: 6432
+    - port: 5432
       targetPort: pgbouncer
       protocol: TCP
       name: pgbouncer

deployment/helm/label-studio/values.yaml

@@ -72,7 +72,7 @@ pgbouncer:
   replicaCount: 1
 
   image:
-    repository: pgbouncer/pgbouncer
+    repository: edoburu/pgbouncer
     tag: "latest"
     pullPolicy: IfNotPresent
 
@@ -81,6 +81,7 @@ pgbouncer:
   maxClientConn: 100     # Maximum number of client connections
   defaultPoolSize: 20    # Default pool size per database (max connections to PostgreSQL)
   maxDbConnections: 20   # Maximum database connections (hard limit)
+  authType: scram-sha-256
 
   resources: {}