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
@@ -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
|
||||
Reference in new issue
Block a user