统一 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 仍在
63 lines
1.7 KiB
Smarty
63 lines
1.7 KiB
Smarty
{{- define "mixingx-unit.name" -}}
|
|
{{- printf "%s-%s" .Values.role (.Values.site | toString) -}}
|
|
{{- end -}}
|
|
|
|
{{- define "mixingx-unit.webName" -}}
|
|
{{- printf "%s-web-%s" .Values.role (.Values.site | toString) -}}
|
|
{{- end -}}
|
|
|
|
{{- define "mixingx-unit.serviceId" -}}
|
|
{{- .Values.serviceId | default (include "mixingx-unit.name" .) -}}
|
|
{{- end -}}
|
|
|
|
{{- define "mixingx-unit.basePath" -}}
|
|
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
|
|
{{- end -}}
|
|
|
|
{{- define "mixingx-unit.storageClassName" -}}
|
|
{{- .Values.storage.className | default "local-path" -}}
|
|
{{- end -}}
|
|
|
|
{{- define "mixingx-unit.backendScheduling" -}}
|
|
{{- if .Values.nodeName }}
|
|
nodeName: {{ .Values.nodeName }}
|
|
{{- else if .Values.nodeSelector }}
|
|
nodeSelector:
|
|
{{ toYaml .Values.nodeSelector | indent 2 }}
|
|
{{- end }}
|
|
{{- end -}}
|
|
|
|
{{- define "mixingx-unit.followerScheduling" -}}
|
|
{{- $name := include "mixingx-unit.name" . -}}
|
|
{{- if .Values.nodeName }}
|
|
nodeName: {{ .Values.nodeName }}
|
|
{{- else }}
|
|
{{- if .Values.nodeSelector }}
|
|
nodeSelector:
|
|
{{ toYaml .Values.nodeSelector | indent 2 }}
|
|
{{- end }}
|
|
affinity:
|
|
podAffinity:
|
|
requiredDuringSchedulingIgnoredDuringExecution:
|
|
- labelSelector:
|
|
matchLabels:
|
|
app.kubernetes.io/component: {{ $name }}
|
|
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 -}}
|