diff --git a/release-charts/mixingx-audit/templates/audit.yaml b/release-charts/mixingx-audit/templates/audit.yaml index 0303533..e45bce6 100644 --- a/release-charts/mixingx-audit/templates/audit.yaml +++ b/release-charts/mixingx-audit/templates/audit.yaml @@ -34,27 +34,37 @@ spec: value: "{{ .Values.audit.port }}" - name: HOST value: "0.0.0.0" - # PostgreSQL + # PostgreSQL — 凭据通过 Secret 注入 - name: AUDIT_PG_URI - value: "postgresql://{{ $root.Values.sharedInfra.postgres.username }}:{{ $root.Values.sharedInfra.postgres.password }}@{{ .Values.audit.database }}-postgres-service:{{ $root.Values.sharedInfra.postgres.port }}/{{ .Values.audit.database }}" + valueFrom: + secretKeyRef: + name: audit-secrets + key: AUDIT_PG_URI - name: AUDIT_PG_TIMEZONE value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}" # MQTT broker - name: AUDIT_MQTT_BROKER_URL value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}" - - name: AUDIT_MQTT_CLIENT_ID + # POD_NAME 供 config.ts 自动生成 mixingx-audit-sub-{podName} clientId + - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: AUDIT_MQTT_SHARED_GROUP value: "mixingx-audit" - # NanoMQ 管理 API + # NanoMQ 管理 API — 凭据通过 Secret 注入 - name: AUDIT_MQTT_MANAGEMENT_URL value: "http://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.managementPort }}" - name: AUDIT_MQTT_MANAGEMENT_USERNAME - value: "{{ .Values.audit.mqtt.managementUsername }}" + valueFrom: + secretKeyRef: + name: audit-secrets + key: AUDIT_MQTT_MANAGEMENT_USERNAME - name: AUDIT_MQTT_MANAGEMENT_PASSWORD - value: "{{ .Values.audit.mqtt.managementPassword }}" + valueFrom: + secretKeyRef: + name: audit-secrets + key: AUDIT_MQTT_MANAGEMENT_PASSWORD # 消费队列/并发 - name: AUDIT_CONSUME_QUEUE_CAPACITY value: "{{ .Values.audit.consume.queueCapacity }}" @@ -69,6 +79,8 @@ spec: value: "{{ .Values.audit.jwt.issuer }}" - name: JWT_AUDIENCE value: "{{ .Values.audit.jwt.audience }}" + - name: JWT_JWKS_URI + value: "{{ .Values.audit.jwt.jwksUri }}" # OpenTelemetry - name: OTEL_EXPORTER_OTLP_ENDPOINT value: "{{ $root.Values.sharedInfra.otlp.endpoint }}" @@ -106,4 +118,18 @@ spec: port: {{ .Values.audit.port }} targetPort: http protocol: TCP +--- +# ===== Audit Secrets ===== +apiVersion: v1 +kind: Secret +metadata: + name: audit-secrets + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: audit +type: Opaque +stringData: + AUDIT_PG_URI: "postgresql://{{ $root.Values.sharedInfra.postgres.username }}:{{ $root.Values.sharedInfra.postgres.password }}@{{ .Values.audit.database }}-postgres-service:{{ $root.Values.sharedInfra.postgres.port }}/{{ .Values.audit.database }}" + AUDIT_MQTT_MANAGEMENT_USERNAME: "{{ .Values.audit.mqtt.managementUsername }}" + AUDIT_MQTT_MANAGEMENT_PASSWORD: "{{ .Values.audit.mqtt.managementPassword }}" {{- end }} diff --git a/release-charts/mixingx-audit/values.yaml b/release-charts/mixingx-audit/values.yaml index 0692b70..354efe3 100644 --- a/release-charts/mixingx-audit/values.yaml +++ b/release-charts/mixingx-audit/values.yaml @@ -29,6 +29,7 @@ audit: jwt: issuer: "mixingx-sso" audience: "mixingx-audit" + jwksUri: "http://sso-service:5100/.well-known/jwks.json" # 消费队列/并发配置 consume: queueCapacity: 128 diff --git a/release-charts/mixingx-platform/templates/audit.yaml b/release-charts/mixingx-platform/templates/audit.yaml index cb2ca31..d3084db 100644 --- a/release-charts/mixingx-platform/templates/audit.yaml +++ b/release-charts/mixingx-platform/templates/audit.yaml @@ -35,27 +35,37 @@ spec: value: "{{ .Values.audit.port }}" - name: HOST value: "0.0.0.0" - # PostgreSQL (仅 Audit 数据) + # PostgreSQL (Audit 数据) — 凭据通过 Secret 注入 - name: AUDIT_PG_URI - value: "postgresql://{{ $root.Values.sharedInfra.postgres.username }}:{{ $root.Values.sharedInfra.postgres.password }}@{{ .Values.audit.database }}-postgres-service:{{ $root.Values.sharedInfra.postgres.port }}/{{ .Values.audit.database }}" + valueFrom: + secretKeyRef: + name: audit-secrets + key: AUDIT_PG_URI - name: AUDIT_PG_TIMEZONE value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}" # MQTT broker (中心 audit-nanomq) - name: AUDIT_MQTT_BROKER_URL value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}" - - name: AUDIT_MQTT_CLIENT_ID + # POD_NAME 供 config.ts 自动生成 mixingx-audit-sub-{podName} clientId + - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: AUDIT_MQTT_SHARED_GROUP value: "mixingx-audit" - # NanoMQ 管理 API (用于状态聚合) + # NanoMQ 管理 API (用于状态聚合) — 凭据通过 Secret 注入 - name: AUDIT_MQTT_MANAGEMENT_URL value: "http://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.managementPort }}" - name: AUDIT_MQTT_MANAGEMENT_USERNAME - value: "{{ .Values.audit.mqtt.managementUsername }}" + valueFrom: + secretKeyRef: + name: audit-secrets + key: AUDIT_MQTT_MANAGEMENT_USERNAME - name: AUDIT_MQTT_MANAGEMENT_PASSWORD - value: "{{ .Values.audit.mqtt.managementPassword }}" + valueFrom: + secretKeyRef: + name: audit-secrets + key: AUDIT_MQTT_MANAGEMENT_PASSWORD # 消费队列/并发配置 - name: AUDIT_CONSUME_QUEUE_CAPACITY value: "128" @@ -232,4 +242,18 @@ spec: port: {{ $root.Values.sharedInfra.postgres.port }} targetPort: tcp protocol: TCP +--- +# ===== Audit Secrets ===== +apiVersion: v1 +kind: Secret +metadata: + name: audit-secrets + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: audit +type: Opaque +stringData: + AUDIT_PG_URI: "postgresql://{{ $root.Values.sharedInfra.postgres.username }}:{{ $root.Values.sharedInfra.postgres.password }}@{{ .Values.audit.database }}-postgres-service:{{ $root.Values.sharedInfra.postgres.port }}/{{ .Values.audit.database }}" + AUDIT_MQTT_MANAGEMENT_USERNAME: "{{ .Values.audit.mqtt.managementUsername }}" + AUDIT_MQTT_MANAGEMENT_PASSWORD: "{{ .Values.audit.mqtt.managementPassword }}" {{- end }}