Files
ximenchuifeng c39195c610 feat(edge-unit): ADS Router 部署参数——显式身份注入+缺身份渲染拒绝
adsRouter values 块:enabled 缺省 true(每 Edge 出厂自带本地 Router);localNetId/
publicAddress 必填(启用时)——缺任一即 {{ fail }} 拒绝渲染,不用共同默认身份兜底
(身份必须显式分配且重启保持,绝不运行时从 Pod IP 推导);clientEndPoint/externalPort
可选(缺省 127.0.0.1:48898/48898,Pod 独立网络命名空间自洽)。unit.yaml 注入
Ads__Router__* env(ClientEndPoint/ExternalPort 空则省略)。README 补值文档与示例。
渲染证据:demo 两实例(不同 NetId/正确 publicAddress)exit=0+缺身份负例 fail+enabled=false
零 Ads env;见 hub docs/research/evidence/2026-10-10-ads-router-impl/W9-*.md
2026-10-11 14:48:55 +08:00

234 lines
8.6 KiB
YAML

{{- $name := include "mixingx-unit.name" . -}}
{{- $webName := include "mixingx-unit.webName" . -}}
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
{{- $basePath := include "mixingx-unit.basePath" . -}}
{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}}
{{- /* ADS Router 身份强制:启用即必须显式给身份,禁止共享默认兜底(空/缺失=渲染失败)。 */ -}}
{{- if and .Values.adsRouter.enabled (or (not .Values.adsRouter.localNetId) (not .Values.adsRouter.publicAddress)) }}
{{- fail "adsRouter.enabled=true requires explicit adsRouter.localNetId and adsRouter.publicAddress (no shared default identity)" }}
{{- end }}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ $name }}-data
{{- if .Values.storage.keep }}
annotations:
helm.sh/resource-policy: keep
{{- end }}
spec:
accessModes: ["ReadWriteOnce"]
storageClassName: {{ include "mixingx-unit.storageClassName" . }}
resources:
requests:
storage: {{ .Values.storage.size }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $name }}-deployment
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: {{ $name }}
spec:
# Edge backend 在启动时对 PVC data root(/var/lib/mixingx-edge/owner.lock)
# 取排他文件锁(EdgeOwnerLease),保证同一 data root 同时只有一个写者。
# RollingUpdate 会先起新 Pod 再杀旧 Pod,新旧共享同一 PVC → 新 Pod 抢锁失败 →
# Fatal → CrashLoopBackOff → 滚动永久卡死、ArgoCD Degraded。
# Recreate 先杀旧 Pod(释放锁)再起新 Pod(拿锁成功),与单实例有状态服务匹配。
strategy:
type: Recreate
replicas: 1
selector:
matchLabels:
app.kubernetes.io/component: {{ $name }}
template:
metadata:
annotations:
checksum/config: {{ include "mixingx-unit.configData" . | sha256sum }}
labels:
app.kubernetes.io/component: {{ $name }}
spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
volumes:
- name: edge-data
persistentVolumeClaim:
claimName: {{ $name }}-data
{{- range $index, $secret := .Values.edgeSecrets.mounts }}
- name: edge-secret-{{ $index }}
secret:
secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }}
{{- end }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}
{{ $backendImg := .Values.images.backend }}
{{ $edgeImg := .Values.images.edge | default dict }}
{{ $backendRepo := $edgeImg.repository | default $backendImg.repository }}
{{ $backendTag := $edgeImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
imagePullPolicy: IfNotPresent
ports:
- name: http
containerPort: {{ .Values.ports.backend }}
protocol: TCP
envFrom:
- configMapRef:
name: {{ $name }}-config
- secretRef:
name: {{ $name }}-secrets
env:
- name: TZ
value: "{{ .Values.timezone | default "Asia/Shanghai" }}"
- name: EdgeData__Root
value: /var/lib/mixingx-edge
- name: EdgeIdentity__NodeId
value: {{ $name | quote }}
- name: EdgeIdentity__IdWorkerId
value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }}
- name: EdgeSecrets__Root
value: {{ .Values.edgeSecrets.root | quote }}
{{- /* ADS Router 身份注入:必填两项恒注入;可选两项留空/置 0 则省略(应用侧缺省生效)。 */ -}}
{{- if .Values.adsRouter.enabled }}
- name: Ads__Router__LocalNetId
value: {{ .Values.adsRouter.localNetId | quote }}
- name: Ads__Router__PublicAddress
value: {{ .Values.adsRouter.publicAddress | quote }}
{{- with .Values.adsRouter.clientEndPoint }}
- name: Ads__Router__ClientEndPoint
value: {{ . | quote }}
{{- end }}
{{- with .Values.adsRouter.externalPort }}
- name: Ads__Router__ExternalPort
value: "{{ . }}"
{{- end }}
{{- end }}
volumeMounts:
- name: edge-data
mountPath: /var/lib/mixingx-edge
{{- range $index, $secret := .Values.edgeSecrets.mounts }}
- name: edge-secret-{{ $index }}
mountPath: {{ printf "%s/%s" $.Values.edgeSecrets.root (required "edgeSecrets.mounts[].name is required" $secret.name) | quote }}
readOnly: true
{{- end }}
livenessProbe:
httpGet:
path: /health
port: http
initialDelaySeconds: 120
periodSeconds: 30
timeoutSeconds: 15
failureThreshold: 12
readinessProbe:
httpGet:
path: /alive
port: http
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 10
failureThreshold: 8
---
apiVersion: v1
kind: Service
metadata:
name: {{ $name }}-service
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/component: {{ $name }}
mixingx.io/role: {{ .Values.role }}
mixingx.io/node-id: {{ $name }}
annotations:
mixingx.io/description: {{ .Values.description | quote }}
spec:
selector:
app.kubernetes.io/component: {{ $name }}
ports:
- name: http
port: {{ .Values.ports.backend }}
targetPort: http
protocol: TCP
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $name }}-config
data:
{{- include "mixingx-unit.configData" . | nindent 2 }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ $name }}-secrets
type: Opaque
stringData:
ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}"
REDIS_PASSWORD: "{{ .Values.sharedInfra.redis.password }}"
REDIS_URI: "redis://:{{ .Values.sharedInfra.redis.password }}@{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }}"
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 }}"
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $webName }}-deployment
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: {{ $webName }}
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/component: {{ $webName }}
template:
metadata:
labels:
app.kubernetes.io/component: {{ $webName }}
spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $webName }}
{{ $frontendImg := .Values.images.frontend }}
{{ $edgeWebImg := .Values.images.edgeWeb | default dict }}
{{ $frontendRepo := $edgeWebImg.repository | default $frontendImg.repository }}
{{ $frontendTag := $edgeWebImg.tag | default $frontendImg.tag | default .Values.tag | default "latest" }}
image: {{ .Values.registry }}/{{ $frontendRepo }}:{{ $frontendTag }}
imagePullPolicy: IfNotPresent
ports:
- name: http
containerPort: {{ .Values.ports.frontend }}
protocol: TCP
env:
- name: TZ
value: "{{ .Values.timezone | default "Asia/Shanghai" }}"
- name: VITE_BASE_PATH
value: "{{ $basePath }}"
- name: PORT
value: "{{ .Values.ports.frontend }}"
---
apiVersion: v1
kind: Service
metadata:
name: {{ $webName }}-service
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/component: {{ $webName }}
mixingx.io/role: web
mixingx.io/node-id: {{ $webName }}
spec:
selector:
app.kubernetes.io/component: {{ $webName }}
ports:
- name: http
port: {{ .Values.ports.frontend }}
targetPort: http
protocol: TCP