77 Commits
Author SHA1 Message Date
ximenchuifeng 0aeb301be5 release: bump chart version to v1.0.73 2026-10-14 08:51:32 +00:00
ximenchuifeng 2892f80bd1 release: bump chart version to v1.0.72 2026-10-14 08:07:35 +00:00
ximenchuifeng 2b3bcbcfa8 release: bump chart version to v1.0.71 2026-10-14 04:58:12 +00:00
ximenchuifeng cd3635643b release: bump chart version to v1.0.70 2026-10-13 08:09:51 +00:00
ximenchuifeng 326236b5e6 release: bump chart version to v1.0.69 2026-10-13 08:09:09 +00:00
ximenchuifeng 373c020fc4 release: bump chart version to v1.0.67 2026-10-12 07:25:11 +00:00
ximenchuifeng 5d54a3ef92 release: bump chart version to v1.0.66 2026-10-12 05:16:20 +00:00
ximenchuifeng ff458a86be release: bump chart version to v1.0.65 2026-10-12 02:13:08 +00:00
ximenchuifeng 869cc95c8b release: bump chart version to v1.0.63 2026-10-11 08:39:48 +00:00
ximenchuifeng 58ae4560a7 release: bump chart version to v1.0.62 2026-10-11 07:22:08 +00:00
ximenchuifeng 6dd26e9549 release: bump chart version to v1.0.61(含 ADS Router 显式身份参数) 2026-10-11 14:49:03 +08:00
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
ximenchuifeng 52622e8fea release: bump chart version to v1.0.60 2026-10-10 07:12:20 +00:00
ximenchuifeng 9cb242aff8 release: bump chart version to v1.0.59 2026-10-10 05:16:12 +00:00
ximenchuifeng 77a743cd6c release: bump chart version to v1.0.58 2026-10-10 03:05:31 +00:00
ximenchuifeng 443ada9f4a release: bump chart version to v1.0.57 2026-10-10 01:47:44 +00:00
ximenchuifeng 0e5bd063cc release: bump chart version to v1.0.55 2026-10-09 11:20:37 +00:00
ximenchuifeng ec7a42ccc5 release: bump chart version to v1.0.54 2026-10-09 10:39:09 +00:00
ximenchuifeng 5f70e78927 release: bump chart version to v1.0.53 2026-10-09 09:42:25 +00:00
ximenchuifeng bac3af555e release: bump chart version to v1.0.52 2026-10-09 09:39:56 +00:00
ximenchuifeng e16a64439b feat(gateway): ingress domain 留空渲染无 host 规则——现场 PC 可直接用节点 IP 访问(如 http://192.168.137.117/),不留空时行为不变;values 注释说明缺省域名与留空语义 2026-10-09 10:23:22 +08:00
ximenchuifeng 7944c98fdb release: bump chart version to v1.0.49 2026-09-29 07:52:24 +00:00
ximenchuifeng 50b47a556a feat: 新增 mixingx-codeserver chart——浏览器版 VS Code 测试 IDE(code-server 4.139.1 锁版镜像,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser;工作区 PVC keep;Recreate 单副本;traefik ingress) 2026-09-29 15:14:14 +08:00
ximenchuifeng e6ada86374 release: bump chart version to v1.0.42 2026-09-24 06:39:09 +00:00
ximenchuifeng 33908b6955 release: bump chart version to v1.0.41 2026-09-24 03:22:55 +00:00
ximenchuifeng f623c56853 release: bump chart version to v1.0.40 2026-09-24 02:57:06 +00:00
ximenchuifeng 1a1847ba7e release: bump chart version to v1.0.39 2026-09-24 02:04:52 +00:00
ximenchuifeng 3c5dff3857 release: bump chart version to v1.0.26 2026-09-18 05:49:34 +00:00
ximenchuifeng cf0cf6080f release: bump chart version to v1.0.25 2026-09-18 05:42:39 +00:00
ximenchuifeng 943b045cad release: bump chart version to v1.0.23 2026-09-15 10:51:15 +00:00
ximenchuifeng 224afb71f1 release: bump chart version to v1.0.21 2026-09-15 09:36:52 +00:00
ximenchuifeng 2ba8f83f2e release: bump chart version to v1.0.19 2026-09-14 09:52:19 +00:00
ximenchuifeng 0ece6b12b2 release: bump chart version to v1.0.18 2026-09-14 07:00:23 +00:00
ximenchuifeng 322411955e release: bump chart version to v1.0.14 2026-09-08 11:08:11 +00:00
ximenchuifeng 4716a40c3a release: bump chart version to v1.0.13 2026-09-08 11:06:21 +00:00
ximenchuifeng 9ab9b5c97e release: bump chart version to v1.0.12 2026-09-08 11:05:17 +00:00
ximenchuifeng 8b70d43953 release: bump chart version to v1.0.10 2026-09-08 10:48:09 +00:00
ximenchuifeng 70c85011db release: bump chart version to v1.0.9 2026-09-08 10:28:34 +00:00
ximenchuifeng 0aea949b49 release: bump chart version to v1.0.7 2026-09-08 08:07:59 +00:00
ximenchuifeng 5e9b92f507 release: bump chart version to v1.0.5 2026-09-08 07:02:59 +00:00
ximenchuifeng b21fb1ac92 release: bump chart version to v1.0.4 2026-09-08 06:58:41 +00:00
ximenchuifeng f2e6683a44 release: bump chart version to v1.0.3 2026-09-08 04:55:52 +00:00
ximenchuifeng c4f962d120 release: bump chart version to v1.0.2 2026-09-08 04:53:47 +00:00
ximenchuifeng a567579ab2 chore(delivery): busybox/alpine 修正为 ACR 实存 tag 并标 optional(2026-08-38 实盘盘点) 2026-08-22 15:06:18 +08:00
ximenchuifeng 3433a6d945 chore(delivery): mqttx-web 已推 ACR 2026-08-22 14:44:05 +08:00
ximenchuifeng befbfee653 release: bump chart version to v1.0.1 2026-08-22 05:49:53 +00:00
ximenchuifeng 07f22f5eb4 chore(delivery): nanomq 已补推 ACR,清单标记翻绿(D2 完成) 2026-08-22 13:24:24 +08:00
ximenchuifeng 601151bfae feat(delivery): 全 chart 支持 imagePullSecrets(默认空,内网零变化)+ 交付镜像清单
- 10 个 chart values 顶层加 imagePullSecrets: [](ADR-0066)
- 27 处 Pod spec 注入 with 块;platform _workloads.tpl 用 $root 上下文
- 默认渲染与改动前 bit 级一致(helm template 验证);注入测试 10/10 通过
- delivery/image-manifest.yaml: 第三方镜像 ACR 核对清单(nanomq 为当前缺口)
2026-08-22 13:06:46 +08:00
ximenchuifeng c4527a8ec5 feat(sso/ultra/edge-unit): Deployment 加 checksum/config 注解,ConfigMap 变更自动触发滚动(对齐 agent-unit f74201a 模式) 2026-08-20 13:11:57 +08:00
ximenchuifeng e7c8c665a4 Merge branch 'develop/v.1.0.1' 2026-08-20 11:04:46 +08:00
ximenchuifeng cc8c081e7f Merge remote-tracking branch 'origin/develop/v.1.0.1' into HEAD
# Conflicts:
#	release-charts/mixingx-agent-unit/templates/unit.yaml
2026-08-20 11:03:02 +08:00
ximenchuifeng 9d3e980dde feat(sso/ultra/agent/edge): AuditMqttPublisher 注入开关 audit.publisher(默认 NoOp,ADR-0048/0049) 2026-08-20 11:02:16 +08:00
ximenchuifeng c3fbbb0434 feat(mixingx-audit): chart 自包含重做(audit-db Postgres、audit-nanomq、audit-web;JWT 改 SSO base URL;storage/retention 参数) 2026-08-20 11:02:16 +08:00
ximenchuifeng e65e1f0654 Merge commit '6fcb034' 2026-08-11 07:52:18 +08:00
ximenchuifeng 0abab2a624 fix(chart): mqttx-web http-server 显式绑 0.0.0.0,修复 Service 转发拒绝连接
emqx/mqttx-web 镜像默认 http-server 启动未显式绑 0.0.0.0,容器内只听 loopback,
导致 Service/Pod IP 进不来、Ingress 502。覆盖启动参数强制监听所有接口。
2026-08-06 16:08:15 +08:00
ximenchuifeng b0563138f4 feat(chart): 新增 mixingx-mqttx chart + NanoMQ 开启 WebSocket 端口
- 新增 release-charts/mixingx-mqttx:浏览器端 MQTT 客户端 (emqx/mqttx-web),
  Deployment + Service(ClusterIP) + Ingress(host-based),与 sso/gateway 平级,
  供运维通过 Argo CD 随时部署/删除监控各 Edge 的 NanoMQ broker。
- edge-unit/nanomq.yaml:NanoMQ 容器声明 ws containerPort(8083)、Service 加 ws port,
  供 MQTTX Web 等浏览器客户端经 ws 连接。Service 保持 ClusterIP,
  运维需外部调试时手动改 NodePort。
- edge-unit/values.yaml:新增 mqtt.wsPort(默认 8083)。
2026-08-06 15:49:19 +08:00
ximenchuifeng f972154abf fix(edge-unit): backend Deployment 改用 Recreate 策略
Edge backend 启动时通过 EdgeOwnerLease 对 PVC data root
(/var/lib/mixingx-edge/owner.lock)取排他文件锁,保证同一 data root
同时只有一个写者。默认 RollingUpdate 会先起新 Pod 再杀旧 Pod,新旧
共享同一 PVC → 新 Pod 抢 owner.lock 失败 → Fatal → CrashLoopBackOff
→ 滚动永久卡死、ArgoCD Application 持续 Degraded。

改用 Recreate:先杀旧 Pod(释放锁)再起新 Pod(拿锁成功),与单实例
有状态服务的语义匹配。PVC 全程不受影响,数据零丢失。
2026-08-06 08:59:44 +08:00
ximenchuifeng 8ffbf97cce Merge branch 'develop/v.1.0.1' into master
统一 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 仍在
2026-08-05 15:03:04 +08:00
ximenchuifeng 38907081ab chore(chart): 移除废弃的单体主 chart,仅保留 release-charts
- 删除根 Chart.yaml/values.yaml/values-105.yaml 和 templates/(19 文件)
- 这些单体 chart 是早期"替代 Aspire publish"的尝试,已被 release-charts/ 取代
- CI(.drone.yml)和 ArgoCD(mixingx-deploy)均只使用 release-charts/
- release-charts 有独立 _helpers.tpl,不依赖主 chart 的任何模板
- README 改写为只描述 release-charts 部署入口
2026-08-05 10:21:07 +08:00
ximenchuifeng 5d51b2e1de feat(edge-unit): 去 PostgreSQL + Edge Secret 只读挂载 + data PVC 2026-07-30 18:45:53 +08:00
ximenchuifeng 08ed1422fe feat(charts): split platform release charts 2026-07-10 09:29:16 +08:00
ximenchuifeng aeb34d1e5b feat(agent): 支持 AGENT_PHASE_TYPE 注入(对齐 apphost WithPhaseType)
- mixingx-agent-unit: values 加 phaseType 字段,unit.yaml ConfigMap 渲染 AGENT_PHASE_TYPE
- 根 chart _backend.tpl: agent 分支渲染 AGENT_PHASE_TYPE
- 根 chart instances.yaml: 遍历 agents 时透传 phaseType
- 空 phaseType 不渲染(向后兼容)

对应 apphost.cs WithPhaseType 扩展,k8s 部署侧此前缺失此环境变量,
导致 agent 启动读不到工序类型,触发 ultra 阶段6 扫码校验 Fail。
2026-07-07 16:43:20 +08:00
ximenchuifeng f677ca8206 feat(protocol): add protocol server unit chart 2026-07-06 11:26:48 +08:00
ximenchuifeng 79523adfda fix(postgres): use pgdata subdir for persistent volumes 2026-07-03 17:25:52 +08:00
ximenchuifeng d437650d8c fix(chart): allow platform postgres image override 2026-07-03 11:31:40 +08:00
ximenchuifeng 05d7a39a4c feat(chart): add split release charts 2026-07-03 07:44:08 +08:00
ximenchuifeng 042a72ec0f docs: 添加 README(替换 Gitee 占位符,说明 4 类服务 + 三层调度 + 使用方法) 2026-07-02 17:06:28 +08:00
ximenchuifeng 840de98c54 docs(chart): 修正 values.yaml 点位格式注释(tierOverride→nodeAffinity)
最终 review M2:tierOverride 字段不存在,实际是 nodeAffinity。
2026-07-01 13:35:13 +08:00
ximenchuifeng 132285c253 feat(chart): _frontend/_postgres affinity 合并 + audit/shared-infra 注入 + bump 1.2.0
Tasks 10-11: podAffinity+nodeAffinity 合并到同一 affinity 块;
audit/shared-infra 走 tier;Chart.yaml 1.1.0→1.2.0。
2026-07-01 13:14:07 +08:00
ximenchuifeng e0d680d67c feat(chart): tier + pointAffinity 模板 + values 块(三层优先级 nodeName>point>tier)
Tasks 5-9: _tier-affinity.tpl + _point-affinity.tpl + values tier 块 +
_backend.tpl 三层注入 + instances.yaml 解析 Point 对象。
2026-07-01 13:04:53 +08:00
ximenchuifeng 92fcbf7096 chore(chart): version 1.0.0 → 1.1.0(模板从 instances 改 agents/edges)
模板格式大改(instances→agents/edges),version 应同步 +1,这样:
- helm package 生成 mixingx-1.1.0.tgz,跟老 1.0.0 区分
- 版本门禁才有意义(1.1.0 vs 105 上 1.0.0 → 黄色警告版本不一致)
- helm release revision 历史可追溯版本
2026-06-30 14:44:50 +08:00
ximenchuifeng 4c031d7cf7 refactor(chart): instances 数组改为 agents/edges 字符串数组,模板自动推导资源名 2026-06-30 08:27:25 +08:00
ximenchuifeng 7854605631 fix(chart): agent-0/edge-0 前端无限重定向(webBasePath 尾斜杠致双斜杠)
Drone→105 部署后访问 app.mixingx.local/agent-0/ 报
ERR_TOO_MANY_REDIRECTS。根因:values.yaml 的 webBasePath 带尾斜杠
(/agent-0/),_frontend.tpl 注入 VITE_BASE_PATH,agent/edge Dockerfile
sed s|/__BASE__|...$VITE_BASE_PATH|g 配合 nginx.conf 本身已带的尾斜杠
(location /__BASE__/、return 302 /__BASE__/)→ 拼成 /agent-0//。渲染后的
location /agent-0// 匹配不到 /agent-0/(单斜杠)→ 落 location / →
return 302 /agent-0// → try_files 在 alias 下找不到 → 死循环。
sso/ultra 不受影响(nginx.conf 硬编码 /sso/,不走 __BASE__ 占位符)。

双重修复:
1. values.yaml agent-0/edge-0 webBasePath 去尾斜杠(对齐 add-node.sh 约定)
2. monorepo agent/edge Dockerfile 加 BASE=${BASE%/} 兜底(已在 submodule
   90657c0 推送),即使 values 误配带斜杠也不会再死循环

验证:sh 模拟 5 种 VITE_BASE_PATH 输入全部渲染单斜杠 location /agent-0/。
2026-06-26 12:24:54 +08:00
ximenchuifeng 38e0275d81 fix(chart): pgadmin 邮箱改用 example.com(.local 被新版拒绝)
新版 dpage/pgadmin4(latest)用更严格的 email-validator,拒绝
mixingx.local 这种保留 TLD 域名,启动校验失败 Exit 1 → CrashLoop。
改用 example.com(IANA 保留示例域名,校验通过)。

邮箱纯属 pgadmin 登录占位,不影响业务。
2026-06-26 10:28:23 +08:00
ximenchuifeng 92027fc81c fix(chart): .NET 后端 probe 改极致保守值 + submodule 指针
_backend.tpl probe 原值(liveness delay=15 period=30,无 timeout/fail)
走 K8s 默认 timeout=1s fail=3,约 45s 即杀,.NET 冷启动连库常超时。

改为极致保守:
- liveness: delay=120 timeout=15 period=30 fail=12 → 480s 才杀
- readiness: delay=60 timeout=10 period=30 fail=8 → 300s 才标 NotReady

影响 sso/agent-0/edge-0/ultra/gateway 共 5 个 .NET 服务。
helm template 验证:5 个 livenessProbe 全带上新值,无渲染错误。

同步更新 mixingx.edge submodule 指针(opcua Dockerfile ENTRYPOINT 修正)。
2026-06-26 08:28:25 +08:00
ximenchuifeng 8ffc6ee825 feat(chart): instances/standalones 改 range 循环 + 全部镜像加时区
== helm chart 标准化 ==
- instances/standalones: 写死文件 → range 循环(加/删点位只改 values)
- values 加 webName(显式前端名)+ description(Gateway 中文展示名)
- _backend.tpl: Service 加 mixingx.io/description annotation + 补 ultra serviceId
- _frontend.tpl/audit.yaml/mock.yaml: 注入 TZ env
- values 加 timezone 变量(部署地域可覆盖,默认 Asia/Shanghai)
- 修 app-ingress.yaml gatewayService/gatewayPort undefined bug
- 验证: helm diff 资源数一致(61=61),加 agent-beijing 点位 8 资源全部正确生成

== 12 个 Dockerfile 加时区 ==
后端(.NET debian): apt-get tzdata + ln /etc/localtime + ENV TZ
前端(nginx alpine): apk add tzdata
audit(node alpine): apk add tzdata
mock(opcua/s7): 同上
镜像内置 Asia/Shanghai 兜底 + helm TZ env 覆盖 = 双保险

== submodule Dockerfile 重写 ==
agent/edge/ultra: 重写适配 hub 根 context(含 ServiceDefaults 跨仓库引用)
sso/gateway: 加时区

== submodule 指针更新 ==
7 个 submodule 指针全部更新
2026-06-25 10:37:52 +08:00
ximenchuifeng f69c4161b5 feat: CI/CD 全链路(Drone pipeline + Helm chart + Dockerfile)
重大变更:
- .drone.yml: 4 步 pipeline(submodule init → build 12 镜像 → helm deploy → verify)
- mixingx-chart/: 手写 Helm chart(模式 3,替代 aspire publish)
  - 独立 postgres(每服务一个,不再共享)
  - 四胞胎架构(agent/edge: 后端+前端+DB podAffinity 同节点)
  - pgAdmin(在 K3s 内,管理所有 postgres)
  - Aspire Dashboard(OTLP 遥测接收端)
- Dockerfile: 全部服务已补齐(含 gateway/audit 新增)
- apphost.cs: opcua mock publish 模式改 AddDockerfile
- patch-persistence.sh: emptyDir → PVC patch(备用)

submodule 指针更新:
- mixingx.sso: Dockerfile 精准 COPY
- mixingx.edge: opcua Dockerfile 新增
- eau.ultra: MigrateAsync 无条件执行
- mixingx.audit: Dockerfile 新增
- mixingx.gateway: Dockerfile 新增

镜像 tag 规则: {分支}-{时间戳}-[{tag}]
2026-06-24 18:06:37 +08:00