From c39195c6103604a7b1dd8386a3975e1ed26f4225 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Sun, 11 Oct 2026 14:48:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(edge-unit):=20ADS=20Router=20=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E5=8F=82=E6=95=B0=E2=80=94=E2=80=94=E6=98=BE=E5=BC=8F?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=B3=A8=E5=85=A5+=E7=BC=BA=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E6=B8=B2=E6=9F=93=E6=8B=92=E7=BB=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- release-charts/mixingx-edge-unit/README.md | 22 ++++++++++++++++++- .../mixingx-edge-unit/templates/unit.yaml | 19 ++++++++++++++++ release-charts/mixingx-edge-unit/values.yaml | 10 +++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/release-charts/mixingx-edge-unit/README.md b/release-charts/mixingx-edge-unit/README.md index abb2f97..fa692ba 100644 --- a/release-charts/mixingx-edge-unit/README.md +++ b/release-charts/mixingx-edge-unit/README.md @@ -14,5 +14,25 @@ helm upgrade --install mixingx-edge-workshop-a ./charts/mixingx-edge-unit \ --set site=workshop-a \ --set nodeName=edge-node-01 \ --set storage.className=longhorn \ - --set tag=2026.07.02-abc1234 + --set tag=2026.07.02-abc1234 \ + --set adsRouter.localNetId=10.200.0.17.1.1 \ + --set adsRouter.publicAddress=192.168.1.173 ``` + +## ADS Router(本地 AMS Router) + +每个 Edge 默认随包启用本地 ADS Router(`adsRouter.enabled: true`),身份只接受显式部署注入, +没有任何共享默认兜底:`enabled=true` 时 `adsRouter.localNetId` 与 `adsRouter.publicAddress` +必填,缺失/留空会使 helm 渲染(及 ArgoCD 同步)直接失败。NetId 显式分配、重启不变, +运行时绝不从 Pod IP 推导;同 AMS 通信范围内各实例 NetId 前 4 字节必须互异,建议 `.1.1` 结尾。 + +| Value | 缺省 | 说明 | +|---|---|---| +| `adsRouter.enabled` | `true` | `false` 时不注入任何 `Ads__Router__*` env,Edge 侧本地 Router 禁用(routerState=disabled) | +| `adsRouter.localNetId` | `""`(必填) | 本方固定 AMS NetId,如 `10.200.0.17.1.1` | +| `adsRouter.publicAddress` | `""`(必填) | 对外登记地址,PLC 回程拨入,原样写入登记报文 ComputerName | +| `adsRouter.clientEndPoint` | `""` | 可选;`ip:port`,留空不注入 env(应用缺省 `127.0.0.1:48898`,SDK 本地客户端入口=回环通道绑定端点) | +| `adsRouter.externalPort` | `48898` | 可选;外部 TCP 监听==远端拨号端口(SDK 同一字段不可分离);置 0 不注入 env | + +注入 env:`Ads__Router__LocalNetId`、`Ads__Router__PublicAddress`(恒注入), +`Ads__Router__ClientEndPoint`、`Ads__Router__ExternalPort`(仅值非空时注入)。 diff --git a/release-charts/mixingx-edge-unit/templates/unit.yaml b/release-charts/mixingx-edge-unit/templates/unit.yaml index f5c9e67..c6c9bc3 100644 --- a/release-charts/mixingx-edge-unit/templates/unit.yaml +++ b/release-charts/mixingx-edge-unit/templates/unit.yaml @@ -3,6 +3,10 @@ {{- $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: @@ -87,6 +91,21 @@ spec: 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 diff --git a/release-charts/mixingx-edge-unit/values.yaml b/release-charts/mixingx-edge-unit/values.yaml index ba3b183..e4a7767 100644 --- a/release-charts/mixingx-edge-unit/values.yaml +++ b/release-charts/mixingx-edge-unit/values.yaml @@ -41,6 +41,16 @@ edgeSecrets: nodeName: "" nodeSelector: {} +# ADS Router 本地路由身份(契约 docs/research/2026-10-10-ads-router-impl/CONTRACT.md §2.1): +# 身份只接受显式部署注入,重启保持,运行时绝不从 Pod IP 推导,无共享默认兜底。 +# enabled=true 时 localNetId/publicAddress 必填,缺失或留空 → helm 渲染明确失败(fail)。 +adsRouter: + enabled: true + localNetId: "" # 本方固定 AMS NetId,如 "10.200.0.17.1.1";同 AMS 通信范围前 4 字节互异,建议 .1.1 结尾 + publicAddress: "" # 对外登记地址(PLC 回程拨入的地址串,原样入登记报文 ComputerName) + clientEndPoint: "" # 可选;"ip:port",缺省 127.0.0.1:48898(SDK 本地客户端入口=回环通道绑定端点),留空不注入 env + externalPort: 48898 # 可选;外部 TCP 监听==远端拨号端口(SDK 同一字段不可分离),置 0 不注入 env + # Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。 # enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 # instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。