Merge branch 'develop/v.1.0.1' into master
统一 chart 分叉: master(去PG) + develop(MQTT/NanoMQ) → 融合版
edge-unit 融合方向(去 PG + 保留 MQTT):
- 保留 master 的本地 PVC(edge-data)+ edgeSecrets 只读挂载 + EdgeIdentity env
- 嫁接 develop 的 MQTT/NanoMQ 功能(nanomq.yaml + ConfigMap Mqtt__* env)
- Mqtt__* env 用 {{ if .Values.mqtt.enabled }} 条件化(与 nanomq.yaml 一致)
- 删除 develop 的 PostgreSQL 资源(StatefulSet/Service/PG env/PG Secret)
其他:
- 删除废弃的单体主 chart(19 文件,develop 方向)
- README 取 develop 完整版
- values: idWorkerId + edgeSecrets(master) + mqtt(develop) 全保留
- 修复 web Service 重复的 protocol: TCP
helm lint 通过; helm template 验证:
mqtt.enabled=true → 有 PVC + nanomq + Mqtt env,无 postgres
mqtt.enabled=false → MQTT 全隐藏,PVC 仍在
This commit is contained in:
commit
8ffbf97cce
28 files changed
+126
-1389
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 }}
|
||||
AgentEdgeMqtt__Credentials__{{ .credentialRef }}__UserName: "{{ .username }}"
|
||||
AgentEdgeMqtt__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"
|
||||
@@ -45,3 +45,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 }}
|
||||
@@ -2,6 +2,7 @@
|
||||
{{- $webName := include "mixingx-unit.webName" . -}}
|
||||
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
|
||||
{{- $basePath := include "mixingx-unit.basePath" . -}}
|
||||
{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}}
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
@@ -135,6 +136,11 @@ data:
|
||||
OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}"
|
||||
OTEL_SERVICE_NAME: "{{ $name }}"
|
||||
ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
|
||||
{{- if .Values.mqtt.enabled }}
|
||||
Mqtt__BrokerHost: "{{ $brokerSvcName }}"
|
||||
Mqtt__BrokerPort: "{{ .Values.mqtt.port }}"
|
||||
Mqtt__Enabled: "true"
|
||||
{{- end }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
@@ -205,4 +211,3 @@ spec:
|
||||
port: {{ .Values.ports.frontend }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
protocol: TCP
|
||||
@@ -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: {}
|
||||
@@ -1,3 +1,5 @@
|
||||
{{/* Gateway 需要读 Service 列表来发现 edge/agent 等后端及 mqtt-broker(Task 07) */}}
|
||||
{{/* 权限只有 Service get/list/watch,不包含 Pod/Secret/ConfigMap */}}
|
||||
{{- if .Values.gateway.rbac }}
|
||||
---
|
||||
apiVersion: v1
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
{{/* Gateway 需要读 Service 列表来发现 edge/agent 等后端及 mqtt-broker(Task 07) */}}
|
||||
{{/* 权限只有 Service get/list/watch,不包含 Pod/Secret/ConfigMap */}}
|
||||
{{- if .Values.gateway.rbac }}
|
||||
---
|
||||
apiVersion: v1
|
||||
|
||||
Reference in new issue
Block a user