feat(unit): 添加MQTT凭据配置和NanoMQ代理支持

- 在mixingx-agent-unit中添加mqttCredentials配置项,用于存储MQTT凭据映射表
- 在unit.yaml模板中添加MQTT凭据相关的环境变量配置循环
- 为mixingx-edge-unit添加NanoMQ代理的服务名称和凭据引用的helper模板
- 配置Edge单元的MQTT相关环境变量(Mqtt__BrokerHost、Mqtt__BrokerPort、Mqtt__Enabled)
- 添加NanoMQ代理的镜像配置、端口和资源配置选项
This commit is contained in:
王野 committed 2026-08-03 00:30:03 +08:00
1 parent 5e83675edf
commit 28011f1154
6 files changed
+97

No files matched your search

@@ -121,6 +121,10 @@ stringData:
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 }}"
{{- range .Values.mqttCredentials }}
Mqtt__Credentials__{{ .credentialRef }}__Username: "{{ .username }}"
Mqtt__Credentials__{{ .credentialRef }}__Password: "{{ .password }}"
{{- end }}
---
apiVersion: apps/v1
kind: Deployment
@@ -52,3 +52,11 @@ sharedInfra:
otlp:
endpoint: http://k8s-dashboard-service:18889
protocol: grpc
# credentialRef → credential 映射表。
# Agent 从 Gateway descriptor 获取每个 Edge 的 credentialRef,
# 再从此表查找对应的 MQTT 用户名/密码。
mqttCredentials: []
# - credentialRef: "edge-demo-mqtt"
# username: "edge-user"
# password: "edge-pass"
@@ -49,3 +49,18 @@ affinity:
topologyKey: kubernetes.io/hostname
{{- end }}
{{- end -}}
{{- define "mixingx-unit.mqttBrokerName" -}}
{{- $name := include "mixingx-unit.name" . -}}
{{- printf "%s-nanomq" $name -}}
{{- end -}}
{{- define "mixingx-unit.mqttBrokerServiceName" -}}
{{- $name := include "mixingx-unit.name" . -}}
{{- printf "%s-nanomq-service" $name -}}
{{- end -}}
{{- define "mixingx-unit.mqttCredentialRef" -}}
{{- $name := include "mixingx-unit.name" . -}}
{{- .Values.mqtt.credentialRef | default (printf "%s-mqtt" $name) -}}
{{- end -}}
@@ -0,0 +1,57 @@
{{- $name := include "mixingx-unit.name" . -}}
{{- $brokerName := include "mixingx-unit.mqttBrokerName" . -}}
{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}}
{{- $credentialRef := include "mixingx-unit.mqttCredentialRef" . -}}
{{- if .Values.mqtt.enabled }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $brokerName }}
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: {{ $brokerName }}
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/component: {{ $brokerName }}
template:
metadata:
labels:
app.kubernetes.io/component: {{ $brokerName }}
spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
containers:
- name: nanomq
image: "{{ .Values.mqtt.image.repository }}:{{ .Values.mqtt.image.tag }}"
imagePullPolicy: IfNotPresent
ports:
- name: mqtt
containerPort: {{ .Values.mqtt.port }}
protocol: TCP
resources:
{{ toYaml .Values.mqtt.resources | default dict | nindent 12 }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ $brokerSvcName }}
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/component: {{ $brokerName }}
mixingx.io/role: mqtt-broker
mixingx.io/node-id: {{ $name }}
annotations:
mixingx.io/credential-ref: {{ $credentialRef }}
spec:
type: ClusterIP
selector:
app.kubernetes.io/component: {{ $brokerName }}
ports:
- name: mqtt
port: {{ .Values.mqtt.port }}
targetPort: mqtt
protocol: TCP
{{- end }}
@@ -4,6 +4,7 @@
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
{{- $basePath := include "mixingx-unit.basePath" . -}}
{{- $pgHost := printf "%s-postgres-service" $name -}}
{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}}
---
apiVersion: apps/v1
kind: Deployment
@@ -100,6 +101,9 @@ data:
OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}"
OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}"
OTEL_SERVICE_NAME: "{{ $name }}"
Mqtt__BrokerHost: "{{ $brokerSvcName }}"
Mqtt__BrokerPort: "{{ .Values.mqtt.port }}"
Mqtt__Enabled: "true"
ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
---
apiVersion: v1
@@ -51,3 +51,12 @@ sharedInfra:
otlp:
endpoint: http://k8s-dashboard-service:18889
protocol: grpc
mqtt:
enabled: true
image:
repository: emqx/nanomq
tag: 0.25.2-2
port: 1883
credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt
resources: {}