ximenchuifeng
154fd35331
merge: feat/plan-mapping——PLAN 动态映射并入(与 pin-component 组件路径共存)
...
冲突解决:promote.sh prepare 条目循环组件分支前置;pin 步组件段(1.6)与
valuesFiles 服务段(1.5)共存;组件 pin-acr 维持算正式发布(与门户 hasDeliver 同语义)。
合并版演练 4 用例通过:wifi+组件混合 / wifi deliver / 六服务缺省回归 / sso deliver+wifi pin-acr。
2026-09-08 14:55:46 +08:00
ximenchuifeng
d06612cb2f
Merge branch 'feat/pin-component'
2026-09-08 14:53:09 +08:00
ximenchuifeng
6450d3084c
feat(ci): PLAN 动态映射——条目自带 repos/keys/appFile/valuesFiles 即信任(格式校验),三张字典降级为缺省
...
- ADR-0075 加服务不改程序:门户登记映射(DB)随 PLAN 条目透传,promote 端信任执行
- valuesFiles 钉版新路径(独立 chart 服务如 wifi):替换客户 values 的 image.tag,
兼容整行 repo:tag / repository+tag 拆分 / image 块三形态
- keys 空 → 不动 image-version;appFile 空 → 不随统一 chart(独立 chart 自然编码)
- deliver 缺省 harborTag:有 keys 查 image-version,无 keys 查 demo 的 values 文件
- ALL → DEFAULT_SERVICES(缺省全量 deliver 名单);DB_CHANGE 按计划内服务校验
- 兼容:六服务不带映射回退字典;未知服务非 keep 拒绝、keep 放行(留痕)
- 演练:PROMOTE_DRY_RUN 双路径(wifi pin-acr 钉直推 tag / deliver retag 新版本)+
缺省全量回归,均在 /tmp 沙盒 GIT_CONFIG_GLOBAL 隔离下通过
2026-09-08 14:52:54 +08:00
ximenchuifeng
4fe73f88e7
chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202609080540-7 [skip ci]
2026-09-08 05:41:18 +00:00
ximenchuifeng
1e4ff720d1
fix(ci): 组件替换的旧 tag 剥引号(带引号写法如实入账)
2026-09-08 13:35:53 +08:00
ximenchuifeng
86b4aa0b27
feat(ci): 组件条目 valuesFiles 多文件——一个镜像散在多个 values 时一次全替换(如 postgres 在 4 个文件)
...
逐文件替换,客户目录没有的文件跳过并记录,全部未命中才 fail;
from 汇总各文件旧值(多数相同,不同则如实并列)。
2026-09-08 13:32:26 +08:00
ximenchuifeng
defe711ce6
feat(ci): promote.sh 支持系统组件条目——第三方镜像(postgres/redis/mqttx 等)随 PLAN 精确替换 values 里的 tag
...
PLAN 组件条目:{"component":true,"name":..,"acrTag":..,"valuesFile":..,"imageName":..}
- 登记制:映射随 PLAN 动态携带,流水线零改动即可认识新组件
- pin 精确替换客户 values 文件里该镜像的 tag,兼容整行(image: ...:tag)
与拆分(repository:+相邻 tag:)两种 values 形态
- 组件也算正式发布:分配版本号+chart bump;release-notes 如实记 from→to
- CHART_ONLY 与组件互斥(防御)
本地 PROMOTE_DRY_RUN 双形态演练通过(mqttx latest→v2.0.0 拆分态、
redis 8.6→8.7 整行态,mxlexus)
2026-09-08 13:13:29 +08:00
ximenchuifeng
ffbb985919
Merge branch 'feat/pin-acr'
2026-09-08 12:53:31 +08:00
ximenchuifeng
eb44c30dbb
fix(ci): pin-acr 也算正式发布——分配版本号并 bump chart(应用引用跟随),镜像仍钉所选 tag
...
此前 pin-acr 搭纯复用通路(无版本号、chart 不动);按门户语义修正:
选已有 tag 即一次正式发布,默认 auto-bump(+1)可指定,chart 仓 bump、
Application/平台文件引用跟随新 chart,镜像不搬运。
本地 PROMOTE_DRY_RUN 演练通过(mxlexus:v9.9.9,image my-tag-v2,
sso.yaml chart-v1.0.1 → chart-v9.9.9)
2026-09-08 12:41:29 +08:00
ximenchuifeng
8b4f3efa9f
feat(ci): promote.sh 支持 pin-acr —— 选 ACR 已有 tag 原样钉入客户目录
...
镜像搬运已剥离给门户「直推 ACR」(crane);发布侧新增 PLAN action pin-acr:
- PLAN: {"service":..,"action":"pin-acr","acrTag":"<ACR 已有 tag>"}
- 不进交付基线(不搬运不 retag),不触发版本号分配(搭纯复用通路)
- pin: image-version 钉所选 tag;chart targetRevision 保持不变(ArgoCD 由 values 变更 sync)
- release-notes/commit message 如实记 from→to 与 sourceTag
本地 PROMOTE_DRY_RUN 全链演练通过(mxlexus:sso v1.0.1 → probe-pin-acr-dryrun)
2026-09-08 11:29:37 +08:00
ximenchuifeng
b52a142361
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202609080325-15 [skip ci]
2026-09-08 03:25:52 +00:00
ximenchuifeng
4989e8e49d
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202609070932-13 [skip ci]
2026-09-07 09:32:47 +00:00
ximenchuifeng
b1eb05c7a6
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202609070844-12 [skip ci]
2026-09-07 08:45:19 +00:00
ximenchuifeng
f518d35ccd
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202608310641-11 [skip ci]
2026-08-31 06:42:44 +00:00
ximenchuifeng
af4dbf7266
chore(gitops): update sso image tags to develop-v.1.0.1-202608310638-45, publish db-scripts/sso/develop-v.1.0.1-202608310638-45.sql [skip ci]
2026-08-31 06:41:25 +00:00
ximenchuifeng
b1c7ff1ff4
chore(gitops): update sso image tags to develop-v.1.0.1-202608280736-44, publish db-scripts/sso/develop-v.1.0.1-202608280736-44.sql [skip ci]
2026-08-28 07:39:38 +00:00
ximenchuifeng
ff950d5065
chore(gitops): update sso image tags to develop-v.1.0.1-202608280622-43, publish db-scripts/sso/develop-v.1.0.1-202608280622-43.sql [skip ci]
2026-08-28 06:24:42 +00:00
ximenchuifeng
de1fa958ef
chore(gitops): update sso image tags to develop-v.1.0.1-202608270652-42, publish db-scripts/sso/develop-v.1.0.1-202608270652-42.sql [skip ci]
2026-08-27 06:53:46 +00:00
ximenchuifeng
bb908560be
docs(runbooks): add first-install guidance to db-change runbook
2026-08-27 14:37:51 +08:00
ximenchuifeng
56207aa5e1
feat(ci): promote.sh supports PLAN-based per-service partial delivery
...
Replace the all-or-nothing baseline with a per-service plan (PLAN JSON):
keep/reuse/deliver/ci-now per service pair (gateway/sso/ultra/audit/
agent/edge). Compat params SERVICES/IMAGES map to deliver entries; all
params empty = full delivery of demo tags, pin output byte-identical to
the old script. Version/chart tag only allocated when needed; existing
chart tag is reused idempotently instead of failing. retag records image
digests; pin writes prepended release-notes.yaml entries (from/to,
sourceTag, digest, dbChange) and only touches files of non-keep
services. CHART_ONLY skips image work. PROMOTE_DRY_RUN echoes docker
and git push for local rehearsal.
Design: hub docs/adr/0074 (partial delivery alongside ADR-0067).
2026-08-27 14:37:09 +08:00
ximenchuifeng
60363b3dee
fix(demo): add missing repository for auditWeb image entry
...
images.auditWeb had only tag without repository, so the promote baseline
walk silently skipped it and audit-web was never retagged to ACR.
2026-08-27 14:37:09 +08:00
ximenchuifeng
237e36516f
docs(runbooks): add production db change runbook
2026-08-27 14:36:09 +08:00
ximenchuifeng
92fd12f1ed
chore(dev): retire dev environment, manifests kept inert under disabled/
2026-08-27 14:36:09 +08:00
ximenchuifeng
4c15866c71
chore(gitops): update agent image tags to develop-v.1.0.1-202608270541-83 [skip ci]
2026-08-27 05:43:21 +00:00
ximenchuifeng
bb3ae2124f
chore(gitops): update agent image tags to develop-v.1.0.1-202608270314-82 [skip ci]
2026-08-27 03:17:12 +00:00
ximenchuifeng
2f2863bfe6
chore(gitops): update agent image tags to develop-v.1.0.1-202608270305-81 [skip ci]
2026-08-27 03:07:37 +00:00
ximenchuifeng
9c9271f0d7
chore(gitops): update ultra image tags to develop-v.1.0.1-202608260406-36 [skip ci]
2026-08-26 04:07:18 +00:00
ximenchuifeng
a703768f7a
chore(gitops): update agent image tags to develop-v.1.0.1-202608260402-80 [skip ci]
2026-08-26 04:05:24 +00:00
ximenchuifeng
fdc9971172
chore(gitops): update edge image tags to develop-v.1.0.1-202608252351-45 [skip ci]
2026-08-25 23:53:49 +00:00
ximenchuifeng
8ac241acd4
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202608250631-10 [skip ci]
2026-08-25 06:32:44 +00:00
ximenchuifeng
009db908df
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202608240844-9 [skip ci]
2026-08-24 08:45:17 +00:00
ximenchuifeng
b6f1097d30
fix(promote): 客户目录扫描改用 release 分支树(工作区 master 无客户目录)
2026-08-22 13:49:22 +08:00
ximenchuifeng
3549746cdc
fix(promote): 基线解析适配真实两层结构(修复 walk 叶子误当 dict + 打印解包)
...
(cherry picked from commit e2375a49d2 )
2026-08-22 13:47:28 +08:00
ximenchuifeng
fc9297cd6b
fix(promote): CUSTOMER 参数防呆——唯一客户目录才允许缺省,多客户时必须显式指定(防发错现场)
...
(cherry picked from commit 3849548087 )
2026-08-22 13:47:28 +08:00
ximenchuifeng
a1a1a617ff
feat(release): 交付晋级流水线 release-promote(本仓库第一条流水线)
...
- .drone.yml: 四步(prepare/retag/chart/pin),trigger 仅 custom,push 事件零触发
- ci/promote.sh: 读 demo 交付基线→retag 推 ACR→chart bump+tag→release 分支钉版
- ci/auto-bump.sh: 未传版本号时自动递增 patch(查 chart tag)
- 凭证: ACR 推送走 secrets(已配);git push 走 netrc;禁止凭证走参数(ADR-0066/0067)
2026-08-22 13:08:42 +08:00
ximenchuifeng
7ba8e45db2
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202608200523-8 [skip ci]
2026-08-20 05:24:10 +00:00
ximenchuifeng
88befc3a31
chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202608200500-7 [skip ci]
2026-08-20 05:00:42 +00:00
ximenchuifeng
cb64dce16b
chore(gitops): update ultra image tags to develop-v.1.0.1-202608200309-30 [skip ci]
2026-08-20 03:11:28 +00:00
ximenchuifeng
f30c6edd04
Merge branch 'develop/v.1.0.1'
2026-08-20 11:05:50 +08:00
ximenchuifeng
bb5e699c77
feat(demo): 启用 audit Application(移出 disabled);audit-values 对齐 v2 chart;四服务开启 audit.publisher
2026-08-20 11:05:26 +08:00
ximenchuifeng
2e43dbdd62
chore(gitops): update ultra image tags to develop-v.1.0.1-202608190651-29 [skip ci]
2026-08-19 06:52:39 +00:00
ximenchuifeng
304d5f9f37
chore(gitops): update protocol image tags to develop-v.1.0.1-202608190107-20 [skip ci]
2026-08-19 09:26:24 +08:00
ximenchuifeng
288cac5e6e
feat(protocol-servers): 加定量炉 OPC UA Mock(opcua-dosing-furnace,场景 dosing-furnace.json + --name 定量炉MockServer)
...
依赖 protocol-mock 60944f7 的 opcua 镜像(scenes/dosing-furnace.json + drift 引擎 + --name),
发布前需先在 Drone 手动触发 protocol-release(PROTOCOL_SCOPE=opcua)出新镜像
2026-08-19 09:01:53 +08:00
ximenchuifeng
d08fab1af2
chore(gitops): update protocol image tags to develop-v.1.0.1-202608190047-19 [skip ci]
2026-08-19 00:49:43 +00:00
ximenchuifeng
7ff560b964
chore(gitops): update agent image tags to develop-v.1.0.1-202608180855-62 [skip ci]
2026-08-18 08:58:04 +00:00
ximenchuifeng
a18565e546
chore(gitops): update ultra image tags to develop-v.1.0.1-202608180057-28 [skip ci]
2026-08-18 00:59:48 +00:00
ximenchuifeng
08e4668ec1
chore(gitops): update agent image tags to develop-v.1.0.1-202608180048-61 [skip ci]
2026-08-18 00:52:04 +00:00
ximenchuifeng
721baace46
chore(gitops): update ultra image tags to develop-v.1.0.1-202608111122-17 [skip ci]
2026-08-11 11:22:37 +00:00
ximenchuifeng
324752c09e
chore(gitops): update edge image tags to develop-v.1.0.1-202608111118-40 [skip ci]
2026-08-11 11:19:33 +00:00
ximenchuifeng
6c5e9b4403
chore(gitops): update sso image tags to develop-v.1.0.1-202608111117-30 [skip ci]
2026-08-11 11:18:45 +00:00
ximenchuifeng
ef6ecc2860
chore(gitops): update edge image tags to develop-v.1.0.1-202608110746-39 [skip ci]
2026-08-11 07:49:00 +00:00
ximenchuifeng
8f9c47e1ae
chore(gitops): update ultra image tags to develop-v.1.0.1-202608110619-16 [skip ci]
2026-08-11 06:20:26 +00:00
ximenchuifeng
f5e18f81b6
chore(gitops): update edge image tags to develop-v.1.0.1-202608110617-37 [skip ci]
2026-08-11 06:18:16 +00:00
ximenchuifeng
3c6c37ebec
chore(gitops): update sso image tags to develop-v.1.0.1-202608110616-29 [skip ci]
2026-08-11 06:17:30 +00:00
ximenchuifeng
aa73caf613
chore(gitops): update protocol image tags to develop-v.1.0.1-202608110521-16 [skip ci]
2026-08-11 05:21:40 +00:00
ximenchuifeng
7f4489747a
chore(gitops): update edge image tags to develop-v.1.0.1-202608110420-36 [skip ci]
2026-08-11 04:21:39 +00:00
ximenchuifeng
93563fdd74
chore(gitops): update sso image tags to develop-v.1.0.1-202608110418-28 [skip ci]
2026-08-11 04:20:09 +00:00
ximenchuifeng
e99081b83d
chore(gitops): update ultra image tags to develop-v.1.0.1-202608110142-15 [skip ci]
2026-08-11 01:43:06 +00:00
ximenchuifeng
5bdf25c107
chore(gitops): update agent image tags to develop-v.1.0.1-202608110140-35 [skip ci]
2026-08-11 01:41:57 +00:00
ximenchuifeng
6a64d4bf0a
chore(gitops): update edge image tags to develop-v.1.0.1-202608110138-35 [skip ci]
2026-08-11 01:39:27 +00:00
ximenchuifeng
7db44145ba
chore(gitops): update sso image tags to develop-v.1.0.1-202608110137-27 [skip ci]
2026-08-11 01:38:37 +00:00
ximenchuifeng
dc88e7c4e2
chore(gitops): update edge image tags to develop-v.1.0.1-202608110121-34 [skip ci]
2026-08-11 01:23:15 +00:00
ximenchuifeng
a66491cd4f
chore(gitops): update edge image tags to develop-v.1.0.1-202608110010-30 [skip ci]
2026-08-11 00:11:34 +00:00
ximenchuifeng
22da325a1c
Merge commit '699f4a6'
2026-08-11 07:52:50 +08:00
ximenchuifeng
c15a836ef9
chore(gitops): update agent image tags to develop-v.1.0.1-202608100636-32 [skip ci]
2026-08-10 06:38:21 +00:00
ximenchuifeng
cc803be9dc
chore(gitops): update edge image tags to develop-v.1.0.1-202608100630-28 [skip ci]
2026-08-10 06:33:27 +00:00
ximenchuifeng
cd4fb979a1
chore(gitops): update edge image tags to develop-v.1.0.1-202608070859-27 [skip ci]
2026-08-07 09:02:10 +00:00
ximenchuifeng
9e4c900e6c
chore(gitops): update edge image tags to develop-v.1.0.1-202608070344-24 [skip ci]
2026-08-07 03:44:39 +00:00
ximenchuifeng
0b355da998
feat(deploy): 新增 mixingx-mqttx Argo CD Application (demo 环境)
...
- applications/demo/mqttx.yaml:独立 Application,指向 mixingx-mqttx chart,
运维可在 Argo CD 里随时 sync 部署 / delete 移除 MQTTX Web 监控客户端。
- environments/demo/mqttx-values.yaml:demo 环境 Ingress host (mqttx.mixingx.local)。
MQTTX Web 用公共镜像 emqx/mqttx-web,不走 image-version.yaml。
2026-08-06 15:50:16 +08:00
ximenchuifeng
cd309ee611
chore(gitops): update edge image tags to develop-v.1.0.1-202608060539-22 [skip ci]
2026-08-06 05:40:56 +00:00
ximenchuifeng
b976227329
chore(gitops): update edge image tags to develop-v.1.0.1-202608060014-20 [skip ci]
2026-08-06 00:20:20 +00:00
ximenchuifeng
44f382230e
chore(agents): 移除 demo agent 实例(agent-demo postgres 卷满无法恢复)
...
agent-demo-postgres 的 5Gi Longhorn 卷满 + mxdev 磁盘异常导致
扩容卡住,postgres CrashLoop。移除该实例,保留 agent-demo-2。
2026-08-05 16:43:26 +08:00
ximenchuifeng
fa73db2b9c
chore(gitops): update agent image tags to develop-v.1.0.1-202608050748-25 [skip ci]
2026-08-05 07:50:03 +00:00
ximenchuifeng
b007a2fde5
chore(gitops): update protocol image tags to develop-v.1.0.1-202608050747-15 [skip ci]
2026-08-05 07:47:57 +00:00
ximenchuifeng
e35900f219
chore(gitops): update ultra image tags to develop-v.1.0.1-202608050746-12 [skip ci]
2026-08-05 07:46:57 +00:00
ximenchuifeng
a0957377ab
chore(gitops): update edge image tags to develop-v.1.0.1-202608050745-19 [skip ci]
2026-08-05 07:46:05 +00:00
ximenchuifeng
25ebffa020
chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202608050744-6 [skip ci]
2026-08-05 07:44:36 +00:00
ximenchuifeng
d05b231e83
chore(gitops): update sso image tags to develop-v.1.0.1-202608050742-21 [skip ci]
2026-08-05 07:43:55 +00:00
ximenchuifeng
421a2e8e31
feat(edge): 去 PG edge values 适配
2026-08-05 15:11:08 +08:00
ximenchuifeng
83f5d28d79
chore(gitops): update sso image tags to develop-v.1.0.1-202608050627-19 [skip ci]
2026-08-05 06:28:16 +00:00
ximenchuifeng
073b3a3bf3
chore(gitops): update sso image tags to develop-v.1.0.1-202608050624-17 [skip ci]
2026-08-05 06:25:09 +00:00
ximenchuifeng
877e3f33bf
chore(gitops): update sso image tags to develop-v.1.0.1-202608050622-16 [skip ci]
2026-08-05 06:23:36 +00:00
ximenchuifeng
3676fac91b
chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202608050524-5 [skip ci]
2026-08-05 05:25:33 +00:00
ximenchuifeng
482134dfc9
chore(gitops): update edge image tags to develop-v.1.0.1-202608050522-18 [skip ci]
2026-08-05 05:24:14 +00:00
ximenchuifeng
6ece72f728
chore(gitops): update ultra image tags to develop-v.1.0.1-202608050519-11 [skip ci]
2026-08-05 05:21:38 +00:00
ximenchuifeng
99c95bbf01
chore(gitops): update sso image tags to develop-v.1.0.1-202608050516-15 [skip ci]
2026-08-05 05:18:15 +00:00
ximenchuifeng
5007cbaa21
chore(gitops): update protocol image tags to develop-v.1.0.1-202608050508-14 [skip ci]
2026-08-05 05:16:00 +00:00
ximenchuifeng
5779875cc1
chore(gitops): update agent image tags to develop-v.1.0.1-202608050403-24 [skip ci]
2026-08-05 04:34:16 +00:00
ximenchuifeng
92f26c4d64
fix(gitops): apply argocd with server-side ownership
2026-07-15 01:19:12 +08:00
ximenchuifeng
9d263ebcc0
feat(gitops): add safe argocd offline apply workflow
2026-07-15 01:15:33 +08:00
ximenchuifeng
17e17dc8fa
feat(gitops): add offline argocd bootstrap overlay
2026-07-15 01:14:06 +08:00
ximenchuifeng
5aa91ede4a
test(gitops): define argocd offline render contract
2026-07-15 01:12:53 +08:00
ximenchuifeng
ff761a3e90
docs(gitops): plan argocd offline bootstrap
2026-07-15 01:11:21 +08:00
ximenchuifeng
0fbe0dcb69
docs(gitops): design argocd offline bootstrap
2026-07-15 01:08:28 +08:00
ximenchuifeng
65c5819170
chore(gitops): disable demo mongodb
2026-07-15 00:46:54 +08:00
ximenchuifeng
cf672a0aa0
docs(gitops): plan disabling demo mongodb
2026-07-15 00:45:54 +08:00
ximenchuifeng
273d8f90ed
docs(gitops): design disabling demo mongodb
2026-07-15 00:43:30 +08:00
ximenchuifeng
631995f2a4
chore(gitops): disable audit default deployment
2026-07-15 00:32:22 +08:00
ximenchuifeng
a98e5b43c4
docs(gitops): plan disabling audit default deployment
2026-07-15 00:32:22 +08:00
ximenchuifeng
59a0d97bc0
docs(gitops): design disabling audit default deployment
2026-07-15 00:32:22 +08:00