diff --git a/applications/demo/edges.yaml b/applications/demo/edges.yaml index c94d8f9..ebfe3cd 100644 --- a/applications/demo/edges.yaml +++ b/applications/demo/edges.yaml @@ -39,6 +39,19 @@ spec: nodeSelector: mixingx.io/edge-node: "{{ .nodeLabel }}" {{- end }} + {{- /* ADS Router 逐实例身份透传(chart 默认 enabled=true):实例缺 adsRouter + 身份时不在此兜底,由 chart 渲染守卫明确拒绝。 */ -}} + {{- if hasKey . "adsRouter" }} + adsRouter: + localNetId: "{{ .adsRouter.localNetId }}" + publicAddress: "{{ .adsRouter.publicAddress }}" + {{- if hasKey .adsRouter "clientEndPoint" }} + clientEndPoint: "{{ .adsRouter.clientEndPoint }}" + {{- end }} + {{- if hasKey .adsRouter "externalPort" }} + externalPort: {{ .adsRouter.externalPort }} + {{- end }} + {{- end }} - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: master ref: values diff --git a/applications/dev/disabled/edges.yaml b/applications/dev/disabled/edges.yaml index 8c98bef..b4a7815 100644 --- a/applications/dev/disabled/edges.yaml +++ b/applications/dev/disabled/edges.yaml @@ -35,10 +35,22 @@ spec: site: "{{ .id }}" idWorkerId: {{ .idWorkerId }} description: "{{ .description }}" - {{- if .nodeLabel }} + {{- if hasKey . "nodeLabel" }} nodeSelector: mixingx.io/edge-node: "{{ .nodeLabel }}" {{- end }} + {{- /* ADS Router 逐实例身份透传,契约同 demo(本模板保持停用)。 */ -}} + {{- if hasKey . "adsRouter" }} + adsRouter: + localNetId: "{{ .adsRouter.localNetId }}" + publicAddress: "{{ .adsRouter.publicAddress }}" + {{- if hasKey .adsRouter "clientEndPoint" }} + clientEndPoint: "{{ .adsRouter.clientEndPoint }}" + {{- end }} + {{- if hasKey .adsRouter "externalPort" }} + externalPort: {{ .adsRouter.externalPort }} + {{- end }} + {{- end }} - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: master ref: values diff --git a/environments/demo/edges.yaml b/environments/demo/edges.yaml index 3d3657d..3f8b495 100644 --- a/environments/demo/edges.yaml +++ b/environments/demo/edges.yaml @@ -2,6 +2,16 @@ edges: - id: demo idWorkerId: 17 description: Demo Edge + # ADS Router 本方身份:显式分配,重启不变,绝不从 Pod IP 推导。 + # localNetId 第 4 字节与 idWorkerId 对齐便于记忆;列表内前 4 字节互异(10.200.0.17 / 10.200.0.18)。 + adsRouter: + localNetId: "10.200.0.17.1.1" + # 运维占位:demo 集群节点出站地址,两 Edge 同出口(多 Edge 同出口验收场景); + # 上线前按现场 PLC 可回程的实际地址核实替换。 + publicAddress: "192.168.1.173" - id: demo-2 idWorkerId: 18 description: Demo Edge 2 + adsRouter: + localNetId: "10.200.0.18.1.1" + publicAddress: "192.168.1.173" # 同 demo:运维占位,两 Edge 同出口 diff --git a/environments/dev/edges.yaml b/environments/dev/edges.yaml index 4a36676..818444a 100644 --- a/environments/dev/edges.yaml +++ b/environments/dev/edges.yaml @@ -3,3 +3,8 @@ edges: idWorkerId: 17 description: Dev Edge nodeLabel: node2 + # ADS Router 本方身份,契约同 demo(本环境模板停用,仅维护契约); + # 第三字节取 1 与 demo 环境(10.200.0.*)区分作用域。 + adsRouter: + localNetId: "10.200.1.17.1.1" + publicAddress: "192.168.1.173" # 运维占位,启用前按现场核实替换