diff --git a/release-charts/mixingx-agent-unit/templates/_helpers.tpl b/release-charts/mixingx-agent-unit/templates/_helpers.tpl index a2bfe98..466cb79 100644 --- a/release-charts/mixingx-agent-unit/templates/_helpers.tpl +++ b/release-charts/mixingx-agent-unit/templates/_helpers.tpl @@ -49,3 +49,33 @@ affinity: topologyKey: kubernetes.io/hostname {{- end }} {{- end -}} + +{{- define "mixingx-unit.backendConfigData" -}} +{{- $name := include "mixingx-unit.name" . -}} +{{- $serviceId := include "mixingx-unit.serviceId" . -}} +{{- $pgHost := printf "%s-postgres-service" $name -}} +HTTP_PORTS: "{{ .Values.ports.backend }}" +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.username }}" +MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}" +MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" +MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" +services__gateway__http__0: "http://gateway-service:8080" +services__ultra__http__0: "http://{{ .Values.sharedInfra.ultra.host }}:{{ .Values.sharedInfra.ultra.port }}" +AGENT_SERVICE_ID: "{{ $serviceId }}" +{{- if .Values.phaseType }} +AGENT_PHASE_TYPE: "{{ .Values.phaseType }}" +{{- end }} +{{- if .Values.audit.publisher.enabled }} +AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" +AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "agent" }}" +AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default $name }}" +{{- end }} +OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}" +OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}" +OTEL_SERVICE_NAME: "{{ $name }}" +ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- end -}} diff --git a/release-charts/mixingx-agent-unit/templates/unit.yaml b/release-charts/mixingx-agent-unit/templates/unit.yaml index 2f05912..92292db 100644 --- a/release-charts/mixingx-agent-unit/templates/unit.yaml +++ b/release-charts/mixingx-agent-unit/templates/unit.yaml @@ -22,6 +22,8 @@ spec: metadata: labels: app.kubernetes.io/component: {{ $name }} + annotations: + checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }} spec: {{ include "mixingx-unit.backendScheduling" . | nindent 6 }} containers: @@ -86,29 +88,7 @@ kind: ConfigMap metadata: name: {{ $name }}-config data: - HTTP_PORTS: "{{ .Values.ports.backend }}" - 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.username }}" - MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}" - MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" - MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" - services__gateway__http__0: "http://gateway-service:8080" - AGENT_SERVICE_ID: "{{ $serviceId }}" - {{- if .Values.phaseType }} - AGENT_PHASE_TYPE: "{{ .Values.phaseType }}" - {{- end }} - {{- if .Values.audit.publisher.enabled }} - AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" - AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "agent" }}" - AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default $name }}" - {{- end }} - OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}" - OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}" - OTEL_SERVICE_NAME: "{{ $name }}" - ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- include "mixingx-unit.backendConfigData" . | nindent 2 }} --- apiVersion: v1 kind: Secret diff --git a/release-charts/mixingx-agent-unit/values.yaml b/release-charts/mixingx-agent-unit/values.yaml index 8265d0b..d2cc361 100644 --- a/release-charts/mixingx-agent-unit/values.yaml +++ b/release-charts/mixingx-agent-unit/values.yaml @@ -36,6 +36,11 @@ nodeName: "" nodeSelector: {} sharedInfra: + # Agent 侧服务发现注入的 Ultra 地址(services__ultra__http__0)。 + # 默认指向平台级 Ultra;未来多 Ultra 部署时在对应 agent 的 values 覆盖 host 即可。 + ultra: + host: ultra-service + port: 8080 postgres: username: postgres password: "Admin12345"