feat(mixingx-agent-unit): 简化PostgreSQL配置并移除角色预置逻辑
- 将PostgreSQL配置简化为单一用户名和密码模式,移除了管理员用户和应用用户的分离机制 - 移除了复杂的PostgreSQL角色预置SQL文件和相关的initContainer逻辑 - 直接通过连接字符串设置idle_in_transaction_session_timeout参数 - 更新版本号从1.0.2到1.0.3 - 移除了对预创建PostgreSQL凭证Secret的依赖
This commit is contained in:
1 parent
5bc1b52721
commit
4e517797e1
7 files changed
+15
-203
No files matched your search
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user