Compare commits

..
Author SHA1 Message Date
drone dcc948188b release: bump chart version to v1.0.97 2026-11-10 08:26:38 +00:00
drone 78b9b9db15 release: bump chart version to v1.0.96 2026-11-10 08:24:27 +00:00
薛佳帆 2df3373304 release: bump chart version to v1.0.95 2026-11-10 16:23:26 +08:00
薛佳帆 9b002c6491 fix(postgres): 全部 postgres StatefulSet 三件套修复——绕过镜像内 gosu 直跑 + 特权容器
根因:官方 postgres:17 镜像(2026-08 构建)内 gosu 在新内核(Ubuntu 26.04 kernel 7.0.0-39+)上
用户态死循环,容器假活(Running 但 5432 无服务、PGDATA 空、零日志);绕过 gosu 后 PG17 恢复期
signal checkpoint 再遇权限死循环,故三件缺一不可:
- pod securityContext: runAsUser/runAsGroup/fsGroup=999(以 postgres 用户直跑,跳过 gosu)
- container command: docker-entrypoint.sh postgres(非 root 下 entrypoint 自动跳过 gosu)
- container securityContext: privileged(否则恢复期 'could not signal for checkpoint: Permission denied')

涉及 5 个模板:sso/ultra/audit(audit-db)/platform(audit)/agent-unit 各自内嵌的 postgres。
同内容已提交 develop 分支 407aef8;实测:xjf1641(Xeon+kernel43)与 wytest(i5+kernel42)
原始定义必死、打补丁后稳定;kernel 7.0.0-38 老机暂未触发但不免疫,升级内核前必须先吃本修复。
2026-11-10 16:21:57 +08:00
drone 6df5affe17 release: bump chart version to v1.0.94 2026-11-10 07:58:36 +00:00
drone bf915935ea release: bump chart version to v1.0.93 2026-11-10 07:42:51 +00:00
drone 6734c2022b release: bump chart version to v1.0.92 2026-11-10 07:05:56 +00:00
drone 60356c55aa release: bump chart version to v1.0.90 2026-11-03 02:07:13 +00:00
drone 68bccfc092 release: bump chart version to v1.0.89 2026-11-03 01:54:41 +00:00
薛佳帆 e031d656a0 release: bump chart version to v1.0.88 2026-10-30 03:45:53 +00:00
薛佳帆 347180d77b release: bump chart version to v1.0.87 2026-10-30 03:42:15 +00:00
王野 9fdb306601 release: bump chart version to v1.0.86 2026-10-28 07:40:28 +00:00
王野 c3e295494d release: bump chart version to v1.0.85 2026-10-28 02:22:28 +00:00
liulingyun 17a186a9df merge: origin/master(v1.0.84) → master(errorRetentionMonths 同步主线) 2026-10-27 14:32:48 +08:00
薛佳帆 321b602905 release: bump chart version to v1.0.84 2026-10-27 06:24:59 +00:00
liulingyun a1da3f4e42 feat(audit): audit chart 新增 errorRetentionMonths——错误流水独立保留期透传
(openspec 变更 edge-agent-error-audit-retention;配套后端 AUDIT_ERROR_RETENTION_MONTHS)

- values.yaml: audit.errorRetentionMonths 默认 3(操作流水 retentionMonths=6 不变)
- templates/audit.yaml: deployment 透传 AUDIT_ERROR_RETENTION_MONTHS

注: 版本号 bump 随发布流程另行执行。
2026-10-26 15:39:36 +08:00
薛佳帆 8733595824 release: bump chart version to v1.0.83 2026-10-26 05:29:55 +00:00
薛佳帆 ff5ecf710e release: bump chart version to v1.0.82 2026-10-23 01:18:36 +00:00
薛佳帆 c2b78f8ff0 release: bump chart version to v1.0.81 2026-10-23 01:17:47 +00:00
薛佳帆 b0e1dcd4f0 release: bump chart version to v1.0.80 2026-10-23 00:57:04 +00:00
薛佳帆 e7f4b71cd0 release: bump chart version to v1.0.79 2026-10-22 05:10:33 +00:00
薛佳帆 4bcf4fe0a3 release: bump chart version to v1.0.78 2026-10-22 02:44:25 +00:00
薛佳帆 33de837556 release: bump chart version to v1.0.77 2026-10-22 01:36:57 +00:00
薛佳帆 b1d65fab30 release: bump chart version to v1.0.76 2026-10-22 01:35:03 +00:00
王野 25a9385751 release: bump chart version to v1.0.75 2026-10-16 09:00:53 +00:00
王野 0c8effe321 release: bump chart version to v1.0.74 2026-10-16 06:44:35 +00:00
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
薛佳帆 133c032144 release: bump chart version to v1.0.68 2026-10-13 05:46:43 +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
王野 3345c257c4 release: bump chart version to v1.0.64 2026-10-11 08:49:15 +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
王野 d0c054acc8 release: bump chart version to v1.0.56 2026-10-10 01:35:02 +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
王野 673ac6aa6f release: bump chart version to v1.0.51 2026-09-30 07:26:06 +00:00
薛佳帆 7bd4d58a6d release: bump chart version to v1.0.50 2026-09-29 11:19:27 +00: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
薛佳帆 60c8b4d90e release: bump chart version to v1.0.48 2026-09-29 05:37:56 +00:00
薛佳帆 22fd52f20f release: bump chart version to v1.0.47 2026-09-29 03:08:53 +00:00
薛佳帆 7d1bc2d90c release: bump chart version to v1.0.46 2026-09-29 02:33:26 +00:00
薛佳帆 ada89158fa release: bump chart version to v1.0.45 2026-09-29 02:32:30 +00:00
薛佳帆 c3f27ee62b Revert "feat(agent-unit): 特征值预警 Redis 近端窗口开关 env(FeatureValueWarningCache__*,AgentUnit 默认取单元名)"
This reverts commit b8659270e6.
2026-09-29 09:24:43 +08:00
薛佳帆 b8659270e6 feat(agent-unit): 特征值预警 Redis 近端窗口开关 env(FeatureValueWarningCache__*,AgentUnit 默认取单元名) 2026-09-29 09:06:59 +08:00
王野 bd0f20af0b release: bump chart version to v1.0.44 2026-09-28 07:11:28 +00:00
王野 ef0e2b5ce1 release: bump chart version to v1.0.43 2026-09-28 05:44:36 +00: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
薛佳帆 c698fe14cc release: bump chart version to v1.0.38 2026-09-23 07:15:32 +00:00
薛佳帆 ee378168c0 release: bump chart version to v1.0.37 2026-09-23 01:56:11 +00:00
薛佳帆 41ccb587a9 release: bump chart version to v1.0.36 2026-09-23 01:55:39 +00:00
王野 84ddff1776 release: bump chart version to v1.0.35 2026-09-22 01:47:43 +00:00
王野 02583981cb release: bump chart version to v1.0.34 2026-09-22 01:46:49 +00:00
薛佳帆 bfec34fc70 release: bump chart version to v1.0.33 2026-09-21 11:32:03 +00:00
薛佳帆 b42271b704 release: bump chart version to v1.0.32 2026-09-21 11:30:49 +00:00
王野 3decc0f1a2 release: bump chart version to v1.0.31 2026-09-21 08:49:40 +00:00
王野 3bc2c6a1b4 release: bump chart version to v1.0.30 2026-09-21 06:35:25 +00:00
王野 1632267279 release: bump chart version to v1.0.29 2026-09-21 06:32:55 +00:00
薛佳帆 51123401a1 release: bump chart version to v1.0.28 2026-09-20 08:28:10 +00:00
王野 04e0105b91 release: bump chart version to v1.0.27 2026-09-20 02:37:24 +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
薛佳帆 e5bf7090b4 release: bump chart version to v1.0.24 2026-09-17 09:00:20 +00:00
ximenchuifeng 943b045cad release: bump chart version to v1.0.23 2026-09-15 10:51:15 +00:00
薛佳帆 e988974374 release: bump chart version to v1.0.22 2026-09-15 09:54:26 +00:00
ximenchuifeng 224afb71f1 release: bump chart version to v1.0.21 2026-09-15 09:36:52 +00:00
王野 981be3e23f release: bump chart version to v1.0.20 2026-09-15 08:01:20 +00:00
薛佳帆 4613388d0c chore: 删除 provision/rollback-host 迁移脚本——主机已全面由 NM 托管且 networkd 已 mask,迁移工具不再需要;rollback 依赖 networkd 接管原配置,mask 状态下执行反而会导致接口失联 2026-09-15 10:09:17 +08: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
薛佳帆 b6c35f28e3 feat(network-agent): headless Service 打 mixingx.io/role=node-id 标签 —— 纳入 Gateway K8s 服务发现,生成 /api/network/** 透传路由;注释说明前端弹窗改经 Gateway 同源转发 2026-09-14 14:37:08 +08:00
mx-ops d4b84bb886 fix(network-agent): daemonset 补渲染 imagePullSecrets
ACR 私仓交付后 DaemonSet 无拉取凭据,匿名拉取报 insufficient_scope。
对齐其余 10 个 chart 的标准写法,消费 _common/registry.yaml 提供的 imagePullSecrets。
2026-09-10 08:43:57 +00:00
薛佳帆 05a476d932 feat: provision 写入 NM keep-configuration=no——禁止开机收编 initramfs(dracut 遗留 DHCP)抢配的连接,强制按 autoconnect-priority 选路激活静态档案;initrd 的 DHCP 租约以副地址共存(双 IP:静态主+DHCP 副兜底);rollback 对称移除 2026-09-10 16:21:42 +08:00
薛佳帆 9035f9eb96 release: bump chart version to v1.0.17 2026-09-10 08:02:26 +00:00
薛佳帆 869754606e release: bump chart version to v1.0.16 2026-09-10 08:01:59 +00:00
薛佳帆 405eef034a feat(network-agent): 挂载宿主机状态目录 /var/lib/mixingx/network-agent(DirectoryOrCreate)——网卡别名 aliases.json 持久化,节点重启/Pod 重建均保留;chart 1.0.16 2026-09-10 09:47:34 +08:00
王野 9b3a61eb49 release: bump chart version to v1.0.15 2026-09-08 11:25:07 +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
王野 6707dbe28f release: bump chart version to v1.0.11 2026-09-08 10:57:34 +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
王野 34e108dbbc release: bump chart version to v1.0.8 2026-09-08 10:05:38 +00:00
薛佳帆 4395e900e9 refactor(network-agent): 移除 NET_ADMIN capability 与 nm-run 挂载——agent 已无 ip addr del 等网络写操作(切静态清残留动态地址逻辑删除,networkd 将在宿主机 mask),特权动作全部经 D-Bus 由主机 NM 执行;/run/NetworkManager 源码未使用一并移除;chart 1.0.7 2026-09-08 16:20:53 +08:00
ximenchuifeng 0aea949b49 release: bump chart version to v1.0.7 2026-09-08 08:07:59 +00:00
王野 798735a0a8 release: bump chart version to v1.0.6 2026-09-08 07:16:08 +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
薛佳帆 352aa78a8f Merge branch 'develop/v.1.0.1' 2026-09-07 15:48:19 +08:00
薛佳帆 e5f1ba44c8 Merge branch 'develop/v.1.0.1' 2026-09-07 09:40:13 +08:00
王野 4e517797e1 feat(mixingx-agent-unit): 简化PostgreSQL配置并移除角色预置逻辑
- 将PostgreSQL配置简化为单一用户名和密码模式,移除了管理员用户和应用用户的分离机制
- 移除了复杂的PostgreSQL角色预置SQL文件和相关的initContainer逻辑
- 直接通过连接字符串设置idle_in_transaction_session_timeout参数
- 更新版本号从1.0.2到1.0.3
- 移除了对预创建PostgreSQL凭证Secret的依赖
2026-09-05 15:18:59 +08:00
王野 5bc1b52721 Merge branch 'develop/v.1.0.1'
# Conflicts:
#	release-charts/mixingx-agent-unit/Chart.yaml
#	release-charts/mixingx-agent-unit/templates/unit.yaml
2026-09-04 22:37:59 +08:00
薛佳帆 90d8838e15 Merge branch 'develop/v.1.0.1' 2026-09-04 17:24:13 +08:00
薛佳帆 2e7d079f65 Merge branch 'develop/v.1.0.1' 2026-09-04 15:39:35 +08: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
65 changed files with 623 additions and 621 deletions

No files matched your search

+2 -20
View File
@@ -27,32 +27,14 @@
CI 只对 `release-charts/` 做 lint/template(见 hub `.drone.yml`): CI 只对 `release-charts/` 做 lint/template(见 hub `.drone.yml`):
```bash ```bash
helm lint release-charts/mixingx-edge-unit \ helm lint release-charts/mixingx-edge-unit
--set global.imageRegistry=registry.invalid/mixingx \ helm template ci-edge release-charts/mixingx-edge-unit
--set images.edge.tag=ci \
--set images.edgeWeb.tag=ci
helm template ci-edge release-charts/mixingx-edge-unit \
--set global.imageRegistry=registry.invalid/mixingx \
--set images.edge.tag=ci \
--set images.edgeWeb.tag=ci
``` ```
### ArgoCD 部署 ### ArgoCD 部署
`mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。 `mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。
## 镜像地址约定
所有部署到 K3s 的运行镜像统一按下面的结构拼接:
```text
<global.imageRegistry>/<images.*.repository>:<images.*.tag>
```
`global.imageRegistry` 必须由 `mixingx-deploy` 的环境 values 提供,Chart 不保存 AL ACR、Harbor、内网 IP 或公网镜像仓库地址。业务镜像和 PostgreSQL、Redis、RabbitMQ、MongoDB、NanoMQ 等基础镜像遵守同一规则。
生产环境必须传入明确且不可变的 tag,不使用 `latest`。AL ACR 与现场 Harbor 必须保持相同的 repository/tag,只切换 `global.imageRegistry`。
## 关联文档 ## 关联文档
- hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南 - hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南
+23
View File
@@ -0,0 +1,23 @@
# 交付镜像清单(Delivery Image Manifest)— ADR-0066
#
# 用途:release 前核对 ACR 上第三方镜像齐备(发布流水线 Step 2 读取,缺失即 fail fast)。
# 规则:
# - acr 路径统一收进 library/*(显式引用不依赖上游路径对齐)
# - pushed: false = 尚未推到 ACR 的缺口,release 前必须补推(cr_temp_user 临时 token 手工作业)
# - optional: true = 客户默认不部署,缺了不阻塞
#
# 业务镜像(mixingx/*)不在本清单:它们由发布流水线从交付基线 retag 产出,天然齐备。
thirdParty:
# ── 平台核心依赖(缺一不可) ──
- { upstream: docker.io/library/postgres:17, acr: library/postgres:17, pushed: true }
- { upstream: docker.io/library/redis:8.6, acr: library/redis:8.6, pushed: true }
- { upstream: docker.io/library/rabbitmq:4.3-management, acr: library/rabbitmq:4.3-management, pushed: true }
# ── edge 单元 + audit broker 硬依赖 ──
- { upstream: docker.io/emqx/nanomq:0.25.2-2, acr: library/nanomq:0.25.2-2, pushed: true } # D2 已补推(2026-08-22)
# ── 工具类(现场无组件直接依赖,备查;tag 以 ACR 实存为准,2026-08-22 盘点) ──
- { upstream: docker.io/library/busybox:1.36, acr: library/busybox:1.36, pushed: true, optional: true }
- { upstream: docker.io/library/alpine:3.19, acr: library/alpine:3.19, pushed: true, optional: true }
# ── 可选(客户默认不部署) ──
- { upstream: docker.io/emqx/mqttx-web:latest, acr: library/mqttx-web:latest, pushed: true, optional: true } # mxlexus 已部署(2026-08-22)
- { upstream: docker.io/library/mongo:7.0, acr: library/mongo:7.0, pushed: true, optional: true } # v2 audit 已去 mongo,存量备用
+1
View File
@@ -10,6 +10,7 @@ This directory contains the release-oriented charts for Phase 1 ownership split:
- `mixingx-edge-unit`: one edge site release. - `mixingx-edge-unit`: one edge site release.
- `mixingx-agent-unit`: one agent site release. - `mixingx-agent-unit`: one agent site release.
- `mixingx-protocol-server-unit`: one protocol mock server instance. - `mixingx-protocol-server-unit`: one protocol mock server instance.
- `mixingx-codeserver`: browser VS Code test IDE (code-server, plugins bundled in image).
- `mixingx-platform`: **legacy** central-services chart, kept for compatibility during migration. - `mixingx-platform`: **legacy** central-services chart, kept for compatibility during migration.
The chart at the repository root is kept as a legacy all-in-one chart during migration. The chart at the repository root is kept as a legacy all-in-one chart during migration.
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-agent-unit name: mixingx-agent-unit
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL." description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
type: application type: application
version: 0.1.1 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
+5 -7
View File
@@ -6,12 +6,11 @@ Deploys one agent site as one Helm release:
- `agent-web-<site>` frontend - `agent-web-<site>` frontend
- `agent-<site>-postgres` StatefulSet and retained PVC - `agent-<site>-postgres` StatefulSet and retained PVC
The release requires a pre-created PostgreSQL credentials Secret. By default its Agent PostgreSQL sessions set `idle_in_transaction_session_timeout` through the
name is `agent-<site>-postgres-credentials`; the required keys are connection string. The default is `60s`, configurable with
`admin-password`, `app-password`, and `connection-string`. The Agent connection `sharedInfra.postgres.idleInTransactionSessionTimeout`. This is a database-side
string must use `sharedInfra.postgres.appUsername`, while the init container uses safety net for leaked idle transactions and does not change database users,
the administrator credential only to idempotently provision the non-superuser passwords, roles, or the PostgreSQL StatefulSet credential model.
application role and its database-local idle transaction timeout.
Example: Example:
@@ -21,6 +20,5 @@ helm upgrade --install mixingx-agent-workshop-a ./charts/mixingx-agent-unit \
--set site=workshop-a \ --set site=workshop-a \
--set nodeName=agent-node-01 \ --set nodeName=agent-node-01 \
--set storage.className=longhorn \ --set storage.className=longhorn \
--set sharedInfra.postgres.appUsername=agent_workshop_a \
--set tag=2026.07.02-abc1234 --set tag=2026.07.02-abc1234
``` ```
@@ -1,99 +0,0 @@
\set ON_ERROR_STOP on
\getenv agent_username AGENT_DB_USERNAME
\getenv agent_password AGENT_DB_PASSWORD
\getenv database_name POSTGRESQL_DATABASENAME
\getenv idle_timeout IDLE_IN_TRANSACTION_SESSION_TIMEOUT
SELECT format(
'CREATE ROLE %I LOGIN PASSWORD %L NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS',
:'agent_username',
:'agent_password')
WHERE NOT EXISTS (
SELECT 1
FROM pg_roles
WHERE rolname = :'agent_username')
\gexec
SELECT format(
'ALTER ROLE %I WITH LOGIN PASSWORD %L NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS',
:'agent_username',
:'agent_password')
\gexec
SELECT format('GRANT CONNECT ON DATABASE %I TO %I', :'database_name', :'agent_username')
\gexec
SELECT format('ALTER DATABASE %I OWNER TO %I', :'database_name', :'agent_username')
\gexec
SELECT format('ALTER SCHEMA public OWNER TO %I', :'agent_username')
\gexec
SELECT format('GRANT ALL ON SCHEMA public TO %I', :'agent_username')
\gexec
-- Existing installations may have objects created by the former postgres application login.
-- Transfer only user objects in public; extension-owned objects remain with their extension owner.
SELECT format(
'ALTER %s %I.%I OWNER TO %I',
CASE c.relkind
WHEN 'r' THEN 'TABLE'
WHEN 'p' THEN 'TABLE'
WHEN 'S' THEN 'SEQUENCE'
WHEN 'v' THEN 'VIEW'
WHEN 'm' THEN 'MATERIALIZED VIEW'
WHEN 'f' THEN 'FOREIGN TABLE'
END,
n.nspname,
c.relname,
:'agent_username')
FROM pg_class c
JOIN pg_namespace n ON n.oid = c.relnamespace
WHERE n.nspname = 'public'
AND c.relkind IN ('r', 'p', 'S', 'v', 'm', 'f')
AND pg_get_userbyid(c.relowner) <> :'agent_username'
AND NOT EXISTS (
SELECT 1
FROM pg_depend d
WHERE d.classid = 'pg_class'::regclass
AND d.objid = c.oid
AND d.deptype = 'e')
\gexec
SELECT format(
'ALTER %s %I.%I(%s) OWNER TO %I',
CASE p.prokind
WHEN 'p' THEN 'PROCEDURE'
ELSE 'FUNCTION'
END,
n.nspname,
p.proname,
pg_get_function_identity_arguments(p.oid),
:'agent_username')
FROM pg_proc p
JOIN pg_namespace n ON n.oid = p.pronamespace
WHERE n.nspname = 'public'
AND p.prokind IN ('f', 'p', 'w')
AND pg_get_userbyid(p.proowner) <> :'agent_username'
AND NOT EXISTS (
SELECT 1
FROM pg_depend d
WHERE d.classid = 'pg_proc'::regclass
AND d.objid = p.oid
AND d.deptype = 'e')
\gexec
SELECT format(
'ALTER ROLE %I IN DATABASE %I SET idle_in_transaction_session_timeout TO %L',
:'agent_username',
:'database_name',
:'idle_timeout')
\gexec
-- Startup migrations run as the database owner. Keep active migration and maintenance work
-- unbounded here; only idle transactions receive the safety timeout.
SELECT format('ALTER ROLE %I IN DATABASE %I RESET statement_timeout', :'agent_username', :'database_name')
\gexec
SELECT format('ALTER ROLE %I IN DATABASE %I RESET lock_timeout', :'agent_username', :'database_name')
\gexec
@@ -14,21 +14,10 @@
{{- .Values.serviceId | default (include "mixingx-unit.name" .) -}} {{- .Values.serviceId | default (include "mixingx-unit.name" .) -}}
{{- end -}} {{- end -}}
{{- define "mixingx-unit.postgresCredentialsSecretName" -}}
{{- .Values.sharedInfra.postgres.credentialsSecret.name | default (printf "%s-postgres-credentials" (include "mixingx-unit.name" .)) -}}
{{- end -}}
{{- define "mixingx-unit.basePath" -}} {{- define "mixingx-unit.basePath" -}}
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}} {{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
{{- end -}} {{- end -}}
{{- define "mixingx-agent-unit.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-unit.storageClassName" -}} {{- define "mixingx-unit.storageClassName" -}}
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
@@ -70,8 +59,7 @@ REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}"
REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}" REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}"
POSTGRESQL_HOST: "{{ $pgHost }}" POSTGRESQL_HOST: "{{ $pgHost }}"
POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}" POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}"
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.appUsername }}" POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.username }}"
POSTGRESQL_DATABASENAME: "{{ include "mixingx-unit.database" . }}"
MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}" MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}"
MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}"
MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}"
@@ -1,12 +0,0 @@
{{- $name := include "mixingx-unit.name" . -}}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $name }}-postgres-role-provisioning
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: {{ $name }}-postgres
data:
provision-agent-role.sql: |
{{ .Files.Get "files/provision-agent-role.sql" | nindent 4 }}
@@ -4,7 +4,6 @@
{{- $serviceId := include "mixingx-unit.serviceId" . -}} {{- $serviceId := include "mixingx-unit.serviceId" . -}}
{{- $basePath := include "mixingx-unit.basePath" . -}} {{- $basePath := include "mixingx-unit.basePath" . -}}
{{- $pgHost := printf "%s-postgres-service" $name -}} {{- $pgHost := printf "%s-postgres-service" $name -}}
{{- $pgCredentialsSecretName := include "mixingx-unit.postgresCredentialsSecretName" . -}}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
@@ -25,65 +24,20 @@ spec:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
annotations: annotations:
checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }} checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }}
checksum/postgres-role-sql: {{ .Files.Get "files/provision-agent-role.sql" | sha256sum }}
spec: spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }} {{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
initContainers: {{- with $.Values.imagePullSecrets }}
- name: provision-postgres-role imagePullSecrets:
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }} {{- toYaml . | nindent 8 }}
imagePullPolicy: IfNotPresent {{- end }}
command: ["/bin/sh", "-ec"]
args:
- |
attempt=0
until pg_isready --host="$POSTGRESQL_HOST" --port="$POSTGRESQL_PORT" --username="$POSTGRES_ADMIN_USERNAME" --dbname="$POSTGRESQL_DATABASENAME"; do
attempt=$((attempt + 1))
if [ "$attempt" -ge 60 ]; then
echo "PostgreSQL did not become ready within 120 seconds" >&2
exit 1
fi
sleep 2
done
exec psql \
--host="$POSTGRESQL_HOST" \
--port="$POSTGRESQL_PORT" \
--username="$POSTGRES_ADMIN_USERNAME" \
--dbname="$POSTGRESQL_DATABASENAME" \
--file=/opt/mixingx/postgres/provision-agent-role.sql
env:
- name: POSTGRESQL_HOST
value: "{{ $pgHost }}"
- name: POSTGRESQL_PORT
value: "{{ .Values.sharedInfra.postgres.port }}"
- name: POSTGRESQL_DATABASENAME
value: "{{ $database }}"
- name: POSTGRES_ADMIN_USERNAME
value: "{{ .Values.sharedInfra.postgres.adminUsername }}"
- name: AGENT_DB_USERNAME
value: "{{ .Values.sharedInfra.postgres.appUsername }}"
- name: IDLE_IN_TRANSACTION_SESSION_TIMEOUT
value: "{{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}"
- name: PGPASSWORD
valueFrom:
secretKeyRef:
name: {{ $pgCredentialsSecretName }}
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
- name: AGENT_DB_PASSWORD
valueFrom:
secretKeyRef:
name: {{ $pgCredentialsSecretName }}
key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }}
volumeMounts:
- name: postgres-role-provisioning
mountPath: /opt/mixingx/postgres
readOnly: true
containers: containers:
- name: {{ $name }} - name: {{ $name }}
image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.agent) | quote }} {{ $backendImg := .Values.images.backend }}
{{ $agentImg := .Values.images.agent | default dict }}
{{ $backendRepo := $agentImg.repository | default $backendImg.repository }}
{{ $backendTag := $agentImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext:
appArmorProfile:
type: Unconfined
ports: ports:
- name: http - name: http
containerPort: {{ .Values.ports.backend }} containerPort: {{ .Values.ports.backend }}
@@ -96,16 +50,6 @@ spec:
env: env:
- name: TZ - name: TZ
value: "{{ .Values.timezone | default "Asia/Shanghai" }}" value: "{{ .Values.timezone | default "Asia/Shanghai" }}"
- name: ConnectionStrings__PostgreSQL
valueFrom:
secretKeyRef:
name: {{ $pgCredentialsSecretName }}
key: {{ .Values.sharedInfra.postgres.credentialsSecret.connectionStringKey }}
- name: POSTGRESQL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ $pgCredentialsSecretName }}
key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /health path: /health
@@ -122,10 +66,6 @@ spec:
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 10 timeoutSeconds: 10
failureThreshold: 8 failureThreshold: 8
volumes:
- name: postgres-role-provisioning
configMap:
name: {{ $name }}-postgres-role-provisioning
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@@ -163,6 +103,10 @@ stringData:
ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}" ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}"
REDIS_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 }}" REDIS_URI: "redis://:{{ .Values.sharedInfra.redis.password }}@{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }}"
ConnectionStrings__PostgreSQL: "Host={{ $pgHost }};Port={{ .Values.sharedInfra.postgres.port }};Username={{ .Values.sharedInfra.postgres.username }};Password={{ .Values.sharedInfra.postgres.password }};Database={{ $database }};Options=-c idle_in_transaction_session_timeout={{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}"
POSTGRESQL_PASSWORD: "{{ .Values.sharedInfra.postgres.password }}"
POSTGRESQL_URI: "postgresql://{{ .Values.sharedInfra.postgres.username }}:{{ .Values.sharedInfra.postgres.password }}@{{ $pgHost }}:{{ .Values.sharedInfra.postgres.port }}/{{ $database }}"
POSTGRESQL_DATABASENAME: "{{ $database }}"
ConnectionStrings__messaging: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.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_PASSWORD: "{{ .Values.sharedInfra.rabbitmq.password }}"
MESSAGING_URI: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}" MESSAGING_URI: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}"
@@ -190,9 +134,17 @@ spec:
app.kubernetes.io/component: {{ $webName }} app.kubernetes.io/component: {{ $webName }}
spec: spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $webName }} - name: {{ $webName }}
image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.agentWeb) | quote }} {{ $frontendImg := .Values.images.frontend }}
{{ $agentWebImg := .Values.images.agentWeb | default dict }}
{{ $frontendRepo := $agentWebImg.repository | default $frontendImg.repository }}
{{ $frontendTag := $agentWebImg.tag | default $frontendImg.tag | default .Values.tag | default "latest" }}
image: {{ .Values.registry }}/{{ $frontendRepo }}:{{ $frontendTag }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -256,8 +208,12 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环, # postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
# 见 ADR/工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可) # 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
securityContext: securityContext:
runAsUser: 999 runAsUser: 999
runAsGroup: 999 runAsGroup: 999
@@ -267,18 +223,15 @@ spec:
command: ["docker-entrypoint.sh", "postgres"] command: ["docker-entrypoint.sh", "postgres"]
securityContext: securityContext:
privileged: true privileged: true
image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.postgres) | quote }} image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
valueFrom: value: "{{ .Values.sharedInfra.postgres.password }}"
secretKeyRef:
name: {{ $pgCredentialsSecretName }}
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
- name: POSTGRES_DB - name: POSTGRES_DB
value: "{{ $database }}" value: "{{ $database }}"
- name: POSTGRES_USER - name: POSTGRES_USER
value: "{{ .Values.sharedInfra.postgres.adminUsername }}" value: "{{ .Values.sharedInfra.postgres.username }}"
- name: PGDATA - name: PGDATA
value: /var/lib/postgresql/data/pgdata value: /var/lib/postgresql/data/pgdata
ports: ports:
+18 -14
View File
@@ -1,7 +1,9 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
role: agent role: agent
site: "0" site: "0"
@@ -11,9 +13,17 @@ phaseType: "" # 工序类型(对应 apphost 的 AGENT_PHASE_TYPE,如 DieC
database: "" database: ""
images: images:
agent: { repository: agent, tag: "" } backend:
agentWeb: { repository: agent-web, tag: "" } repository: agent
postgres: { repository: postgres, tag: "17" } tag: ""
frontend:
repository: agent-web
tag: ""
postgres:
repository: docker.io/library/postgres
tag: "17"
agent: {}
agentWeb: {}
ports: ports:
backend: 8080 backend: 8080
@@ -35,16 +45,10 @@ sharedInfra:
host: ultra-service host: ultra-service
port: 8080 port: 8080
postgres: postgres:
adminUsername: postgres username: postgres
appUsername: agent_runtime password: "Admin12345"
port: 5432 port: 5432
idleInTransactionSessionTimeout: 60s idleInTransactionSessionTimeout: 60s
credentialsSecret:
# Leave empty to use <role>-<site>-postgres-credentials.
name: ""
adminPasswordKey: admin-password
appPasswordKey: app-password
connectionStringKey: connection-string
redis: redis:
host: redis-service host: redis-service
port: 6379 port: 6379
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-audit name: mixingx-audit
description: MixingX audit service. description: MixingX audit service.
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -2,13 +2,6 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-audit.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-audit.tierAffinity" -}} {{- define "mixingx-audit.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -32,8 +32,12 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环, # postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
# 见 ADR/工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可) # 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
securityContext: securityContext:
runAsUser: 999 runAsUser: 999
runAsGroup: 999 runAsGroup: 999
@@ -43,7 +47,7 @@ spec:
command: ["docker-entrypoint.sh", "postgres"] command: ["docker-entrypoint.sh", "postgres"]
securityContext: securityContext:
privileged: true privileged: true
image: {{ include "mixingx-audit.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
@@ -22,9 +22,13 @@ spec:
app.kubernetes.io/component: audit-nanomq app.kubernetes.io/component: audit-nanomq
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: nanomq - name: nanomq
image: {{ include "mixingx-audit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.nanomq) | quote }} image: {{ .Values.audit.mqtt.image | default "emqx/nanomq:0.25.2-2" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["/bin/sh"] command: ["/bin/sh"]
args: args:
@@ -20,9 +20,13 @@ spec:
app.kubernetes.io/component: audit-web app.kubernetes.io/component: audit-web
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: audit-web - name: audit-web
image: {{ include "mixingx-audit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.auditWeb) | quote }} image: "{{ .Values.registry }}/{{ .Values.images.auditWeb.repository | default "audit-web" }}:{{ .Values.images.auditWeb.tag | default .Values.tag | default "latest" }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -19,9 +19,13 @@ spec:
app.kubernetes.io/component: audit app.kubernetes.io/component: audit
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: audit - name: audit
image: {{ include "mixingx-audit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.audit) | quote }} image: "{{ .Values.registry }}/{{ .Values.images.audit.repository | default "audit" }}:{{ .Values.images.audit.tag | default .Values.tag | default "latest" }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -42,9 +46,12 @@ spec:
key: AUDIT_PG_URI key: AUDIT_PG_URI
- name: AUDIT_PG_TIMEZONE - name: AUDIT_PG_TIMEZONE
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}" value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
# 数据保留月数(按自然月清理分区) # 数据保留月数(按自然月清理分区;operations 表)
- name: AUDIT_RETENTION_MONTHS - name: AUDIT_RETENTION_MONTHS
value: "{{ .Values.audit.retentionMonths | default 6 }}" value: "{{ .Values.audit.retentionMonths | default 6 }}"
# 错误流水独立保留月数(errors 表,分表独立清除)
- name: AUDIT_ERROR_RETENTION_MONTHS
value: "{{ .Values.audit.errorRetentionMonths | default 3 }}"
# MQTT broker # MQTT broker
- name: AUDIT_MQTT_BROKER_URL - name: AUDIT_MQTT_BROKER_URL
value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}" value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}"
+16 -8
View File
@@ -1,13 +1,16 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -21,13 +24,16 @@ audit:
replicas: 2 replicas: 2
database: audit-db database: audit-db
pgStorage: 5Gi pgStorage: 5Gi
# 数据保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS) # 操作流水(audit_operations)保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS)
retentionMonths: 6 retentionMonths: 6
# 错误流水(audit_errors)独立保留月数(后端 AUDIT_ERROR_RETENTION_MONTHS,2026-10-26 裁决:分表独立)
errorRetentionMonths: 3
# JWT 鉴权:后端通过 SSO /api/sso/users/info 间接校验 token,这里配置 SSO base URL # JWT 鉴权:后端通过 SSO /api/sso/users/info 间接校验 token,这里配置 SSO base URL
jwt: jwt:
ssoBaseUrl: "http://sso-service:8080" ssoBaseUrl: "http://sso-service:8080"
# 中心 Audit Broker(ADR-0048)与 audit 专属 PostgreSQL 随本 chart 发布(ADR-0065) # 中心 Audit Broker(ADR-0048)与 audit 专属 PostgreSQL 随本 chart 发布(ADR-0065)
mqtt: mqtt:
image: "emqx/nanomq:0.25.2-2"
brokerHost: "audit-nanomq-service" brokerHost: "audit-nanomq-service"
brokerPort: 1883 brokerPort: 1883
managementPort: 8081 managementPort: 8081
@@ -41,10 +47,12 @@ audit:
concurrency: 4 concurrency: 4
images: images:
audit: { repository: audit, tag: "" } audit:
auditWeb: { repository: audit-web, tag: "" } repository: audit
postgres: { repository: postgres, tag: "17" } tag: ""
nanomq: { repository: nanomq, tag: "0.25.2-2" } auditWeb:
repository: audit-web
tag: ""
tier: tier:
enabled: false enabled: false
@@ -0,0 +1,6 @@
apiVersion: v2
name: mixingx-codeserver
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
type: application
version: 1.0.97
appVersion: "1.0.97"
@@ -0,0 +1,12 @@
# mixingx-codeserver
浏览器版 VS Code 测试 IDE(code-server),供各环境在浏览器里临时查看/排查代码。
预装插件随镜像(mixingx/codeserver,mxcicd 构建,基镜像 coder/code-server:4.139.1 锁版):
GitLens 19.2.0 / EditorConfig 0.18.2 / Prettier 12.4.0 / C#(muhammad-sammy 分支 2.145.21,linux-x64)/
.NET Runtime 3.2.0 / OPC UA Browser 1.2.4(微软市场 side-load,MIT)。
- 登录:密码认证,密码在各环境 values `codeserver.password`(明文,家规同 postgres/redis)。
- 持久化:工作区 `/home/coder/project` 落 PVC `<name>-data`(`storage.keep=true`,卸载不回收);
插件/设置烧在镜像层(不落盘,升级镜像即整体更新)。
- 入口:traefik ingress(`*.mixingx.local` DNS 环境),无 DNS 现场改 NodePort(参考 mqttx 注释)。
- 注意:单副本 + RWO 盘,Deployment 策略 Recreate;traefik 原生支持 WebSocket,无需额外注解。
@@ -0,0 +1,13 @@
{{/*
组件名(默认 codeserver,可被 values 覆盖)。
*/}}
{{- define "mixingx-codeserver.name" -}}
{{- .Values.codeserver.name | default "codeserver" -}}
{{- end -}}
{{/*
Secret 数据(登录密码);Deployment 用它的 sha256 做滚动重启锚点。
*/}}
{{- define "mixingx-codeserver.secretData" -}}
PASSWORD: {{ .Values.codeserver.password | default "changeme" | quote }}
{{- end -}}
@@ -0,0 +1,127 @@
{{- $root := . }}
{{- $name := include "mixingx-codeserver.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ $name }}-secrets
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
type: Opaque
stringData:
{{- include "mixingx-codeserver.secretData" . | nindent 2 }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ $name }}-data
{{- if .Values.storage.keep }}
annotations:
helm.sh/resource-policy: keep
{{- end }}
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
spec:
accessModes:
- ReadWriteOnce
storageClassName: {{ .Values.storage.className | default "local-path" }}
resources:
requests:
storage: {{ .Values.storage.size | default "5Gi" }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $name }}-deployment
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
spec:
# RWO 工作区数据盘 + 单副本:滚动更新会新旧 Pod 争盘,必须 Recreate
strategy:
type: Recreate
replicas: {{ .Values.codeserver.replicas | default 1 }}
selector:
matchLabels:
app.kubernetes.io/component: {{ $name }}
template:
metadata:
labels:
app.kubernetes.io/component: {{ $name }}
annotations:
# 密码变更 → 校验和变化 → 滚动重启生效
checksum/secret: {{ include "mixingx-codeserver.secretData" . | sha256sum }}
spec:
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
securityContext:
# 镜像内置用户 coder(uid/gid 1000);fsGroup 使 local-path 数据盘归属 coder
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
containers:
- name: {{ $name }}
image: "{{ .Values.codeserver.image.repository }}:{{ .Values.codeserver.image.tag | default "latest" }}"
imagePullPolicy: IfNotPresent
args:
- --auth=password
- --bind-addr=0.0.0.0:8080
- /home/coder/project
ports:
- name: http
containerPort: 8080
protocol: TCP
env:
- name: TZ
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
envFrom:
- secretRef:
name: {{ $name }}-secrets
volumeMounts:
- name: data
mountPath: /home/coder/project
resources:
{{- toYaml .Values.resources | nindent 12 }}
# code-server 未认证 GET / 返回 302(跳登录页),httpGet 判活有歧义,统一 TCP 探针
livenessProbe:
tcpSocket:
port: http
initialDelaySeconds: 15
periodSeconds: 30
readinessProbe:
tcpSocket:
port: http
initialDelaySeconds: 5
periodSeconds: 10
volumes:
- name: data
persistentVolumeClaim:
claimName: {{ $name }}-data
---
apiVersion: v1
kind: Service
metadata:
name: {{ $name }}-service
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/component: {{ $name }}
mixingx.io/role: codeserver
mixingx.io/node-id: {{ $name }}
annotations:
mixingx.io/description: {{ .Values.codeserver.description | quote }}
spec:
type: ClusterIP
selector:
app.kubernetes.io/component: {{ $name }}
ports:
- name: http
port: 80
targetPort: http
protocol: TCP
@@ -0,0 +1,25 @@
{{- $name := include "mixingx-codeserver.name" . }}
{{- if .Values.ingress.enabled }}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $name }}-ingress
annotations:
{{- range $k, $v := .Values.ingress.annotations }}
{{ $k }}: {{ $v | quote }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.className }}
rules:
- host: {{ .Values.ingress.host }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ $name }}-service
port:
number: 80
{{- end }}
@@ -0,0 +1,40 @@
# code-server(web VS Code)测试版:预装插件随镜像(GitLens/EditorConfig/Prettier/C# 分支/OPC UA Browser)。
# 用途:各环境浏览器内 IDE,临时查看/排查代码;不是开发主力环境。
# 镜像:mixingx/codeserver(mxcicd 构建,基镜像 coder/code-server:4.139.1 锁版,不走 image-version.yaml 的 images 机制)。
# 密码:values 明文(家规同 postgres/redis);登录 http://<ingress host>。
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-66 编号见各仓引用);内网留空=匿名拉取,行为不变
imagePullSecrets: []
codeserver:
name: codeserver
replicas: 1
image:
repository: 192.168.1.119:8888/mixingx/codeserver
tag: v0.1.0
description: "浏览器版 VS Code(测试)"
# 登录密码(各环境 values 必须覆盖;changeme 仅保证 helm template 默认值可渲染)
password: "changeme"
storage:
# 工作区(/home/coder/project)数据盘;keep=true 时 helm uninstall/down 不回收
className: local-path
size: 5Gi
keep: true
resources:
requests:
memory: 512Mi
cpu: 200m
limits:
memory: 2Gi
cpu: "2"
ingress:
enabled: true
className: traefik
host: codeserver.mixingx.local
annotations:
traefik.ingress.kubernetes.io/router.entrypoints: web
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-edge-unit name: mixingx-edge-unit
description: "One MixingX edge unit release with durable local revision storage." description: "One MixingX edge unit release with durable local revision storage."
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
+21 -1
View File
@@ -14,5 +14,25 @@ helm upgrade --install mixingx-edge-workshop-a ./charts/mixingx-edge-unit \
--set site=workshop-a \ --set site=workshop-a \
--set nodeName=edge-node-01 \ --set nodeName=edge-node-01 \
--set storage.className=longhorn \ --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`(仅值非空时注入)。
@@ -43,13 +43,6 @@ AuditMqttPublisher__NodeId: "{{ .Values.audit.publisher.nodeId | default $name }
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}} {{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
{{- end -}} {{- end -}}
{{- define "mixingx-edge-unit.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-unit.storageClassName" -}} {{- define "mixingx-unit.storageClassName" -}}
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
@@ -23,9 +23,13 @@ spec:
app.kubernetes.io/component: {{ $brokerName }} app.kubernetes.io/component: {{ $brokerName }}
spec: spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }} {{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: nanomq - name: nanomq
image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.nanomq) | quote }} image: "{{ .Values.mqtt.image.repository }}:{{ .Values.mqtt.image.tag }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: mqtt - name: mqtt
@@ -3,6 +3,10 @@
{{- $serviceId := include "mixingx-unit.serviceId" . -}} {{- $serviceId := include "mixingx-unit.serviceId" . -}}
{{- $basePath := include "mixingx-unit.basePath" . -}} {{- $basePath := include "mixingx-unit.basePath" . -}}
{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}} {{- $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 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
@@ -55,13 +59,18 @@ spec:
secret: secret:
secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }} secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }}
{{- end }} {{- end }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - name: {{ $name }}
image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.edge) | quote }} {{ $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 imagePullPolicy: IfNotPresent
securityContext:
appArmorProfile:
type: Unconfined
ports: ports:
- name: http - name: http
containerPort: {{ .Values.ports.backend }} containerPort: {{ .Values.ports.backend }}
@@ -82,6 +91,21 @@ spec:
value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }} value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }}
- name: EdgeSecrets__Root - name: EdgeSecrets__Root
value: {{ .Values.edgeSecrets.root | quote }} 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: volumeMounts:
- name: edge-data - name: edge-data
mountPath: /var/lib/mixingx-edge mountPath: /var/lib/mixingx-edge
@@ -166,9 +190,17 @@ spec:
app.kubernetes.io/component: {{ $webName }} app.kubernetes.io/component: {{ $webName }}
spec: spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $webName }} - name: {{ $webName }}
image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.edgeWeb) | quote }} {{ $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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
+26 -6
View File
@@ -1,7 +1,9 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
role: edge role: edge
site: "0" site: "0"
@@ -10,9 +12,14 @@ serviceId: ""
idWorkerId: 17 idWorkerId: 17
images: images:
edge: { repository: edge, tag: "" } backend:
edgeWeb: { repository: edge-web, tag: "" } repository: edge
nanomq: { repository: nanomq, tag: "0.25.2-2" } tag: ""
frontend:
repository: edge-web
tag: ""
edge: {}
edgeWeb: {}
ports: ports:
backend: 8080 backend: 8080
@@ -34,6 +41,16 @@ edgeSecrets:
nodeName: "" nodeName: ""
nodeSelector: {} 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。 # Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。
# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 # enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。
# instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。 # instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。
@@ -58,6 +75,9 @@ sharedInfra:
mqtt: mqtt:
enabled: true enabled: true
image:
repository: emqx/nanomq
tag: 0.25.2-2
port: 1883 port: 1883
wsPort: 8083 # WebSocket listener(NanoMQ 镜像默认开启,路径 /mqtt),供 MQTTX Web 连接 wsPort: 8083 # WebSocket listener(NanoMQ 镜像默认开启,路径 /mqtt),供 MQTTX Web 连接
credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-gateway name: mixingx-gateway
description: MixingX gateway service, RBAC, and root ingress. description: MixingX gateway service, RBAC, and root ingress.
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -2,13 +2,6 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-gateway.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-gateway.tierAffinity" -}} {{- define "mixingx-gateway.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -26,13 +26,14 @@ spec:
serviceAccountName: gateway-sa serviceAccountName: gateway-sa
{{- end }} {{- end }}
{{ include "mixingx-gateway.tierAffinity" (dict "role" "gateway" "root" $) | nindent 6 }} {{ include "mixingx-gateway.tierAffinity" (dict "role" "gateway" "root" $) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: gateway - name: gateway
image: {{ include "mixingx-gateway.image" (dict "registry" .Values.global.imageRegistry "image" $gatewayImage) | quote }} image: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext:
appArmorProfile:
type: Unconfined
ports: ports:
- name: http - name: http
containerPort: {{ .Values.gateway.port | default 8080 }} containerPort: {{ .Values.gateway.port | default 8080 }}
@@ -9,7 +9,9 @@ metadata:
spec: spec:
ingressClassName: traefik ingressClassName: traefik
rules: rules:
- host: {{ .Values.ingress.domain }} - {{- if .Values.ingress.domain }}
host: {{ .Values.ingress.domain }}
{{- end }}
http: http:
paths: paths:
- path: / - path: /
+6 -3
View File
@@ -1,7 +1,9 @@
global: registry: 192.168.1.119:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage: storage:
className: local-path className: local-path
@@ -32,6 +34,7 @@ gateway:
ingress: ingress:
enabled: true enabled: true
# domain 留空 = 渲染不带 host 的规则,现场 PC 可直接用节点 IP 访问(如 http://192.168.137.117/)
domain: app.mixingx.local domain: app.mixingx.local
gatewayService: gateway-service gatewayService: gateway-service
gatewayPort: 8080 gatewayPort: 8080
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-infra name: mixingx-infra
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ). description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -2,13 +2,6 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-infra.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-infra.tierAffinity" -}} {{- define "mixingx-infra.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -31,10 +31,13 @@ spec:
app.kubernetes.io/component: {{ .name }} app.kubernetes.io/component: {{ .name }}
spec: spec:
{{ include "mixingx-infra.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }} {{ include "mixingx-infra.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - name: {{ .name }}
{{ $image := index $root.Values.images .image }} image: {{ .image }}
image: {{ include "mixingx-infra.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: tcp - name: tcp
+9 -12
View File
@@ -1,13 +1,16 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -36,25 +39,19 @@ tier:
services: services:
sharedDatastores: { mode: required, tiers: [infra] } sharedDatastores: { mode: required, tiers: [infra] }
images:
postgres: { repository: postgres, tag: "17" }
redis: { repository: redis, tag: "8.6" }
mongo: { repository: mongo, tag: "8.3" }
rabbitmq: { repository: rabbitmq, tag: "4.3-management" }
sharedDatastores: sharedDatastores:
- name: redis - name: redis
image: redis image: docker.io/library/redis:8.6
port: 6379 port: 6379
storage: 2Gi storage: 2Gi
mountPath: /data mountPath: /data
- name: mongo - name: mongo
image: mongo image: docker.io/library/mongo:8.3
port: 27017 port: 27017
storage: 5Gi storage: 5Gi
mountPath: /data/db mountPath: /data/db
- name: messaging - name: messaging
image: rabbitmq image: docker.io/library/rabbitmq:4.3-management
port: 5672 port: 5672
storage: 2Gi storage: 2Gi
mountPath: /var/lib/rabbitmq mountPath: /var/lib/rabbitmq
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-mqttx name: mixingx-mqttx
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。 description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -4,10 +4,3 @@
{{- define "mixingx-mqttx.name" -}} {{- define "mixingx-mqttx.name" -}}
{{- .Values.mqttx.name | default "mqttx" -}} {{- .Values.mqttx.name | default "mqttx" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-mqttx.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
@@ -19,9 +19,13 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
spec: spec:
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - name: {{ $name }}
image: {{ include "mixingx-mqttx.image" (dict "registry" .Values.global.imageRegistry "image" .Values.mqttx.image) | quote }} image: "{{ .Values.mqttx.image.repository }}:{{ .Values.mqttx.image.tag | default "latest" }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
# emqx/mqttx-web 镜像默认 http-server 未显式绑 0.0.0.0,导致只听 loopback、 # emqx/mqttx-web 镜像默认 http-server 未显式绑 0.0.0.0,导致只听 loopback、
# Service/Pod IP 进不来。显式覆盖启动参数,强制监听所有接口。 # Service/Pod IP 进不来。显式覆盖启动参数,强制监听所有接口。
+5 -5
View File
@@ -9,17 +9,17 @@
# #
# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。 # Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。
global:
imageRegistry: ""
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
mqttx: mqttx:
name: mqttx name: mqttx
replicas: 1 replicas: 1
image: image:
repository: mqttx-web repository: emqx/mqttx-web
tag: "" tag: latest
description: "MQTT 监控客户端" description: "MQTT 监控客户端"
ingress: ingress:
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-network-agent name: mixingx-network-agent
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。" description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -29,6 +29,10 @@ spec:
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: network-agent - name: network-agent
image: {{ .Values.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }} image: {{ .Values.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}
@@ -51,13 +55,10 @@ spec:
- name: K3S_RESTART_ON_IP_CHANGE - name: K3S_RESTART_ON_IP_CHANGE
value: {{ .Values.k3sRestartOnIpChange | quote }} value: {{ .Values.k3sRestartOnIpChange | quote }}
securityContext: securityContext:
# 只需 root + D-Bus socket,无需 privileged # 只需 root + D-Bus socket,无需 privileged 与额外 capability:
# NET_ADMIN: 清除切换静态后残留的动态地址(ip addr del 需要此能力) # nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行
runAsUser: 0 runAsUser: 0
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
add:
- NET_ADMIN
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/network/health path: /api/network/health
@@ -80,15 +81,15 @@ spec:
# 主机 system bus: nmcli 与 systemd 重启都走它 # 主机 system bus: nmcli 与 systemd 重启都走它
- name: dbus - name: dbus
mountPath: /run/dbus/system_bus_socket mountPath: /run/dbus/system_bus_socket
- name: nm-run # 网卡别名持久化: aliases.json 落宿主机,重启/重建 Pod 均保留
mountPath: /run/NetworkManager - name: alias-store
readOnly: true mountPath: /var/lib/mixingx/network-agent
volumes: volumes:
- name: dbus - name: dbus
hostPath: hostPath:
path: /run/dbus/system_bus_socket path: /run/dbus/system_bus_socket
type: Socket type: Socket
- name: nm-run - name: alias-store
hostPath: hostPath:
path: /run/NetworkManager path: /var/lib/mixingx/network-agent
type: DirectoryOrCreate type: DirectoryOrCreate
@@ -1,6 +1,8 @@
# Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。 # Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。
# 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问 # 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问
# (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。 # (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。
# mixingx.io/role 标签让 Gateway 发现该服务并生成 /api/network/** 透传路由,
# 前端网络设置弹窗经 Gateway 同源转发访问(消除跨域)。
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@@ -8,6 +10,8 @@ metadata:
labels: labels:
app.kubernetes.io/name: mixingx app.kubernetes.io/name: mixingx
app.kubernetes.io/component: network-agent app.kubernetes.io/component: network-agent
mixingx.io/role: network-agent
mixingx.io/node-id: network-agent
spec: spec:
clusterIP: None clusterIP: None
selector: selector:
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-platform name: mixingx-platform
description: MixingX central platform services without customer edge/agent instances. description: MixingX central platform services without customer edge/agent instances.
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -2,13 +2,6 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-platform.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-platform.tierAffinity" -}} {{- define "mixingx-platform.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -25,14 +25,14 @@ spec:
serviceAccountName: gateway-sa serviceAccountName: gateway-sa
{{- end }} {{- end }}
{{ include "mixingx-platform.tierAffinity" (dict "role" .role "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .role "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - name: {{ .name }}
{{ $image := index $root.Values.images .image }} image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext:
appArmorProfile:
type: Unconfined
ports: ports:
- name: http - name: http
containerPort: {{ $port }} containerPort: {{ $port }}
@@ -160,10 +160,13 @@ spec:
app.kubernetes.io/component: {{ .name }} app.kubernetes.io/component: {{ .name }}
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - name: {{ .name }}
{{ $image := index $root.Values.images .image }} image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -229,9 +232,13 @@ spec:
app.kubernetes.io/component: {{ .name }}-postgres app.kubernetes.io/component: {{ .name }}-postgres
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - name: postgres
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
@@ -20,10 +20,13 @@ spec:
app.kubernetes.io/component: audit app.kubernetes.io/component: audit
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: audit - name: audit
{{ $auditImage := index .Values.images .Values.audit.image }} image: "{{ .Values.registry }}/{{ .Values.audit.image }}:{{ .Values.tag | default "latest" }}"
image: {{ include "mixingx-platform.image" (dict "registry" .Values.global.imageRegistry "image" $auditImage) | quote }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -142,10 +145,13 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.webName }} app.kubernetes.io/component: {{ .Values.audit.webName }}
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .Values.audit.webName }} - name: {{ .Values.audit.webName }}
{{ $auditWebImage := index .Values.images .Values.audit.webImage }} image: "{{ .Values.registry }}/{{ .Values.audit.webImage }}:{{ .Values.tag | default "latest" }}"
image: {{ include "mixingx-platform.image" (dict "registry" .Values.global.imageRegistry "image" $auditWebImage) | quote }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -208,8 +214,12 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环, # postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
# 见 ADR/工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可) # 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
securityContext: securityContext:
runAsUser: 999 runAsUser: 999
runAsGroup: 999 runAsGroup: 999
@@ -219,7 +229,7 @@ spec:
command: ["docker-entrypoint.sh", "postgres"] command: ["docker-entrypoint.sh", "postgres"]
securityContext: securityContext:
privileged: true privileged: true
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
@@ -31,10 +31,13 @@ spec:
app.kubernetes.io/component: {{ .name }} app.kubernetes.io/component: {{ .name }}
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - name: {{ .name }}
{{ $image := index $root.Values.images .image }} image: {{ .image }}
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: tcp - name: tcp
+13 -24
View File
@@ -1,13 +1,16 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -40,26 +43,12 @@ tier:
audit: { mode: required, tiers: [infra] } audit: { mode: required, tiers: [infra] }
sharedDatastores: { mode: required, tiers: [infra] } sharedDatastores: { mode: required, tiers: [infra] }
images:
gateway: { repository: gateway, tag: "" }
sso: { repository: sso, tag: "" }
ssoWeb: { repository: sso-web, tag: "" }
ultra: { repository: ultra, tag: "" }
ultraWeb: { repository: ultra-web, tag: "" }
audit: { repository: audit, tag: "" }
auditWeb: { repository: audit-web, tag: "" }
postgres: { repository: postgres, tag: "17" }
redis: { repository: redis, tag: "8.6" }
mongo: { repository: mongo, tag: "8.3" }
rabbitmq: { repository: rabbitmq, tag: "4.3-management" }
nanomq: { repository: nanomq, tag: "0.25.2-2" }
standalones: standalones:
- name: sso - name: sso
image: sso image: sso
role: sso role: sso
webName: sso-web webName: sso-web
webImage: ssoWeb webImage: sso-web
webBasePath: /sso/ webBasePath: /sso/
serviceId: sso serviceId: sso
database: sso-db database: sso-db
@@ -71,7 +60,7 @@ standalones:
image: ultra image: ultra
role: ultra role: ultra
webName: ultra-web webName: ultra-web
webImage: ultraWeb webImage: ultra-web
webBasePath: /ultra/ webBasePath: /ultra/
serviceId: ultra serviceId: ultra
database: ultra-db database: ultra-db
@@ -91,7 +80,7 @@ audit:
port: 5900 port: 5900
replicas: 2 replicas: 2
webName: audit-web webName: audit-web
webImage: auditWeb webImage: audit-web
webBasePath: /audit/ webBasePath: /audit/
webPort: 8900 webPort: 8900
database: audit-db database: audit-db
@@ -110,22 +99,22 @@ audit:
sharedDatastores: sharedDatastores:
- name: redis - name: redis
image: redis image: docker.io/library/redis:8.6
port: 6379 port: 6379
storage: 2Gi storage: 2Gi
mountPath: /data mountPath: /data
- name: mongo - name: mongo
image: mongo image: docker.io/library/mongo:8.3
port: 27017 port: 27017
storage: 5Gi storage: 5Gi
mountPath: /data/db mountPath: /data/db
- name: messaging - name: messaging
image: rabbitmq image: docker.io/library/rabbitmq:4.3-management
port: 5672 port: 5672
storage: 2Gi storage: 2Gi
mountPath: /var/lib/rabbitmq mountPath: /var/lib/rabbitmq
- name: audit-nanomq - name: audit-nanomq
image: nanomq image: emqx/nanomq:0.25.2-2
port: 1883 port: 1883
storage: 1Gi storage: 1Gi
mountPath: /var/lib/nanomq mountPath: /var/lib/nanomq
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-protocol-server-unit name: mixingx-protocol-server-unit
description: Deploy one MixingX edge protocol test server instance. description: Deploy one MixingX edge protocol test server instance.
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.0" appVersion: "1.0.97"
@@ -1,6 +0,0 @@
{{- define "mixingx-protocol-server-unit.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
@@ -24,9 +24,13 @@ spec:
{{ toYaml . | nindent 8 }} {{ toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- $proto := index .Values.images.protocol .Values.type }} {{- $proto := index .Values.images.protocol .Values.type }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: protocol-server - name: protocol-server
image: {{ include "mixingx-protocol-server-unit.image" (dict "registry" .Values.global.imageRegistry "image" $proto) | quote }} image: {{ .Values.registry }}/{{ $proto.repository | default .Values.image }}:{{ $proto.tag | default .Values.tag | default "latest" }}
imagePullPolicy: {{ .Values.imagePullPolicy }} imagePullPolicy: {{ .Values.imagePullPolicy }}
args: args:
- "--port" - "--port"
@@ -1,7 +1,9 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
# Legacy image override (kept for backward compatibility). # Legacy image override (kept for backward compatibility).
type: opcua type: opcua
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-sso name: mixingx-sso
description: MixingX SSO standalone release (backend, web, and PostgreSQL). description: MixingX SSO standalone release (backend, web, and PostgreSQL).
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -2,13 +2,6 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-sso.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-sso.configData" -}} {{- define "mixingx-sso.configData" -}}
{{- $root := . -}} {{- $root := . -}}
{{- $name := $root.Values.sso.name -}} {{- $name := $root.Values.sso.name -}}
+16 -7
View File
@@ -28,13 +28,14 @@ spec:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
spec: spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - name: {{ $name }}
image: {{ include "mixingx-sso.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.sso) | quote }} image: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext:
appArmorProfile:
type: Unconfined
ports: ports:
- name: http - name: http
containerPort: {{ $backendPort }} containerPort: {{ $backendPort }}
@@ -129,9 +130,13 @@ spec:
app.kubernetes.io/component: {{ $webName }} app.kubernetes.io/component: {{ $webName }}
spec: spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" "web" "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" "web" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $webName }} - name: {{ $webName }}
image: {{ include "mixingx-sso.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.ssoWeb) | quote }} image: {{ $root.Values.registry }}/{{ $root.Values.images.ssoWeb.repository | default "sso-web" }}:{{ $root.Values.images.ssoWeb.tag | default $root.Values.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -193,8 +198,12 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环, # postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
# 见 ADR/工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可) # 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
securityContext: securityContext:
runAsUser: 999 runAsUser: 999
runAsGroup: 999 runAsGroup: 999
@@ -204,7 +213,7 @@ spec:
command: ["docker-entrypoint.sh", "postgres"] command: ["docker-entrypoint.sh", "postgres"]
securityContext: securityContext:
privileged: true privileged: true
image: {{ include "mixingx-sso.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
+12 -6
View File
@@ -1,13 +1,16 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -42,6 +45,9 @@ audit:
brokerUrl: "mqtt://audit-nanomq-service:1883" brokerUrl: "mqtt://audit-nanomq-service:1883"
images: images:
sso: { repository: sso, tag: "" } sso:
ssoWeb: { repository: sso-web, tag: "" } repository: sso
postgres: { repository: postgres, tag: "17" } tag: ""
ssoWeb:
repository: sso-web
tag: ""
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-ultra name: mixingx-ultra
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL." description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
type: application type: application
version: 0.1.0 version: 1.0.97
appVersion: "1.0.1" appVersion: "1.0.97"
@@ -2,13 +2,6 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
{{- define "mixingx-ultra.image" -}}
{{- $registry := required "global.imageRegistry is required" .registry -}}
{{- $repository := required "image.repository is required" .image.repository -}}
{{- $tag := required "image.tag is required" .image.tag -}}
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
{{- end -}}
{{- define "mixingx-ultra.configData" -}} {{- define "mixingx-ultra.configData" -}}
{{- $root := . -}} {{- $root := . -}}
{{- $cfg := $root.Values.ultra -}} {{- $cfg := $root.Values.ultra -}}
@@ -33,13 +33,14 @@ spec:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
spec: spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - name: {{ $name }}
image: {{ include "mixingx-ultra.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.ultra) | quote }} image: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext:
appArmorProfile:
type: Unconfined
ports: ports:
- name: http - name: http
containerPort: {{ $port }} containerPort: {{ $port }}
@@ -132,9 +133,13 @@ spec:
app.kubernetes.io/component: {{ $name }}-web app.kubernetes.io/component: {{ $name }}-web
spec: spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }}-web - name: {{ $name }}-web
image: {{ include "mixingx-ultra.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.ultraWeb) | quote }} image: {{ $root.Values.registry }}/{{ $root.Values.images.ultraWeb.repository | default "ultra-web" }}:{{ $root.Values.images.ultraWeb.tag | default $root.Values.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -196,8 +201,12 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环, # postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
# 见 ADR/工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可) # 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
securityContext: securityContext:
runAsUser: 999 runAsUser: 999
runAsGroup: 999 runAsGroup: 999
@@ -207,7 +216,7 @@ spec:
command: ["docker-entrypoint.sh", "postgres"] command: ["docker-entrypoint.sh", "postgres"]
securityContext: securityContext:
privileged: true privileged: true
image: {{ include "mixingx-ultra.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
+12 -6
View File
@@ -1,13 +1,16 @@
global: registry: 192.168.1.105:8888/mixingx
imageRegistry: "" tag: latest
timezone: Asia/Shanghai timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -25,9 +28,12 @@ sharedInfra:
protocol: grpc protocol: grpc
images: images:
ultra: { repository: ultra, tag: "" } ultra:
ultraWeb: { repository: ultra-web, tag: "" } repository: ultra
postgres: { repository: postgres, tag: "17" } tag: ""
ultraWeb:
repository: ultra-web
tag: ""
ultra: ultra:
name: ultra name: ultra
-112
View File
@@ -1,112 +0,0 @@
#!/usr/bin/env bash
# ============================================================================
# provision-host.sh — MixingX network-agent 主机初始化 (Ubuntu Server 20.04+)
#
# 职责(幂等,可重复执行):
# 1. 安装并启动 NetworkManager(服务器版默认未装)
# 2. 读取主网口当前网络参数,预创建等值静态 NM 连接(切换前后地址不变,不断网)
# 3. 创建低优先级 DHCP 救援连接(静态配错时的主机侧兜底)
# 4. 禁用 cloud-init 网络管理,netplan renderer 切换为 NetworkManager
# 5. rfkill 解锁无线网卡
# 6. 安装 polkit 放行规则(容器内 root 调用 NM/systemd D-Bus)
#
# 用法: sudo bash provision-host.sh
# 回滚: sudo bash rollback-host.sh
# 备份: /var/backups/mixingx-netconsole/
# ============================================================================
set -euo pipefail
BACKUP_DIR=/var/backups/mixingx-netconsole
log() { echo -e "\033[32m[mixingx]\033[0m $*"; }
die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; }
[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0"
command -v ip >/dev/null 2>&1 || die "缺少 ip 命令"
mkdir -p "$BACKUP_DIR"
# ── 1. 安装 NetworkManager ────────────────────────────────────────────────
if ! command -v nmcli >/dev/null 2>&1; then
log "安装 NetworkManager ..."
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get install -y -qq network-manager
fi
# 关闭 NM 自动建连(未配置网卡自动 DHCP),避免与现有 networkd 抢接口
mkdir -p /etc/NetworkManager/conf.d
cat > /etc/NetworkManager/conf.d/99-mixingx.conf <<'EOF'
[main]
no-auto-default=*
EOF
systemctl enable --now NetworkManager >/dev/null 2>&1 || true
# ── 2. 识别主网口并读取当前参数 ───────────────────────────────────────────
PRIMARY_IF=$(ip -4 route show default | awk '{print $5; exit}')
[[ -n "${PRIMARY_IF:-}" ]] || die "未找到默认路由网卡(主机当前无网络?)"
PRIMARY_TYPE=$(ip link show "$PRIMARY_IF" | grep -o 'link/[a-z]*' | head -1)
CUR_ADDR=$(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2; exit}') # x.x.x.x/前缀
CUR_GW=$(ip -4 route show default | awk '{print $3; exit}')
CUR_DNS4=$(grep -h '^nameserver' /run/systemd/resolve/resolv.conf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf 2>/dev/null \
| awk '{print $2}' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -u | tr '\n' ' ')
log "主网口 $PRIMARY_IF 当前: 地址=$CUR_ADDR 网关=$CUR_GW DNS4=${CUR_DNS4:-<无>}"
# ── 3. 救援连接(仅以太网主口;WiFi 主口跳过——救援 DHCP 对 WiFi 无意义) ────
if [[ "$PRIMARY_TYPE" == "ethernet"* ]]; then
if ! nmcli connection show "rescue-dhcp" >/dev/null 2>&1; then
log "创建救援 DHCP 连接 rescue-dhcp (autoconnect-priority -100)"
nmcli connection add type ethernet ifname "$PRIMARY_IF" con-name "rescue-dhcp" \
ipv4.method auto \
connection.autoconnect yes \
connection.autoconnect-priority -100 >/dev/null
fi
fi
# ── 4. 全局切换 netplan renderer → NetworkManager ────────────────────────
# 不删除原 netplan 配置(ethernet/wifi 定义、SSID/PSK 原样保留),
# netplan 会把原有连接定义自动渲染为等值的 NM profiles,无缝接管
if [[ ! -f /etc/netplan/90-mixingx-nm.yaml ]]; then
log "备份原 netplan 配置 → $BACKUP_DIR/netplan/"
mkdir -p "$BACKUP_DIR/netplan"
cp -a /etc/netplan/*.yaml "$BACKUP_DIR/netplan/" 2>/dev/null || true
log "禁用 cloud-init 网络管理"
mkdir -p /etc/cloud/cloud.cfg.d
echo "network: {config: disabled}" > /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
log "写入全局 renderer=NetworkManager"
cat > /etc/netplan/90-mixingx-nm.yaml <<'EOF'
network:
version: 2
renderer: NetworkManager
EOF
chmod 600 /etc/netplan/90-mixingx-nm.yaml
fi
log "应用 netplan (交给 NetworkManager 托管)..."
netplan apply
# ── 5. 无线解锁 + polkit 放行 ─────────────────────────────────────────────
rfkill unblock all 2>/dev/null || true
if command -v pkexec >/dev/null 2>&1 || dpkg -s policykit-1 >/dev/null 2>&1; then
mkdir -p /etc/polkit-1/localauthority/50-local.d
cat > /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla <<'EOF'
[MixingX Network Agent]
Identity=unix-user:root
Action=org.freedesktop.NetworkManager.*;org.freedesktop.systemd1.*
ResultAny=yes
ResultInactive=yes
ResultActive=yes
EOF
fi
# ── 6. 校验 ───────────────────────────────────────────────────────────────
sleep 3
log "当前设备状态:"
nmcli -g DEVICE,TYPE,STATE,CONNECTION device status
log "主网口地址: $(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2}')"
log "完成。后续用 k3s 弹窗或 nmcli 管理;回滚执行 rollback-host.sh"
-48
View File
@@ -1,48 +0,0 @@
#!/usr/bin/env bash
# ============================================================================
# rollback-host.sh — provision-host.sh 的反向操作
#
# 职责:
# 1. 恢复原 netplan 配置(从 /var/backups/mixingx-netconsole/netplan/)
# 2. 恢复 cloud-init 网络管理
# 3. 停用 NetworkManager 托管(服务禁用,连接配置保留)
# 4. 移除 polkit 放行规则
#
# 用法: sudo bash rollback-host.sh
# ============================================================================
set -euo pipefail
BACKUP_DIR=/var/backups/mixingx-netconsole
log() { echo -e "\033[32m[mixingx]\033[0m $*"; }
die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; }
[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0"
# ── 1. 恢复 netplan ───────────────────────────────────────────────────────
if [[ -d "$BACKUP_DIR/netplan" ]] && ls "$BACKUP_DIR/netplan"/*.yaml >/dev/null 2>&1; then
log "恢复备份的 netplan 配置"
rm -f /etc/netplan/90-mixingx-nm.yaml
cp -a "$BACKUP_DIR/netplan"/*.yaml /etc/netplan/
else
log "无备份,仅移除 NM renderer 配置(回退到 renderer 默认)"
rm -f /etc/netplan/90-mixingx-nm.yaml
fi
# ── 2. 恢复 cloud-init 网络管理 ───────────────────────────────────────────
rm -f /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
log "应用恢复的 netplan ..."
netplan apply
# ── 3. 停用 NetworkManager ────────────────────────────────────────────────
log "停用并禁用 NetworkManager"
systemctl disable --now NetworkManager >/dev/null 2>&1 || true
# ── 4. 移除 polkit 规则 / NM 覆盖配置 ─────────────────────────────────────
rm -f /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla
rm -f /etc/NetworkManager/conf.d/99-mixingx.conf
sleep 3
ip -4 addr show | awk '/inet /{print " " $2 " @ " $NF}'
log "回滚完成。NM 连接配置保留在 /etc/NetworkManager/system-connections/ (可手工清理)"