From 4e517797e10ebd86471a1ef380f31afa00f894c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=8E?= Date: Sat, 5 Sep 2026 15:18:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(mixingx-agent-unit):=20=E7=AE=80=E5=8C=96P?= =?UTF-8?q?ostgreSQL=E9=85=8D=E7=BD=AE=E5=B9=B6=E7=A7=BB=E9=99=A4=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E9=A2=84=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将PostgreSQL配置简化为单一用户名和密码模式,移除了管理员用户和应用用户的分离机制 - 移除了复杂的PostgreSQL角色预置SQL文件和相关的initContainer逻辑 - 直接通过连接字符串设置idle_in_transaction_session_timeout参数 - 更新版本号从1.0.2到1.0.3 - 移除了对预创建PostgreSQL凭证Secret的依赖 --- release-charts/mixingx-agent-unit/Chart.yaml | 2 +- release-charts/mixingx-agent-unit/README.md | 12 +-- .../files/provision-agent-role.sql | 99 ------------------- .../mixingx-agent-unit/templates/_helpers.tpl | 7 +- .../templates/postgres-role-provisioning.yaml | 12 --- .../mixingx-agent-unit/templates/unit.yaml | 76 ++------------ release-charts/mixingx-agent-unit/values.yaml | 10 +- 7 files changed, 15 insertions(+), 203 deletions(-) delete mode 100644 release-charts/mixingx-agent-unit/files/provision-agent-role.sql delete mode 100644 release-charts/mixingx-agent-unit/templates/postgres-role-provisioning.yaml diff --git a/release-charts/mixingx-agent-unit/Chart.yaml b/release-charts/mixingx-agent-unit/Chart.yaml index 83daf97..56f51f1 100644 --- a/release-charts/mixingx-agent-unit/Chart.yaml +++ b/release-charts/mixingx-agent-unit/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: mixingx-agent-unit description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL." type: application -version: 1.0.2 +version: 1.0.3 appVersion: "1.0.1" diff --git a/release-charts/mixingx-agent-unit/README.md b/release-charts/mixingx-agent-unit/README.md index bdc1cd6..bf1f7f7 100644 --- a/release-charts/mixingx-agent-unit/README.md +++ b/release-charts/mixingx-agent-unit/README.md @@ -6,12 +6,11 @@ Deploys one agent site as one Helm release: - `agent-web-` frontend - `agent--postgres` StatefulSet and retained PVC -The release requires a pre-created PostgreSQL credentials Secret. By default its -name is `agent--postgres-credentials`; the required keys are -`admin-password`, `app-password`, and `connection-string`. The Agent connection -string must use `sharedInfra.postgres.appUsername`, while the init container uses -the administrator credential only to idempotently provision the non-superuser -application role and its database-local idle transaction timeout. +Agent PostgreSQL sessions set `idle_in_transaction_session_timeout` through the +connection string. The default is `60s`, configurable with +`sharedInfra.postgres.idleInTransactionSessionTimeout`. This is a database-side +safety net for leaked idle transactions and does not change database users, +passwords, roles, or the PostgreSQL StatefulSet credential model. Example: @@ -21,6 +20,5 @@ helm upgrade --install mixingx-agent-workshop-a ./charts/mixingx-agent-unit \ --set site=workshop-a \ --set nodeName=agent-node-01 \ --set storage.className=longhorn \ - --set sharedInfra.postgres.appUsername=agent_workshop_a \ --set tag=2026.07.02-abc1234 ``` diff --git a/release-charts/mixingx-agent-unit/files/provision-agent-role.sql b/release-charts/mixingx-agent-unit/files/provision-agent-role.sql deleted file mode 100644 index 4e1d942..0000000 --- a/release-charts/mixingx-agent-unit/files/provision-agent-role.sql +++ /dev/null @@ -1,99 +0,0 @@ -\set ON_ERROR_STOP on -\getenv agent_username AGENT_DB_USERNAME -\getenv agent_password AGENT_DB_PASSWORD -\getenv database_name POSTGRESQL_DATABASENAME -\getenv idle_timeout IDLE_IN_TRANSACTION_SESSION_TIMEOUT - -SELECT format( - 'CREATE ROLE %I LOGIN PASSWORD %L NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS', - :'agent_username', - :'agent_password') -WHERE NOT EXISTS ( - SELECT 1 - FROM pg_roles - WHERE rolname = :'agent_username') -\gexec - -SELECT format( - 'ALTER ROLE %I WITH LOGIN PASSWORD %L NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS', - :'agent_username', - :'agent_password') -\gexec - -SELECT format('GRANT CONNECT ON DATABASE %I TO %I', :'database_name', :'agent_username') -\gexec - -SELECT format('ALTER DATABASE %I OWNER TO %I', :'database_name', :'agent_username') -\gexec - -SELECT format('ALTER SCHEMA public OWNER TO %I', :'agent_username') -\gexec - -SELECT format('GRANT ALL ON SCHEMA public TO %I', :'agent_username') -\gexec - --- Existing installations may have objects created by the former postgres application login. --- Transfer only user objects in public; extension-owned objects remain with their extension owner. -SELECT format( - 'ALTER %s %I.%I OWNER TO %I', - CASE c.relkind - WHEN 'r' THEN 'TABLE' - WHEN 'p' THEN 'TABLE' - WHEN 'S' THEN 'SEQUENCE' - WHEN 'v' THEN 'VIEW' - WHEN 'm' THEN 'MATERIALIZED VIEW' - WHEN 'f' THEN 'FOREIGN TABLE' - END, - n.nspname, - c.relname, - :'agent_username') -FROM pg_class c -JOIN pg_namespace n ON n.oid = c.relnamespace -WHERE n.nspname = 'public' - AND c.relkind IN ('r', 'p', 'S', 'v', 'm', 'f') - AND pg_get_userbyid(c.relowner) <> :'agent_username' - AND NOT EXISTS ( - SELECT 1 - FROM pg_depend d - WHERE d.classid = 'pg_class'::regclass - AND d.objid = c.oid - AND d.deptype = 'e') -\gexec - -SELECT format( - 'ALTER %s %I.%I(%s) OWNER TO %I', - CASE p.prokind - WHEN 'p' THEN 'PROCEDURE' - ELSE 'FUNCTION' - END, - n.nspname, - p.proname, - pg_get_function_identity_arguments(p.oid), - :'agent_username') -FROM pg_proc p -JOIN pg_namespace n ON n.oid = p.pronamespace -WHERE n.nspname = 'public' - AND p.prokind IN ('f', 'p', 'w') - AND pg_get_userbyid(p.proowner) <> :'agent_username' - AND NOT EXISTS ( - SELECT 1 - FROM pg_depend d - WHERE d.classid = 'pg_proc'::regclass - AND d.objid = p.oid - AND d.deptype = 'e') -\gexec - -SELECT format( - 'ALTER ROLE %I IN DATABASE %I SET idle_in_transaction_session_timeout TO %L', - :'agent_username', - :'database_name', - :'idle_timeout') -\gexec - --- Startup migrations run as the database owner. Keep active migration and maintenance work --- unbounded here; only idle transactions receive the safety timeout. -SELECT format('ALTER ROLE %I IN DATABASE %I RESET statement_timeout', :'agent_username', :'database_name') -\gexec - -SELECT format('ALTER ROLE %I IN DATABASE %I RESET lock_timeout', :'agent_username', :'database_name') -\gexec diff --git a/release-charts/mixingx-agent-unit/templates/_helpers.tpl b/release-charts/mixingx-agent-unit/templates/_helpers.tpl index 64d86cf..466cb79 100644 --- a/release-charts/mixingx-agent-unit/templates/_helpers.tpl +++ b/release-charts/mixingx-agent-unit/templates/_helpers.tpl @@ -14,10 +14,6 @@ {{- .Values.serviceId | default (include "mixingx-unit.name" .) -}} {{- end -}} -{{- define "mixingx-unit.postgresCredentialsSecretName" -}} -{{- .Values.sharedInfra.postgres.credentialsSecret.name | default (printf "%s-postgres-credentials" (include "mixingx-unit.name" .)) -}} -{{- end -}} - {{- define "mixingx-unit.basePath" -}} {{- printf "/%s-%s" .Values.role (.Values.site | toString) -}} {{- end -}} @@ -63,8 +59,7 @@ REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}" REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}" POSTGRESQL_HOST: "{{ $pgHost }}" POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}" -POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.appUsername }}" -POSTGRESQL_DATABASENAME: "{{ include "mixingx-unit.database" . }}" +POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.username }}" MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}" MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" diff --git a/release-charts/mixingx-agent-unit/templates/postgres-role-provisioning.yaml b/release-charts/mixingx-agent-unit/templates/postgres-role-provisioning.yaml deleted file mode 100644 index ada66fb..0000000 --- a/release-charts/mixingx-agent-unit/templates/postgres-role-provisioning.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- $name := include "mixingx-unit.name" . -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $name }}-postgres-role-provisioning - labels: - app.kubernetes.io/name: mixingx - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/component: {{ $name }}-postgres -data: - provision-agent-role.sql: | -{{ .Files.Get "files/provision-agent-role.sql" | nindent 4 }} diff --git a/release-charts/mixingx-agent-unit/templates/unit.yaml b/release-charts/mixingx-agent-unit/templates/unit.yaml index 643d2b7..714ecc6 100644 --- a/release-charts/mixingx-agent-unit/templates/unit.yaml +++ b/release-charts/mixingx-agent-unit/templates/unit.yaml @@ -4,7 +4,6 @@ {{- $serviceId := include "mixingx-unit.serviceId" . -}} {{- $basePath := include "mixingx-unit.basePath" . -}} {{- $pgHost := printf "%s-postgres-service" $name -}} -{{- $pgCredentialsSecretName := include "mixingx-unit.postgresCredentialsSecretName" . -}} --- apiVersion: apps/v1 kind: Deployment @@ -25,62 +24,12 @@ spec: app.kubernetes.io/component: {{ $name }} annotations: checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }} - checksum/postgres-role-sql: {{ .Files.Get "files/provision-agent-role.sql" | sha256sum }} spec: {{ include "mixingx-unit.backendScheduling" . | nindent 6 }} {{- with $.Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - initContainers: - - name: provision-postgres-role - image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }} - imagePullPolicy: IfNotPresent - command: ["/bin/sh", "-ec"] - args: - - | - attempt=0 - until pg_isready --host="$POSTGRESQL_HOST" --port="$POSTGRESQL_PORT" --username="$POSTGRES_ADMIN_USERNAME" --dbname="$POSTGRESQL_DATABASENAME"; do - attempt=$((attempt + 1)) - if [ "$attempt" -ge 60 ]; then - echo "PostgreSQL did not become ready within 120 seconds" >&2 - exit 1 - fi - sleep 2 - done - exec psql \ - --host="$POSTGRESQL_HOST" \ - --port="$POSTGRESQL_PORT" \ - --username="$POSTGRES_ADMIN_USERNAME" \ - --dbname="$POSTGRESQL_DATABASENAME" \ - --file=/opt/mixingx/postgres/provision-agent-role.sql - env: - - name: POSTGRESQL_HOST - value: "{{ $pgHost }}" - - name: POSTGRESQL_PORT - value: "{{ .Values.sharedInfra.postgres.port }}" - - name: POSTGRESQL_DATABASENAME - value: "{{ $database }}" - - name: POSTGRES_ADMIN_USERNAME - value: "{{ .Values.sharedInfra.postgres.adminUsername }}" - - name: AGENT_DB_USERNAME - value: "{{ .Values.sharedInfra.postgres.appUsername }}" - - name: IDLE_IN_TRANSACTION_SESSION_TIMEOUT - value: "{{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}" - - name: PGPASSWORD - valueFrom: - secretKeyRef: - name: {{ $pgCredentialsSecretName }} - key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }} - - name: AGENT_DB_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $pgCredentialsSecretName }} - key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }} - volumeMounts: - - name: postgres-role-provisioning - mountPath: /opt/mixingx/postgres - readOnly: true containers: - name: {{ $name }} {{ $backendImg := .Values.images.backend }} @@ -101,16 +50,6 @@ spec: env: - name: TZ value: "{{ .Values.timezone | default "Asia/Shanghai" }}" - - name: ConnectionStrings__PostgreSQL - valueFrom: - secretKeyRef: - name: {{ $pgCredentialsSecretName }} - key: {{ .Values.sharedInfra.postgres.credentialsSecret.connectionStringKey }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $pgCredentialsSecretName }} - key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }} livenessProbe: httpGet: path: /health @@ -127,10 +66,6 @@ spec: periodSeconds: 30 timeoutSeconds: 10 failureThreshold: 8 - volumes: - - name: postgres-role-provisioning - configMap: - name: {{ $name }}-postgres-role-provisioning --- apiVersion: v1 kind: Service @@ -168,6 +103,10 @@ stringData: ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}" REDIS_PASSWORD: "{{ .Values.sharedInfra.redis.password }}" REDIS_URI: "redis://:{{ .Values.sharedInfra.redis.password }}@{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }}" + ConnectionStrings__PostgreSQL: "Host={{ $pgHost }};Port={{ .Values.sharedInfra.postgres.port }};Username={{ .Values.sharedInfra.postgres.username }};Password={{ .Values.sharedInfra.postgres.password }};Database={{ $database }};Options=-c idle_in_transaction_session_timeout={{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}" + POSTGRESQL_PASSWORD: "{{ .Values.sharedInfra.postgres.password }}" + POSTGRESQL_URI: "postgresql://{{ .Values.sharedInfra.postgres.username }}:{{ .Values.sharedInfra.postgres.password }}@{{ $pgHost }}:{{ .Values.sharedInfra.postgres.port }}/{{ $database }}" + POSTGRESQL_DATABASENAME: "{{ $database }}" ConnectionStrings__messaging: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}" MESSAGING_PASSWORD: "{{ .Values.sharedInfra.rabbitmq.password }}" MESSAGING_URI: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}" @@ -279,14 +218,11 @@ spec: imagePullPolicy: IfNotPresent env: - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $pgCredentialsSecretName }} - key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }} + value: "{{ .Values.sharedInfra.postgres.password }}" - name: POSTGRES_DB value: "{{ $database }}" - name: POSTGRES_USER - value: "{{ .Values.sharedInfra.postgres.adminUsername }}" + value: "{{ .Values.sharedInfra.postgres.username }}" - name: PGDATA value: /var/lib/postgresql/data/pgdata ports: diff --git a/release-charts/mixingx-agent-unit/values.yaml b/release-charts/mixingx-agent-unit/values.yaml index 52cb1ac..57589e1 100644 --- a/release-charts/mixingx-agent-unit/values.yaml +++ b/release-charts/mixingx-agent-unit/values.yaml @@ -45,16 +45,10 @@ sharedInfra: host: ultra-service port: 8080 postgres: - adminUsername: postgres - appUsername: agent_runtime + username: postgres + password: "Admin12345" port: 5432 idleInTransactionSessionTimeout: 60s - credentialsSecret: - # Leave empty to use --postgres-credentials. - name: "" - adminPasswordKey: admin-password - appPasswordKey: app-password - connectionStringKey: connection-string redis: host: redis-service port: 6379