Compare commits
32
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68bccfc092 | ||
|
|
e031d656a0 | ||
|
|
347180d77b | ||
|
|
9fdb306601 | ||
|
|
c3e295494d | ||
|
|
17a186a9df | ||
|
|
321b602905 | ||
|
|
a1da3f4e42 | ||
|
|
8733595824 | ||
|
|
ff5ecf710e | ||
|
|
c2b78f8ff0 | ||
|
|
b0e1dcd4f0 | ||
|
|
e7f4b71cd0 | ||
|
|
4bcf4fe0a3 | ||
|
|
33de837556 | ||
|
|
b1d65fab30 | ||
|
|
25a9385751 | ||
|
|
0c8effe321 | ||
|
|
0aeb301be5 | ||
|
|
2892f80bd1 | ||
|
|
2b3bcbcfa8 | ||
|
|
cd3635643b | ||
|
|
326236b5e6 | ||
|
|
133c032144 | ||
|
|
373c020fc4 | ||
|
|
5d54a3ef92 | ||
|
|
ff458a86be | ||
|
|
3345c257c4 | ||
|
|
869cc95c8b | ||
|
|
58ae4560a7 | ||
|
|
6dd26e9549 | ||
|
|
c39195c610 |
No files matched your search
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-agent-unit
|
||||
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-audit
|
||||
description: MixingX audit service.
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -46,9 +46,12 @@ spec:
|
||||
key: AUDIT_PG_URI
|
||||
- name: AUDIT_PG_TIMEZONE
|
||||
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
|
||||
# 数据保留月数(按自然月清理分区)
|
||||
# 数据保留月数(按自然月清理分区;operations 表)
|
||||
- name: AUDIT_RETENTION_MONTHS
|
||||
value: "{{ .Values.audit.retentionMonths | default 6 }}"
|
||||
# 错误流水独立保留月数(errors 表,分表独立清除)
|
||||
- name: AUDIT_ERROR_RETENTION_MONTHS
|
||||
value: "{{ .Values.audit.errorRetentionMonths | default 3 }}"
|
||||
# MQTT broker
|
||||
- name: AUDIT_MQTT_BROKER_URL
|
||||
value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}"
|
||||
|
||||
@@ -24,8 +24,10 @@ audit:
|
||||
replicas: 2
|
||||
database: audit-db
|
||||
pgStorage: 5Gi
|
||||
# 数据保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS)
|
||||
# 操作流水(audit_operations)保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS)
|
||||
retentionMonths: 6
|
||||
# 错误流水(audit_errors)独立保留月数(后端 AUDIT_ERROR_RETENTION_MONTHS,2026-10-26 裁决:分表独立)
|
||||
errorRetentionMonths: 3
|
||||
# JWT 鉴权:后端通过 SSO /api/sso/users/info 间接校验 token,这里配置 SSO base URL
|
||||
jwt:
|
||||
ssoBaseUrl: "http://sso-service:8080"
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-codeserver
|
||||
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-edge-unit
|
||||
description: "One MixingX edge unit release with durable local revision storage."
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -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`(仅值非空时注入)。
|
||||
@@ -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
|
||||
|
||||
@@ -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)。
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-gateway
|
||||
description: MixingX gateway service, RBAC, and root ingress.
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-infra
|
||||
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-mqttx
|
||||
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-network-agent
|
||||
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-platform
|
||||
description: MixingX central platform services without customer edge/agent instances.
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-protocol-server-unit
|
||||
description: Deploy one MixingX edge protocol test server instance.
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-sso
|
||||
description: MixingX SSO standalone release (backend, web, and PostgreSQL).
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-ultra
|
||||
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
|
||||
type: application
|
||||
version: 1.0.60
|
||||
appVersion: "1.0.60"
|
||||
version: 1.0.89
|
||||
appVersion: "1.0.89"
|
||||
Reference in new issue
Block a user