531 Commits
Author SHA1 Message Date
drone 9e4f2f848a chore(gitops): update network-agent image tag to develop-v.1.0.1-202611170748-6 [skip ci] 2026-11-17 07:49:33 +00:00
drone 52d82b2ae7 chore(gitops): update edge image tags to develop-v.1.0.1-202611170748-14 [skip ci] 2026-11-17 07:48:38 +00:00
drone dccf11023e chore(gitops): update agent image tags to develop-v.1.0.1-202611170746-15 [skip ci] 2026-11-17 07:48:11 +00:00
drone 33f39de1ac chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611170746-8 [skip ci] 2026-11-17 07:46:23 +00:00
drone 5a323cc3f3 chore(gitops): update ultra image tags to develop-v.1.0.1-202611170745-9 [skip ci] 2026-11-17 07:45:53 +00:00
drone c201f85aa4 chore(gitops): update sso image tags to develop-v.1.0.1-202611170744-9 [skip ci] 2026-11-17 07:45:33 +00:00
drone b666d9a987 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202611170743-6 [skip ci] 2026-11-17 07:43:54 +00:00
drone c44614fcd2 chore(gitops): update network-agent image tag to develop-v.1.0.1-202611160557-5 [skip ci] 2026-11-16 05:58:23 +00:00
drone 0c0e8394a2 chore(gitops): update edge image tags to develop-v.1.0.1-202611160557-13 [skip ci] 2026-11-16 05:57:21 +00:00
drone cdbf7b3f23 chore(gitops): update agent image tags to develop-v.1.0.1-202611160556-14 [skip ci] 2026-11-16 05:56:52 +00:00
drone 7f0cd927d3 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611160556-7 [skip ci] 2026-11-16 05:56:23 +00:00
drone 38f3d3fe2b chore(gitops): update ultra image tags to develop-v.1.0.1-202611160555-8 [skip ci] 2026-11-16 05:55:50 +00:00
drone a35ae676ec chore(gitops): update sso image tags to develop-v.1.0.1-202611160555-8 [skip ci] 2026-11-16 05:55:19 +00:00
drone a907ccd3bc chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202611160554-5 [skip ci] 2026-11-16 05:54:51 +00:00
drone f270395796 chore(gitops): update edge image tags to develop-v.1.0.1-202611110845-12 [skip ci] 2026-11-11 08:45:52 +00:00
drone 7a22c2dcca chore(gitops): update agent image tags to develop-v.1.0.1-202611110845-13 [skip ci] 2026-11-11 08:45:39 +00:00
drone a0ead4b842 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611110844-6 [skip ci] 2026-11-11 08:44:55 +00:00
drone a71eaf8ca7 chore(gitops): update ultra image tags to develop-v.1.0.1-202611110844-7 [skip ci] 2026-11-11 08:44:25 +00:00
drone 22e8e53fb5 chore(gitops): update sso image tags to develop-v.1.0.1-202611110843-7 [skip ci] 2026-11-11 08:43:57 +00:00
drone a11acbfa9e chore(gitops): update edge image tags to develop-v.1.0.1-202611110627-11 [skip ci] 2026-11-11 06:29:39 +00:00
drone dbd051b733 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611100825-5 [skip ci] 2026-11-10 08:26:09 +00:00
drone aba1124a8e chore(gitops): update ultra image tags to develop-v.1.0.1-202611100825-6 [skip ci] 2026-11-10 08:25:55 +00:00
drone 556ed2b091 chore(gitops): update agent image tags to develop-v.1.0.1-202611100823-12 [skip ci] 2026-11-10 08:23:56 +00:00
drone 85aaf5e59c chore(gitops): update sso image tags to develop-v.1.0.1-202611100823-6 [skip ci] 2026-11-10 08:23:44 +00:00
drone f6278c70e6 chore(gitops): update sso image tags to develop-v.1.0.1-202611100758-5 [skip ci] 2026-11-10 07:58:24 +00:00
drone 01d5aabd6a chore(gitops): update network-agent image tag to develop-v.1.0.1-202611100740-4 [skip ci] 2026-11-10 07:41:08 +00:00
drone 6fac70ae84 chore(gitops): update edge image tags to develop-v.1.0.1-202611100739-10 [skip ci] 2026-11-10 07:39:56 +00:00
drone 963fa94273 chore(gitops): update agent image tags to develop-v.1.0.1-202611100739-11 [skip ci] 2026-11-10 07:39:13 +00:00
drone 1d8651d143 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611100738-4 [skip ci] 2026-11-10 07:38:52 +00:00
drone 9cf0ffd40a chore(gitops): update ultra image tags to develop-v.1.0.1-202611100736-5 [skip ci] 2026-11-10 07:38:28 +00:00
drone cf3051221a chore(gitops): update sso image tags to develop-v.1.0.1-202611100734-4 [skip ci] 2026-11-10 07:36:35 +00:00
drone 4426fd5f76 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202611100732-4 [skip ci] 2026-11-10 07:34:52 +00:00
drone 3dba385830 chore(gitops): update agent image tags to develop-v.1.0.1-202611100701-10 [skip ci] 2026-11-10 07:04:52 +00:00
drone f0abe3ccce chore(gitops): update edge image tags to develop-v.1.0.1-202611071122-9 [skip ci] 2026-11-07 11:26:00 +00:00
drone 95efa66816 chore(gitops): update agent image tags to develop-v.1.0.1-202611030842-9 [skip ci] 2026-11-03 08:43:56 +00:00
drone 176d4398ff chore(gitops): update agent image tags to develop-v.1.0.1-202611030353-8 [skip ci] 2026-11-03 03:55:48 +00:00
mx b2c969a117 chore: end-to-end verify hooks+webhook+mirror after repair (2026-11-03) [skip ci] 2026-11-03 03:52:55 +00:00
mx 0c2dddb136 chore: mirror-sync-test after server hook repair (2026-11-03) [skip ci] 2026-11-03 03:48:15 +00:00
chenhuan f4167d4a5b demo: enable auto-sync on all demo apps and ApplicationSets
Add syncPolicy.automated (prune=false, selfHeal=true) to all demo
Application definitions and ApplicationSet templates under
applications/demo/ so manifest changes (image/chart version pins from
the release pipeline) are applied by ArgoCD automatically.

- 11 Application manifests + disabled/platform-legacy now auto-sync
- 3 ApplicationSet templates (agents/edges/protocol-servers) now
  propagate auto-sync to generated apps
- codeserver and mixingx-demo-root already had it, unchanged
- bootstrap/mixingx-demo-root.yaml unchanged (already automated)
2026-11-03 11:33:59 +08:00
chenhuan ddc3cb74f0 demo: switch ArgoCD repoURL from Gitee to self-hosted Gitea (git.mixingx.local) 2026-11-03 03:21:45 +00:00
drone 09310182bc chore(gitops): update agent image tags to develop-v.1.0.1-202611030249-5 [skip ci] 2026-11-03 02:50:54 +00:00
drone 90feffe652 chore(gitops): update network-agent image tag to develop-v.1.0.1-202611030205-3 [skip ci] 2026-11-03 02:06:16 +00:00
drone c3819ab3de chore(gitops): update edge image tags to develop-v.1.0.1-202611030205-6 [skip ci] 2026-11-03 02:05:11 +00:00
drone b6af5bfb15 chore(gitops): update agent image tags to develop-v.1.0.1-202611030203-4 [skip ci] 2026-11-03 02:04:47 +00:00
drone b782695654 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611030203-3 [skip ci] 2026-11-03 02:03:12 +00:00
drone ff25deb642 chore(gitops): update ultra image tags to develop-v.1.0.1-202611030202-4 [skip ci] 2026-11-03 02:02:39 +00:00
drone 4b926d9d55 chore(gitops): update sso image tags to develop-v.1.0.1-202611030202-3 [skip ci] 2026-11-03 02:02:08 +00:00
drone 6dddb721b7 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202611030201-3 [skip ci] 2026-11-03 02:01:56 +00:00
chenhuan 609f08d2a3 fix(ci): git_setup 身份改 --global——chart 步骤在克隆的 chart 仓 commit,本地 config 只落当前仓,gitops-tools 镜像无全局身份会 fatal unable to auto-detect email 2026-11-03 01:53:02 +00:00
drone ecd059746a chore(gitops): update agent image tags to develop-v.1.0.1-202611030146-3 [skip ci] 2026-11-03 01:46:14 +00:00
chenhuan c620129717 fix(ci): Harbor 存在性校验 Accept 补 OCI 媒体类型——CI 镜像是 OCI index,仅 docker schema2 会 404 MANIFEST_UNKNOWN(休眠校验被 secrets 补齐后首次执行暴露) 2026-11-03 01:19:35 +00:00
drone bb83f177cd chore(gitops): update network-agent image tag to develop-v.1.0.1-202611030102-2 [skip ci] 2026-11-03 01:03:36 +00:00
drone 4142286d64 chore(gitops): update edge image tags to develop-v.1.0.1-202611030102-5 [skip ci] 2026-11-03 01:02:31 +00:00
drone 627222904a chore(gitops): update agent image tags to develop-v.1.0.1-202611030101-2 [skip ci] 2026-11-03 01:02:01 +00:00
drone a5714431a2 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611030101-2 [skip ci] 2026-11-03 01:01:33 +00:00
drone 9e4d1e6290 chore(gitops): update ultra image tags to develop-v.1.0.1-202611030100-3 [skip ci] 2026-11-03 01:00:59 +00:00
drone d650ff15ff chore(gitops): update sso image tags to develop-v.1.0.1-202611030100-2 [skip ci] 2026-11-03 01:00:35 +00:00
drone 30865af389 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202611030100-2 [skip ci] 2026-11-03 01:00:07 +00:00
drone c7b132e35e chore(gitops): update protocol image tags to develop-v.1.0.1-202611030041-1 [skip ci] 2026-11-03 00:45:43 +00:00
drone f5c32fe060 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202611030040-1 [skip ci] 2026-11-03 00:40:13 +00:00
drone 7320edff46 chore(gitops): update sso image tags to develop-v.1.0.1-202611030030-1 [skip ci] 2026-11-03 00:30:32 +00:00
drone 74863653d2 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202611030028-1 [skip ci] 2026-11-03 00:29:08 +00:00
drone efd802a99e chore(gitops): update agent image tags to develop-v.1.0.1-202611030024-1 [skip ci] 2026-11-03 00:28:37 +00:00
drone 03b050e678 chore(gitops): update ultra image tags to develop-v.1.0.1-202611030024-2 [skip ci] 2026-11-03 00:24:20 +00:00
drone d72236e673 chore(gitops): update edge image tags to develop-v.1.0.1-202611030023-4 [skip ci] 2026-11-03 00:24:03 +00:00
drone 0f89203f7c chore(gitops): update edge image tags to develop-v.1.0.1-202611030020-3 [skip ci] 2026-11-03 00:20:57 +00:00
drone 984d0b41f2 chore(gitops): update ultra image tags to develop-v.1.0.1-202611030014-1 [skip ci] 2026-11-03 00:15:15 +00:00
chenhuan eaf1980241 test: sync_on_commit 自动同步验证 [skip ci] 2026-11-02 09:03:34 +00:00
chenhuan ebb0fc2f3a test: push mirror 即时同步验证 [skip ci] 2026-11-02 09:02:21 +00:00
drone ebcb75ba88 chore(gitops): update network-agent image tag to develop-v.1.0.1-202611020824-1 [skip ci] 2026-11-02 08:25:05 +00:00
chenhuan cc7587149a ci: 仓库地址 Gitee→Gitea——promote/auto-bump 缺省与 insteadOf 切换 2026-11-02 08:18:11 +00:00
liulingyun 247f28c4dc chore(gitops): update sso image tags to develop-v.1.0.1-202610300620-123 [skip ci] 2026-10-30 06:20:51 +00:00
liulingyun d8eee0419c chore(gitops): update edge image tags to develop-v.1.0.1-202610300617-122 [skip ci] 2026-10-30 06:19:38 +00:00
liulingyun 0e7fc552cb chore(gitops): update agent image tags to develop-v.1.0.1-202610300614-192 [skip ci] 2026-10-30 06:15:24 +00:00
ximenchuifeng 8a0613e182 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202610300609-26 [skip ci] 2026-10-30 06:10:14 +00:00
liulingyun a619372f87 chore(gitops): update ultra image tags to develop-v.1.0.1-202610300605-67 [skip ci] 2026-10-30 06:07:45 +00:00
薛佳帆 f56cd559ca chore(gitops): update network-agent image tag to develop-v.1.0.1-202610300339-43 [skip ci] 2026-10-30 03:40:12 +00:00
liulingyun 60867ebfe8 chore(gitops): update edge image tags to develop-v.1.0.1-202610300338-121 [skip ci] 2026-10-30 03:39:25 +00:00
liulingyun 54e91f9793 chore(gitops): update agent image tags to develop-v.1.0.1-202610300337-191 [skip ci] 2026-10-30 03:38:34 +00:00
ximenchuifeng 6dc08615a5 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202610300336-25 [skip ci] 2026-10-30 03:37:38 +00:00
liulingyun 65dfc7a4b5 chore(gitops): update ultra image tags to develop-v.1.0.1-202610300336-66 [skip ci] 2026-10-30 03:36:50 +00:00
liulingyun 3d24a570b0 chore(gitops): update sso image tags to develop-v.1.0.1-202610300335-122 [skip ci] 2026-10-30 03:36:04 +00:00
王野 e5bd4e97e0 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202610300334-13 [skip ci] 2026-10-30 03:35:20 +00:00
ximenchuifeng 9c46880d65 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202610300330-24 [skip ci] 2026-10-30 03:31:59 +00:00
liulingyun 8335f694de chore(gitops): update edge image tags to develop-v.1.0.1-202610300330-120 [skip ci] 2026-10-30 03:31:49 +00:00
liulingyun 44174095c6 chore(gitops): update agent image tags to develop-v.1.0.1-202610300329-190 [skip ci] 2026-10-30 03:30:55 +00:00
liulingyun 63e3e77300 chore(gitops): update sso image tags to develop-v.1.0.1-202610300329-121 [skip ci] 2026-10-30 03:30:36 +00:00
liulingyun de21e3ae39 chore(gitops): update ultra image tags to develop-v.1.0.1-202610300323-65 [skip ci] 2026-10-30 03:25:59 +00:00
薛佳帆 8badc7befc chore(gitops): update network-agent image tag to develop-v.1.0.1-202610300322-42 [skip ci] 2026-10-30 03:23:07 +00:00
liulingyun dcbb993cbe chore(gitops): update ultra image tags to develop-v.1.0.1-202610300257-63 [skip ci] 2026-10-30 02:58:24 +00:00
liulingyun 9ef9756967 chore(gitops): update agent image tags to develop-v.1.0.1-202610300210-189 [skip ci] 2026-10-30 02:12:25 +00:00
liulingyun 66c53dc81b chore(gitops): update sso image tags to develop-v.1.0.1-202610300209-120 [skip ci] 2026-10-30 02:11:56 +00:00
liulingyun 8bb1335e5c chore(gitops): update agent image tags to develop-v.1.0.1-202610300050-188 [skip ci] 2026-10-30 00:52:25 +00:00
liulingyun e945282de8 chore(gitops): update sso image tags to develop-v.1.0.1-202610300047-119 [skip ci] 2026-10-30 00:49:08 +00:00
liulingyun 788549ce3b chore(gitops): update edge image tags to develop-v.1.0.1-202610300030-119 [skip ci] 2026-10-30 00:32:03 +00:00
liulingyun ec64cd0810 chore(gitops): update agent image tags to develop-v.1.0.1-202610300026-187 [skip ci] 2026-10-30 00:28:50 +00:00
王野 06c1f884d3 chore(gitops): update sso image tags to develop-v.1.0.1-202610290605-116 [skip ci] 2026-10-29 06:06:22 +00:00
王野 d0897e4c7e chore(gitops): update ultra image tags to develop-v.1.0.1-202610290601-61 [skip ci] 2026-10-29 06:02:23 +00:00
liulingyun 8aa34f1cae chore(gitops): update edge image tags to develop-v.1.0.1-202610290557-117 [skip ci] 2026-10-29 05:59:30 +00:00
liulingyun a75db1a89d chore(gitops): update agent image tags to develop-v.1.0.1-202610290516-186 [skip ci] 2026-10-29 05:19:05 +00:00
王野 79c07a05b6 chore(gitops): update ultra image tags to develop-v.1.0.1-202610290354-60 [skip ci] 2026-10-29 03:55:05 +00:00
王野 8590b4e337 chore(gitops): update sso image tags to develop-v.1.0.1-202610290352-115 [skip ci] 2026-10-29 03:54:11 +00:00
ximenchuifeng 33bcfeb9f3 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202610290345-23 [skip ci] 2026-10-29 03:45:58 +00:00
王野 5101c358c9 chore(gitops): update sso image tags to develop-v.1.0.1-202610290341-114 [skip ci] 2026-10-29 03:45:30 +00:00
王野 6a72c2cceb chore(gitops): update ultra image tags to develop-v.1.0.1-202610290335-59 [skip ci] 2026-10-29 03:41:24 +00:00
ximenchuifeng 6c225015f9 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202610290235-22 [skip ci] 2026-10-29 02:37:42 +00:00
王野 30180b3426 chore(gitops): update ultra image tags to develop-v.1.0.1-202610280841-58 [skip ci] 2026-10-28 08:42:25 +00:00
王野 ca6412db39 chore(gitops): update sso image tags to develop-v.1.0.1-202610280841-111 [skip ci] 2026-10-28 08:42:24 +00:00
王野 a7bf3ddf3c chore(gitops): update agent image tags to develop-v.1.0.1-202610280838-182 [skip ci] 2026-10-28 08:41:14 +00:00
王野 141c6f0ad8 chore(gitops): update edge image tags to develop-v.1.0.1-202610280838-109 [skip ci] 2026-10-28 08:41:04 +00:00
王野 bed88bc786 chore(gitops): update edge image tags to develop-v.1.0.1-202610280737-108 [skip ci] 2026-10-28 07:39:12 +00:00
王野 3d4a6af838 chore(gitops): update agent image tags to develop-v.1.0.1-202610280733-181 [skip ci] 2026-10-28 07:37:09 +00:00
王野 23d1fffc92 chore(gitops): update ultra image tags to develop-v.1.0.1-202610280730-57 [skip ci] 2026-10-28 07:32:54 +00:00
王野 403642adb7 chore(gitops): update sso image tags to develop-v.1.0.1-202610280726-110 [skip ci] 2026-10-28 07:30:27 +00:00
王野 a0cf501c67 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202610280304-12 [skip ci] 2026-10-28 03:05:10 +00:00
王野 62fc5ceb6c chore(gitops): update sso image tags to develop-v.1.0.1-202610280304-109 [skip ci] 2026-10-28 03:04:53 +00:00
王野 50b379e501 chore(gitops): update ultra image tags to develop-v.1.0.1-202610280303-56 [skip ci] 2026-10-28 03:04:47 +00:00
王野 a62e71a01e chore(gitops): update agent image tags to develop-v.1.0.1-202610280302-180 [skip ci] 2026-10-28 03:03:15 +00:00
王野 d6e6ecd0f6 chore(gitops): update edge image tags to develop-v.1.0.1-202610280302-107 [skip ci] 2026-10-28 03:03:05 +00:00
王野 80cef43763 chore(gitops): update edge image tags to develop-v.1.0.1-202610280217-106 [skip ci] 2026-10-28 02:20:03 +00:00
王野 665436d5e2 chore(gitops): update agent image tags to develop-v.1.0.1-202610280213-179 [skip ci] 2026-10-28 02:17:31 +00:00
王野 aa7af29210 chore(gitops): update ultra image tags to develop-v.1.0.1-202610280211-55 [skip ci] 2026-10-28 02:13:34 +00:00
王野 b5c41dd95b chore(gitops): update sso image tags to develop-v.1.0.1-202610280207-108 [skip ci] 2026-10-28 02:11:00 +00:00
王野 6444e21d99 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202610280201-11 [skip ci] 2026-10-28 02:07:15 +00:00
薛佳帆 3bfb59bd28 chore(gitops): update network-agent image tag to develop-v.1.0.1-202610270611-41 [skip ci] 2026-10-27 06:24:10 +00:00
薛佳帆 493e2d882a chore(gitops): update agent image tags to develop-v.1.0.1-202610230114-178 [skip ci] 2026-10-23 01:16:12 +00:00
薛佳帆 37446c4e57 chore(gitops): update agent image tags to develop-v.1.0.1-202610220655-177 [skip ci] 2026-10-22 06:55:45 +00:00
薛佳帆 d81b71e7bf chore(gitops): update agent image tags to develop-v.1.0.1-202610220358-176 [skip ci] 2026-10-22 04:00:40 +00:00
薛佳帆 e853bed556 chore(gitops): update agent image tags to develop-v.1.0.1-202610220239-175 [skip ci] 2026-10-22 02:41:20 +00:00
薛佳帆 a7170d438e chore(gitops): update agent image tags to develop-v.1.0.1-202610220127-174 [skip ci] 2026-10-22 01:29:27 +00:00
薛佳帆 2c5e8cb8c4 chore(gitops): update agent image tags to develop-v.1.0.1-202610220034-172 [skip ci] 2026-10-22 00:38:33 +00:00
王野 3b9b4757ca chore(gitops): update agent image tags to develop-v.1.0.1-202610160859-170 [skip ci] 2026-10-16 08:59:58 +00:00
王野 d47ef3cde4 chore(gitops): update sso image tags to develop-v.1.0.1-202610160857-107 [skip ci] 2026-10-16 08:58:40 +00:00
王野 2c3c795cf5 chore(gitops): update sso image tags to develop-v.1.0.1-202610160847-106 [skip ci] 2026-10-16 08:48:32 +00:00
王野 57c5ec4e3e chore(gitops): update agent image tags to develop-v.1.0.1-202610160838-169 [skip ci] 2026-10-16 08:40:42 +00:00
王野 2b7fee0ca2 chore(gitops): update agent image tags to develop-v.1.0.1-202610160706-168 [skip ci] 2026-10-16 07:08:36 +00:00
王野 145cabbea7 chore(gitops): update sso image tags to develop-v.1.0.1-202610160633-105 [skip ci] 2026-10-16 06:35:29 +00:00
ximenchuifeng 2a67a86c36 chore(gitops): update agent image tags to develop-v.1.0.1-202610140846-167 [skip ci] 2026-10-14 08:49:20 +00:00
ximenchuifeng 3d957fe585 chore(gitops): update agent image tags to develop-v.1.0.1-202610140759-166 [skip ci] 2026-10-14 08:03:40 +00:00
ximenchuifeng 1febbdbd51 chore(gitops): update edge image tags to develop-v.1.0.1-202610140758-105 [skip ci] 2026-10-14 08:02:58 +00:00
ximenchuifeng 0258de9a17 chore(gitops): update edge image tags to develop-v.1.0.1-202610140450-103 [skip ci] 2026-10-14 04:57:21 +00:00
ximenchuifeng 12e0a469fc chore(gitops): update agent image tags to develop-v.1.0.1-202610130759-157 [skip ci] 2026-10-13 08:01:30 +00:00
薛佳帆 b77deef4c2 chore(gitops): update network-agent image tag to develop-v.1.0.1-202610130543-40 [skip ci] 2026-10-13 05:44:32 +00:00
ximenchuifeng 70a095b043 chore(gitops): update edge image tags to develop-v.1.0.1-202610130542-99 [skip ci] 2026-10-13 05:43:21 +00:00
ximenchuifeng cd76d495d3 chore(gitops): update agent image tags to develop-v.1.0.1-202610130541-156 [skip ci] 2026-10-13 05:42:19 +00:00
ximenchuifeng f3da8f251b chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202610130539-19 [skip ci] 2026-10-13 05:41:11 +00:00
王野 74ddbb14fb chore(gitops): update ultra image tags to develop-v.1.0.1-202610130536-54 [skip ci] 2026-10-13 05:38:56 +00:00
薛佳帆 d2d082cebd chore(gitops): update sso image tags to develop-v.1.0.1-202610130534-104 [skip ci] 2026-10-13 05:36:25 +00:00
薛佳帆 8d19ed68b2 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202610130533-10 [skip ci] 2026-10-13 05:34:14 +00:00
ximenchuifeng 48317b2c07 chore(gitops): update agent image tags to develop-v.1.0.1-202610120722-155 [skip ci] 2026-10-12 07:24:42 +00:00
ximenchuifeng 98d0ad735f chore(gitops): update edge image tags to develop-v.1.0.1-202610120529-98 [skip ci] 2026-10-12 05:31:27 +00:00
ximenchuifeng b2b377c2b5 chore(gitops): update edge image tags to develop-v.1.0.1-202610120509-97 [skip ci] 2026-10-12 05:15:49 +00:00
ximenchuifeng 21c33a8860 chore(gitops): update edge image tags to develop-v.1.0.1-202610120210-96 [skip ci] 2026-10-12 02:12:38 +00:00
王野 39120a3d7e chore(gitops): update agent image tags to develop-v.1.0.1-202610110845-151 [skip ci] 2026-10-11 08:48:40 +00:00
ximenchuifeng 87cc9b011f chore(gitops): update edge image tags to develop-v.1.0.1-202610110838-95 [skip ci] 2026-10-11 08:39:15 +00:00
ximenchuifeng ab14fff5ab chore(gitops): update edge image tags to develop-v.1.0.1-202610110721-94 [skip ci] 2026-10-11 07:21:40 +00:00
ximenchuifeng 823066200a chore(gitops): update edge image tags to develop-v.1.0.1-202610110707-93 [skip ci] 2026-10-11 07:13:36 +00:00
ximenchuifeng e3552039d6 feat(gitops): Edge 实例 ADS Router 身份透传(demo/dev 契约同步)
environments/{demo,dev}/edges.yaml 实例条目增 adsRouter 身份:demo=10.200.0.17.1.1 /
demo-2=10.200.0.18.1.1(前 4 字节互异,第 4 位对齐 idWorkerId 便于记忆;publicAddress=
192.168.1.173 为运维占位,同出口=多 Edge 同出口验收场景,YAML 注释已标)。ApplicationSet
values 模板 hasKey 守卫透传 adsRouter 块;实例缺身份时经 chart 渲染守卫显式失败
(no shared default identity)。dev 停用模板契约同步,未启用。远端清单仍由 Edge
SQLite/UI 管理,部署 values 不回写覆盖。渲染证据 hub docs/research/evidence/
2026-10-10-ads-router-impl/W9-*.md
2026-10-11 14:49:19 +08:00
ximenchuifeng 3e172f81e2 chore(gitops): update edge image tags to develop-v.1.0.1-202610100710-90 [skip ci] 2026-10-10 07:12:02 +00:00
ximenchuifeng e4224dc465 chore(gitops): update edge image tags to develop-v.1.0.1-202610100514-89 [skip ci] 2026-10-10 05:15:57 +00:00
ximenchuifeng 33291691ea chore(gitops): update edge image tags to develop-v.1.0.1-202610100303-88 [skip ci] 2026-10-10 03:05:14 +00:00
ximenchuifeng 65a6979a3b chore(gitops): update edge image tags to develop-v.1.0.1-202610100145-87 [skip ci] 2026-10-10 01:47:26 +00:00
王野 a7153687c7 chore(gitops): update agent image tags to develop-v.1.0.1-202610100134-150 [skip ci] 2026-10-10 01:34:46 +00:00
王野 9db7a80414 chore(gitops): update agent image tags to develop-v.1.0.1-202610100125-149 [skip ci] 2026-10-10 01:29:28 +00:00
ximenchuifeng e45857043b chore(gitops): update edge image tags to develop-v.1.0.1-202610091118-85 [skip ci] 2026-10-09 11:20:17 +00:00
ximenchuifeng a816750c8c chore(gitops): update edge image tags to develop-v.1.0.1-202610091037-84 [skip ci] 2026-10-09 10:38:54 +00:00
ximenchuifeng f79b2c8567 chore(gitops): update edge image tags to develop-v.1.0.1-202610090941-83 [skip ci] 2026-10-09 09:42:08 +00:00
王野 699339c738 chore(gitops): update agent image tags to develop-v.1.0.1-202610090940-148 [skip ci] 2026-10-09 09:41:27 +00:00
ximenchuifeng b4f7c52d29 chore(gitops): update edge image tags to develop-v.1.0.1-202610090937-82 [skip ci] 2026-10-09 09:38:28 +00:00
王野 e68b3a0c34 chore(gitops): update agent image tags to develop-v.1.0.1-202610090937-147 [skip ci] 2026-10-09 09:37:43 +00:00
ximenchuifeng 5860edb63b chore(gitops): update edge image tags to develop-v.1.0.1-202610090924-81 [skip ci] 2026-10-09 09:26:20 +00:00
王野 acf43a9b62 chore(gitops): update agent image tags to develop-v.1.0.1-202610090922-146 [skip ci] 2026-10-09 09:25:04 +00:00
ximenchuifeng e005119b49 chore(gitops): update edge image tags to develop-v.1.0.1-202610090913-80 [skip ci] 2026-10-09 09:14:04 +00:00
ximenchuifeng 47233b57ac chore(gitops): update edge image tags to develop-v.1.0.1-202610090843-79 [skip ci] 2026-10-09 08:44:14 +00:00
ximenchuifeng 605280149a chore(gitops): update edge image tags to develop-v.1.0.1-202610090715-78 [skip ci] 2026-10-09 07:17:52 +00:00
ximenchuifeng 2c73ef67e7 chore(gitops): update edge image tags to develop-v.1.0.1-202610090709-77 [skip ci] 2026-10-09 07:09:39 +00:00
ximenchuifeng 02a0ebd499 chore(gitops): update edge image tags to develop-v.1.0.1-202610090509-76 [skip ci] 2026-10-09 05:11:11 +00:00
ximenchuifeng b2c1856de9 chore(gitops): update edge image tags to develop-v.1.0.1-202610090457-75 [skip ci] 2026-10-09 04:58:16 +00:00
ximenchuifeng f36c12b0b9 chore(gitops): update edge image tags to develop-v.1.0.1-202610090405-74 [skip ci] 2026-10-09 04:07:52 +00:00
ximenchuifeng eb4b6612a5 chore(gitops): update edge image tags to develop-v.1.0.1-202610090233-73 [skip ci] 2026-10-09 02:36:08 +00:00
王野 4171e1e5a3 chore(gitops): update agent image tags to develop-v.1.0.1-202610090228-145 [skip ci] 2026-10-09 02:29:51 +00:00
王野 600888d91d chore(gitops): update agent image tags to develop-v.1.0.1-202610090157-144 [skip ci] 2026-10-09 01:58:15 +00:00
ximenchuifeng d89c26b5fb chore(gitops): update edge image tags to develop-v.1.0.1-202610080925-72 [skip ci] 2026-10-08 09:27:15 +00:00
ximenchuifeng a1bc54b777 chore(gitops): update edge image tags to develop-v.1.0.1-202610080631-70 [skip ci] 2026-10-08 06:33:32 +00:00
ximenchuifeng f0be6bbac3 chore(gitops): update edge image tags to develop-v.1.0.1-202610080314-69 [skip ci] 2026-10-08 03:15:51 +00:00
王野 1a8e58c89f chore(gitops): update edge image tags to dev1.0.1-edge-new-202610080223-68 [skip ci] 2026-10-08 02:24:29 +00:00
王野 a6f6cc2409 chore(gitops): update edge image tags to codex-agent-edge-contract-202610060826-67 [skip ci] 2026-10-06 08:28:07 +00:00
王野 28781fe93d chore(gitops): update edge image tags to codex-agent-edge-contract-202610060810-66 [skip ci] 2026-10-06 08:12:29 +00:00
王野 83921ed22e chore(gitops): update ultra image tags to develop-v.1.0.1-202610060702-53 [skip ci] 2026-10-06 07:03:23 +00:00
王野 deed34c88e chore(gitops): update edge image tags to codex-agent-edge-contract-202610060619-65 [skip ci] 2026-10-06 06:28:07 +00:00
王野 f6b5cea183 chore(gitops): update agent image tags to develop-v.1.0.1-202610060623-143 [skip ci] 2026-10-06 06:28:02 +00:00
王野 e3bdcd241a chore(gitops): update agent image tags to develop-v.1.0.1-202609300810-141 [skip ci] 2026-09-30 08:12:26 +00:00
王野 735f509e82 chore(gitops): update agent image tags to develop-v.1.0.1-202609300715-140 [skip ci] 2026-09-30 07:18:32 +00:00
薛佳帆 1e96b1d167 chore(gitops): update sso image tags to develop-v.1.0.1-202609300715-103 [skip ci] 2026-09-30 07:18:10 +00:00
王野 26c783f917 chore(gitops): update agent image tags to develop-v.1.0.1-202609300621-139 [skip ci] 2026-09-30 06:24:34 +00:00
薛佳帆 2b260ba40d chore(gitops): update sso image tags to develop-v.1.0.1-202609291100-102 [skip ci] 2026-09-29 11:02:26 +00:00
薛佳帆 cb1879f85a chore(gitops): update sso image tags to develop-v.1.0.1-202609291045-101 [skip ci] 2026-09-29 10:46:42 +00:00
薛佳帆 a52f202ad0 chore(gitops): update sso image tags to develop-v.1.0.1-202609291034-100 [skip ci] 2026-09-29 10:36:16 +00:00
薛佳帆 99074aaef3 chore(gitops): update sso image tags to develop-v.1.0.1-202609290849-99 [skip ci] 2026-09-29 08:57:02 +00:00
ximenchuifeng f554495db5 chore(demo): codeserver 升 v0.2.0——extensionsGallery 切微软 Marketplace(测试版全市场可装) 2026-09-29 16:23:51 +08:00
ximenchuifeng 545bf99243 feat(demo): 新增 mixingx-codeserver 测试 IDE 应用——浏览器版 VS Code(镜像 mixingx/codeserver:v0.1.0 预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser;*.mixingx.local 通配 DNS;automated sync 同客户仓先例;工作区 PVC local-path 5Gi keep) 2026-09-29 15:29:37 +08:00
薛佳帆 1c209af4e9 chore(gitops): update agent image tags to develop-v.1.0.1-202609290531-138 [skip ci] 2026-09-29 05:33:56 +00:00
薛佳帆 febbf75371 chore(gitops): update sso image tags to develop-v.1.0.1-202609290307-98 [skip ci] 2026-09-29 03:08:23 +00:00
薛佳帆 92269dc7a9 chore(gitops): update agent image tags to develop-v.1.0.1-202609290125-137 [skip ci] 2026-09-29 01:27:48 +00:00
薛佳帆 3e4f385620 chore(demo): 移除特征值预警缓存环境级开关(agent 已默认启用,不再需要分环境配置) 2026-09-29 09:23:51 +08:00
薛佳帆 9a4c6dc7dd feat(demo): 开启特征值预警 Redis 近端窗口灰度(featureValueWarningCache.enabled,走 chart env 注入) 2026-09-29 09:08:54 +08:00
薛佳帆 4be786ecb6 chore(gitops): update agent image tags to develop-v.1.0.1-202609290048-136 [skip ci] 2026-09-29 00:50:12 +00:00
王野 faec7425b6 chore(gitops): update agent image tags to develop-v.1.0.1-202609280709-135 [skip ci] 2026-09-28 07:10:58 +00:00
王野 31ac840f8f chore(gitops): update ultra image tags to develop-v.1.0.1-202609280608-52 [skip ci] 2026-09-28 06:09:03 +00:00
王野 d5d8b18ed2 chore(gitops): update agent image tags to develop-v.1.0.1-202609280558-134 [skip ci] 2026-09-28 05:59:32 +00:00
王野 dc1cc2434d chore(gitops): update agent image tags to develop-v.1.0.1-202609280540-133 [skip ci] 2026-09-28 05:43:55 +00:00
王野 96b3ff79bc chore(gitops): update ultra image tags to develop-v.1.0.1-202609280537-51 [skip ci] 2026-09-28 05:40:13 +00:00
ximenchuifeng cf7d08e11e chore(gitops): update edge image tags to develop-v.1.0.1-202609240638-64 [skip ci] 2026-09-24 06:38:47 +00:00
ximenchuifeng dcc4b57607 chore(gitops): update edge image tags to develop-v.1.0.1-202609240636-63 [skip ci] 2026-09-24 06:37:37 +00:00
ximenchuifeng c1be513888 chore(gitops): update edge image tags to develop-v.1.0.1-202609240321-62 [skip ci] 2026-09-24 03:22:33 +00:00
ximenchuifeng b3b469441f chore(gitops): update edge image tags to develop-v.1.0.1-202609240255-61 [skip ci] 2026-09-24 02:56:50 +00:00
ximenchuifeng 572a1ca5e3 chore(gitops): update edge image tags to develop-v.1.0.1-202609240159-60 [skip ci] 2026-09-24 02:03:43 +00:00
ximenchuifeng 08c48e3cad chore(gitops): update edge image tags to develop-v.1.0.1-202609240155-59 [skip ci] 2026-09-24 01:58:31 +00:00
薛佳帆 d79e4a54c2 chore(gitops): update agent image tags to develop-v.1.0.1-202609230625-132 [skip ci] 2026-09-23 06:27:54 +00:00
薛佳帆 013c48ab1c chore(gitops): update agent image tags to develop-v.1.0.1-202609230150-131 [skip ci] 2026-09-23 01:53:36 +00:00
薛佳帆 cb5033be49 chore(gitops): update agent image tags to develop-v.1.0.1-202609220333-130 [skip ci] 2026-09-22 03:36:36 +00:00
王野 60c82d10da chore(gitops): update agent image tags to develop-v.1.0.1-202609220135-129 [skip ci] 2026-09-22 01:41:30 +00:00
薛佳帆 57373c3c12 chore(gitops): update agent image tags to develop-v.1.0.1-202609211125-128 [skip ci] 2026-09-21 11:27:05 +00:00
薛佳帆 19c0d4f373 chore(gitops): update agent image tags to develop-v.1.0.1-202609211114-127 [skip ci] 2026-09-21 11:15:58 +00:00
王野 c72c63817b chore(gitops): update ultra image tags to develop-v.1.0.1-202609210845-50 [skip ci] 2026-09-21 08:46:00 +00:00
薛佳帆 6e068e82c8 chore(gitops): update agent image tags to develop-v.1.0.1-202609210842-126 [skip ci] 2026-09-21 08:45:23 +00:00
薛佳帆 c306b66c74 chore(gitops): update sso image tags to develop-v.1.0.1-202609210842-97 [skip ci] 2026-09-21 08:45:06 +00:00
王野 8fc7880201 chore(gitops): update agent image tags to develop-v.1.0.1-202609210634-125 [skip ci] 2026-09-21 06:35:09 +00:00
王野 f6cdc61a6d chore(gitops): update agent image tags to develop-v.1.0.1-202609210630-124 [skip ci] 2026-09-21 06:32:25 +00:00
薛佳帆 9946440cf1 chore(gitops): update agent image tags to develop-v.1.0.1-202609200813-123 [skip ci] 2026-09-20 08:14:47 +00:00
薛佳帆 393a7589d7 chore(gitops): update agent image tags to develop-v.1.0.1-202609200803-122 [skip ci] 2026-09-20 08:04:56 +00:00
薛佳帆 1e83e4178d chore(gitops): update agent image tags to develop-v.1.0.1-202609200758-121 [skip ci] 2026-09-20 08:00:12 +00:00
薛佳帆 7ace433909 chore(gitops): update agent image tags to develop-v.1.0.1-202609200320-120 [skip ci] 2026-09-20 03:21:52 +00:00
王野 58b5091fc3 chore(gitops): update agent image tags to develop-v.1.0.1-202609200232-119 [skip ci] 2026-09-20 02:36:38 +00:00
ximenchuifeng fbf944a1c2 chore(gitops): update edge image tags to develop-v.1.0.1-202609180539-58 [skip ci] 2026-09-18 05:41:57 +00:00
薛佳帆 029a8d813f chore(gitops): update agent image tags to develop-v.1.0.1-202609180527-117 [skip ci] 2026-09-18 05:29:04 +00:00
薛佳帆 3056443464 chore(gitops): update agent image tags to develop-v.1.0.1-202609180339-116 [skip ci] 2026-09-18 03:42:14 +00:00
薛佳帆 8957bf19d6 chore(gitops): update agent image tags to develop-v.1.0.1-202609180334-114 [skip ci] 2026-09-18 03:36:45 +00:00
薛佳帆 36f49e3716 chore(gitops): update agent image tags to develop-v.1.0.1-202609180251-113 [skip ci] 2026-09-18 02:53:06 +00:00
薛佳帆 8aff206ea0 chore(gitops): update agent image tags to develop-v.1.0.1-202609180154-112 [skip ci] 2026-09-18 01:57:15 +00:00
薛佳帆 6d091290df chore(gitops): update agent image tags to develop-v.1.0.1-202609170851-111 [skip ci] 2026-09-17 08:52:12 +00:00
薛佳帆 c75ba04079 chore(gitops): update agent image tags to develop-v.1.0.1-202609170753-110 [skip ci] 2026-09-17 07:56:09 +00:00
ximenchuifeng b332c4a4d5 chore(gitops): update agent image tags to develop-v.1.0.1-202609151048-108 [skip ci] 2026-09-15 10:50:46 +00:00
薛佳帆 3f27ef813c chore(gitops): update agent image tags to develop-v.1.0.1-202609150947-106 [skip ci] 2026-09-15 09:48:30 +00:00
ximenchuifeng 337e4604db chore(gitops): update edge image tags to develop-v.1.0.1-202609150935-56 [skip ci] 2026-09-15 09:36:35 +00:00
薛佳帆 8e31ceaf04 chore(gitops): update agent image tags to develop-v.1.0.1-202609150912-105 [skip ci] 2026-09-15 09:14:46 +00:00
王野 31a08de579 chore(gitops): update agent image tags to develop-v.1.0.1-202609150757-104 [skip ci] 2026-09-15 08:00:09 +00:00
ximenchuifeng 7278ee2627 chore(gitops): update sso image tags to develop-v.1.0.1-202609150222-96 [skip ci] 2026-09-15 02:25:28 +00:00
薛佳帆 20cd2b5656 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609150214-39 [skip ci] 2026-09-15 02:16:36 +00:00
ximenchuifeng ef6aa14bbc chore(gitops): update edge image tags to develop-v.1.0.1-202609140948-55 [skip ci] 2026-09-14 09:50:36 +00:00
ximenchuifeng 2404cb21a4 chore(gitops): update sso image tags to develop-v.1.0.1-202609140639-91 [skip ci] 2026-09-14 06:41:24 +00:00
薛佳帆 b9512e8130 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202609140639-9 [skip ci] 2026-09-14 06:40:29 +00:00
ximenchuifeng 6b7c497baa chore(gitops): update sso image tags to develop-v.1.0.1-202609140528-90 [skip ci] 2026-09-14 05:35:54 +00:00
薛佳帆 b347d177e5 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609100825-38 [skip ci] 2026-09-10 08:26:10 +00:00
薛佳帆 fcad1d3f60 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609100650-37 [skip ci] 2026-09-10 06:51:03 +00:00
薛佳帆 03beb43145 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609100642-36 [skip ci] 2026-09-10 06:43:46 +00:00
ximenchuifeng 874c3b99b3 chore(gitops): update sso image tags to develop-v.1.0.1-202609100552-89 [skip ci] 2026-09-10 05:57:00 +00:00
ximenchuifeng 2f8a86ec26 chore(gitops): update sso image tags to develop-v.1.0.1-202609100524-88 [skip ci] 2026-09-10 05:26:36 +00:00
薛佳帆 be7fcc3297 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609100510-35 [skip ci] 2026-09-10 05:11:32 +00:00
ximenchuifeng c21f64bc6e chore(gitops): update sso image tags to develop-v.1.0.1-202609100432-87 [skip ci] 2026-09-10 04:34:54 +00:00
薛佳帆 255e89f71d chore(gitops): update network-agent image tag to develop-v.1.0.1-202609100433-34 [skip ci] 2026-09-10 04:33:53 +00:00
ximenchuifeng 685162d651 chore(gitops): update sso image tags to develop-v.1.0.1-202609100154-86 [skip ci] 2026-09-10 02:00:36 +00:00
薛佳帆 fc795985b7 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609100153-33 [skip ci] 2026-09-10 01:54:33 +00:00
王野 a9c4e57952 chore(gitops): update edge image tags to develop-v.1.0.1-202609081124-52 [skip ci] 2026-09-08 11:24:38 +00:00
ximenchuifeng dd9275f884 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202609081123-18 [skip ci] 2026-09-08 11:23:54 +00:00
王野 a317e4a65b chore(gitops): update ultra image tags to develop-v.1.0.1-202609081122-49 [skip ci] 2026-09-08 11:23:09 +00:00
ximenchuifeng 4f353f9845 chore(gitops): update sso image tags to develop-v.1.0.1-202609081121-84 [skip ci] 2026-09-08 11:22:20 +00:00
ximenchuifeng b0e2e7338b chore(gitops): update sso image tags to develop-v.1.0.1-202609081121-83 [skip ci] 2026-09-08 11:21:34 +00:00
ximenchuifeng 6d61fa5ea7 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202609081115-17 [skip ci] 2026-09-08 11:15:41 +00:00
王野 331a990690 chore(gitops): update edge image tags to develop-v.1.0.1-202609081114-51 [skip ci] 2026-09-08 11:15:24 +00:00
ximenchuifeng 20b71dae2d chore(gitops): update sso image tags to develop-v.1.0.1-202609081114-82 [skip ci] 2026-09-08 11:14:59 +00:00
ximenchuifeng db6b6af096 chore(gitops): update image key images.gateway.tag to develop-v.1.0.1-202609081104-8 [skip ci] 2026-09-08 11:04:59 +00:00
王野 17838716d9 chore(gitops): update agent image tags to develop-v.1.0.1-202609081054-103 [skip ci] 2026-09-08 10:56:14 +00:00
ximenchuifeng d9ceb3e9c9 chore(gitops): update image key images.audit.tag,images.auditWeb.tag to develop-v.1.0.1-202609081026-16 [skip ci] 2026-09-08 10:27:32 +00:00
王野 4651c33c40 chore(gitops): update edge image tags to develop-v.1.0.1-202609081003-50 [skip ci] 2026-09-08 10:04:37 +00:00
ximenchuifeng e3be8e9718 chore(gitops): update sso image tags to develop-v.1.0.1-202609080906-81 [skip ci] 2026-09-08 09:08:21 +00:00
薛佳帆 99a13a5a7c chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080906-32 [skip ci] 2026-09-08 09:07:16 +00:00
ximenchuifeng dc5a0fdf1f chore(gitops): update sso image tags to develop-v.1.0.1-202609080829-80 [skip ci] 2026-09-08 08:33:40 +00:00
ximenchuifeng 822971d72c Merge remote-tracking branch 'origin/master' 2026-09-08 16:31:22 +08:00
ximenchuifeng be144877d9 feat(ci): ASSIGN_VERSION 参数——false 为纯钉版发布(不分配版本号,不 bump chart)
版本分配从按 action 一刀切改为参数控制(门户工作台「分配版本号」开关):
- true(缺省,兼容现状):任何非 keep 发布(含 pin-acr)分配版本号并 bump chart
- false:纯钉版——不分配版本号、chart 步整体跳过、平台 Application 不 retarget、
  pin-acr 服务 chart 引用不动,只钉 values/image-version 与 release-notes;
  commit title 记「钉版发布(无新版本号)」
- 硬约束:ASSIGN_VERSION=false 与 deliver/ci-now 互斥(镜像 retag 的目标名即版本号)
沙盒演练 4 场景:关+wifi(零版本,diff 仅 values+notes)/ 关+deliver(拒绝)/
开+wifi(分配+bump,现状)/ 关+组件(values 替换,钉版 title)。
2026-09-08 16:31:21 +08:00
薛佳帆 50874a3b70 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080827-31 [skip ci] 2026-09-08 08:28:05 +00:00
ximenchuifeng 1a95d6c2b1 Merge remote-tracking branch 'origin/master' 2026-09-08 16:15:38 +08:00
ximenchuifeng 95f3216743 fix(ci): 补提交 promote.sh 的 db-scripts 清理(d28a3ef 漏加文件)
d28a3ef 删除 db-scripts/ 时本笔 promote.sh 修改未随行提交(仅 rm 进了
index):移除 pin 的迁移 SQL 拷贝块与 python 检查段,DB_CHANGE 头注释改为
纯标记语义。#17(v1.0.7)发布不受影响(DB_CHANGE 为空,旧逻辑本就不触发)。
2026-09-08 16:15:37 +08:00
ximenchuifeng 4c23035604 chore(gitops): update sso image tags to develop-v.1.0.1-202609080749-77 [skip ci] 2026-09-08 07:52:17 +00:00
ximenchuifeng d28a3ef2f7 chore: 移除 db-scripts/——迁移 SQL 链路整体下线(ADR-0074 决策 11 修订)
CI 不再生成/写回迁移 SQL(sso 流水线已同步移除),release 为纯 GitOps 账本
不携带 SQL,db-scripts 目录一并删除。数据库变更:程序侧 EF Core 自动迁移
(demo/Aspire),客户现场需要人工迁移时由运维自行生成并执行。
promote.sh 的 DB_CHANGE 参数保留为 release-notes/commit 纯标记(提示运维
本次含数据库变更),不再关联任何脚本检查。
2026-09-08 15:41:05 +08:00
ximenchuifeng 83c1bade7a Merge remote-tracking branch 'origin/master' 2026-09-08 15:25:59 +08:00
ximenchuifeng b993132b6f feat(ci): DB_CHANGE 迁移 SQL 由 pin 从 master 树带至 release(修复脚本从未到账)
构建流水线把幂等迁移 SQL 写回 master 的 db-scripts/<svc>/,release 是受保护
客户账本、SQL 从未同步——ADR-0074 所述「pin 时带至 release」此前只有检查
没有动作。现 pin 在 checkout release 后按 DB_CHANGE 服务从 origin/master 树
checkout 对应目录(同时进 index 与工作区,随 pin commit 交付);警告语义改为
「master 树未生成」。沙盒演练:正路径 32 个 SQL 入 commit,负路径(源 tag
无对应 SQL)如实警告不拦截。
2026-09-08 15:25:49 +08:00
王野 d1e0062d3f chore(gitops): update sso image tags to develop-v.1.0.1-202609080722-76, publish db-scripts/sso/develop-v.1.0.1-202609080722-76.sql [skip ci] 2026-09-08 07:24:42 +00:00
薛佳帆 3177b79f36 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080722-30 [skip ci] 2026-09-08 07:23:12 +00:00
王野 74b550dfa3 chore(gitops): update agent image tags to develop-v.1.0.1-202609080713-102 [skip ci] 2026-09-08 07:14:53 +00:00
王野 91a6ae943a chore(gitops): update ultra image tags to develop-v.1.0.1-202609080712-48 [skip ci] 2026-09-08 07:13:42 +00:00
王野 e25a274523 chore(gitops): update sso image tags to develop-v.1.0.1-202609080704-75, publish db-scripts/sso/develop-v.1.0.1-202609080704-75.sql [skip ci] 2026-09-08 07:07:45 +00:00
薛佳帆 a1c46c0000 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080703-29 [skip ci] 2026-09-08 07:04:37 +00:00
ximenchuifeng b6dafd1bf4 Merge remote-tracking branch 'origin/master' 2026-09-08 14:56:09 +08:00
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
王野 1ebf4b5147 chore(gitops): update sso image tags to develop-v.1.0.1-202609080646-73, publish db-scripts/sso/develop-v.1.0.1-202609080646-73.sql [skip ci] 2026-09-08 06:49:05 +00:00
薛佳帆 a065577d61 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080646-28 [skip ci] 2026-09-08 06:47:04 +00:00
王野 72ccc9a101 chore(gitops): update sso image tags to develop-v.1.0.1-202609080614-72, publish db-scripts/sso/develop-v.1.0.1-202609080614-72.sql [skip ci] 2026-09-08 06:16:30 +00:00
薛佳帆 6df6d014cc chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080605-27 [skip ci] 2026-09-08 06:05:48 +00: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
薛佳帆 9025e7c012 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080530-26 [skip ci] 2026-09-08 05:31:24 +00:00
王野 e7544ca437 chore(gitops): update edge image tags to develop-v.1.0.1-202609080514-49 [skip ci] 2026-09-08 05:14:49 +00:00
王野 7b2a766983 chore(gitops): update agent image tags to develop-v.1.0.1-202609080512-101 [skip ci] 2026-09-08 05:13:53 +00: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
王野 a7b08c7bed chore(gitops): update ultra image tags to develop-v.1.0.1-202609080512-47 [skip ci] 2026-09-08 05:12:48 +00: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
王野 c9e6b53ea9 chore(gitops): update sso image tags to develop-v.1.0.1-202609080340-71, publish db-scripts/sso/develop-v.1.0.1-202609080340-71.sql [skip ci] 2026-09-08 03:42:41 +00:00
薛佳帆 976736adf1 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080340-25 [skip ci] 2026-09-08 03:40:32 +00:00
王野 8749e07cf9 chore(gitops): update ultra image tags to develop-v.1.0.1-202609080333-46 [skip ci] 2026-09-08 03:34:38 +00: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
王野 ac7a5cad6e chore(gitops): update edge image tags to develop-v.1.0.1-202609080325-48 [skip ci] 2026-09-08 03:27:02 +00: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
王野 45dd0f8413 chore(gitops): update sso image tags to develop-v.1.0.1-202609080319-70, publish db-scripts/sso/develop-v.1.0.1-202609080319-70.sql [skip ci] 2026-09-08 03:22:21 +00:00
薛佳帆 ac81b8c6a2 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080319-24 [skip ci] 2026-09-08 03:19:28 +00:00
王野 13ac6ff7ad chore(gitops): update agent image tags to develop-v.1.0.1-202609080315-100 [skip ci] 2026-09-08 03:16:48 +00:00
王野 f4cadead73 chore(gitops): update sso image tags to develop-v.1.0.1-202609080252-69, publish db-scripts/sso/develop-v.1.0.1-202609080252-69.sql [skip ci] 2026-09-08 02:54:34 +00:00
薛佳帆 f9935652f1 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080252-23 [skip ci] 2026-09-08 02:52:40 +00:00
王野 fe024fa17c chore(gitops): update sso image tags to develop-v.1.0.1-202609080202-68, publish db-scripts/sso/develop-v.1.0.1-202609080202-68.sql [skip ci] 2026-09-08 02:05:06 +00:00
王野 e4da10a370 chore(gitops): update sso image tags to develop-v.1.0.1-202609080140-67, publish db-scripts/sso/develop-v.1.0.1-202609080140-67.sql [skip ci] 2026-09-08 01:41:57 +00:00
薛佳帆 6981130ce1 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080140-22 [skip ci] 2026-09-08 01:40:46 +00:00
王野 ea4a807d09 chore(gitops): update sso image tags to develop-v.1.0.1-202609080130-66, publish db-scripts/sso/develop-v.1.0.1-202609080130-66.sql [skip ci] 2026-09-08 01:33:10 +00:00
薛佳帆 0336c66a9c chore(gitops): update network-agent image tag to develop-v.1.0.1-202609080130-21 [skip ci] 2026-09-08 01:31:51 +00:00
王野 2b2389bc19 chore(gitops): update agent image tags to develop-v.1.0.1-202609070951-99 [skip ci] 2026-09-07 09:53:12 +00:00
王野 c6f768e102 chore(gitops): update agent image tags to develop-v.1.0.1-202609070932-98 [skip ci] 2026-09-07 09:37:56 +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
王野 e5bd90af87 chore(gitops): update edge image tags to develop-v.1.0.1-202609070839-47 [skip ci] 2026-09-07 08:41:01 +00:00
王野 1fd7f70fdf chore(gitops): update ultra image tags to develop-v.1.0.1-202609070837-45 [skip ci] 2026-09-07 08:38:47 +00:00
王野 5c6eb93deb chore(gitops): update sso image tags to develop-v.1.0.1-202609070835-65, publish db-scripts/sso/develop-v.1.0.1-202609070835-65.sql [skip ci] 2026-09-07 08:36:53 +00:00
王野 e0063ba2a9 chore(gitops): update agent image tags to develop-v.1.0.1-202609070829-97 [skip ci] 2026-09-07 08:31:33 +00:00
王野 643ef06d0f chore(gitops): update sso image tags to develop-v.1.0.1-202609070749-64, publish db-scripts/sso/develop-v.1.0.1-202609070749-64.sql [skip ci] 2026-09-07 07:51:40 +00:00
薛佳帆 467a213edb chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070749-20 [skip ci] 2026-09-07 07:49:26 +00:00
薛佳帆 ff4a7b38b6 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070736-19 [skip ci] 2026-09-07 07:36:42 +00:00
薛佳帆 9ec3816dd4 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070733-18 [skip ci] 2026-09-07 07:33:11 +00:00
王野 8978c7a8d0 chore(gitops): update sso image tags to develop-v.1.0.1-202609070718-63, publish db-scripts/sso/develop-v.1.0.1-202609070718-63.sql [skip ci] 2026-09-07 07:20:58 +00:00
薛佳帆 b17353b3b2 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070718-17 [skip ci] 2026-09-07 07:19:02 +00:00
王野 043abc334a chore(gitops): update sso image tags to develop-v.1.0.1-202609070656-62, publish db-scripts/sso/develop-v.1.0.1-202609070656-62.sql [skip ci] 2026-09-07 06:58:30 +00:00
薛佳帆 991f253611 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070656-16 [skip ci] 2026-09-07 06:56:31 +00:00
王野 17dcc7b15b chore(gitops): update sso image tags to develop-v.1.0.1-202609070631-61, publish db-scripts/sso/develop-v.1.0.1-202609070631-61.sql [skip ci] 2026-09-07 06:33:32 +00:00
薛佳帆 901d8eb1e2 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070631-15 [skip ci] 2026-09-07 06:31:36 +00:00
王野 55022c7646 chore(gitops): update sso image tags to develop-v.1.0.1-202609070605-60, publish db-scripts/sso/develop-v.1.0.1-202609070605-60.sql [skip ci] 2026-09-07 06:08:06 +00:00
薛佳帆 1fda08b12d chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070606-14 [skip ci] 2026-09-07 06:06:13 +00:00
王野 e5ac297649 chore(gitops): update sso image tags to develop-v.1.0.1-202609070551-59, publish db-scripts/sso/develop-v.1.0.1-202609070551-59.sql [skip ci] 2026-09-07 05:53:31 +00:00
薛佳帆 49c70a6afb chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070551-13 [skip ci] 2026-09-07 05:51:11 +00:00
王野 21a914a633 chore(gitops): update sso image tags to develop-v.1.0.1-202609070538-58, publish db-scripts/sso/develop-v.1.0.1-202609070538-58.sql [skip ci] 2026-09-07 05:42:41 +00:00
薛佳帆 41d6bf7ae5 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070538-12 [skip ci] 2026-09-07 05:38:34 +00:00
王野 df046a8d0a chore(gitops): update sso image tags to develop-v.1.0.1-202609070340-57, publish db-scripts/sso/develop-v.1.0.1-202609070340-57.sql [skip ci] 2026-09-07 03:47:50 +00:00
薛佳帆 fec260621c chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070340-11 [skip ci] 2026-09-07 03:40:49 +00:00
薛佳帆 4077146d0b chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070335-10 [skip ci] 2026-09-07 03:35:49 +00:00
王野 780688c503 chore(gitops): update sso image tags to develop-v.1.0.1-202609070329-56, publish db-scripts/sso/develop-v.1.0.1-202609070329-56.sql [skip ci] 2026-09-07 03:31:23 +00:00
王野 1630d16a80 chore(gitops): update sso image tags to develop-v.1.0.1-202609070318-55, publish db-scripts/sso/develop-v.1.0.1-202609070318-55.sql [skip ci] 2026-09-07 03:20:18 +00:00
王野 f43e99fb62 chore(gitops): update sso image tags to develop-v.1.0.1-202609070316-54, publish db-scripts/sso/develop-v.1.0.1-202609070316-54.sql [skip ci] 2026-09-07 03:18:57 +00:00
薛佳帆 c6f7425039 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070318-9 [skip ci] 2026-09-07 03:18:28 +00:00
薛佳帆 73911fe15d chore(gitops): update sso image tags to develop-v.1.0.1-202609070252-53, publish db-scripts/sso/develop-v.1.0.1-202609070252-53.sql [skip ci] 2026-09-07 02:54:35 +00:00
薛佳帆 a73c5b2e60 chore(gitops): update sso image tags to develop-v.1.0.1-202609070234-52, publish db-scripts/sso/develop-v.1.0.1-202609070234-52.sql [skip ci] 2026-09-07 02:36:05 +00:00
薛佳帆 2cb26de407 chore(gitops): update sso image tags to develop-v.1.0.1-202609070228-51, publish db-scripts/sso/develop-v.1.0.1-202609070228-51.sql [skip ci] 2026-09-07 02:30:14 +00:00
薛佳帆 4a89b08cf7 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070228-8 [skip ci] 2026-09-07 02:29:05 +00:00
薛佳帆 32193f3c14 chore(gitops): update sso image tags to develop-v.1.0.1-202609070144-50, publish db-scripts/sso/develop-v.1.0.1-202609070144-50.sql [skip ci] 2026-09-07 01:45:17 +00:00
薛佳帆 9477430c5c chore(gitops): update sso image tags to develop-v.1.0.1-202609070136-49, publish db-scripts/sso/develop-v.1.0.1-202609070136-49.sql [skip ci] 2026-09-07 01:38:34 +00:00
薛佳帆 976342041a chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070110-7 [skip ci] 2026-09-07 01:10:58 +00:00
薛佳帆 4428e88531 chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070105-6 [skip ci] 2026-09-07 01:05:53 +00:00
薛佳帆 e18cc37918 refactor(demo): network-agent 从 basic-test 挪到 demo 对齐线上应用族——chart@master + values ref master,镜像 -4(CORS 修复);移除误放的 basic-test 文件(develop/basic-test 分支保留同款) 2026-09-07 09:04:14 +08:00
薛佳帆 cc6547c90e chore(gitops): update network-agent image tag to develop-v.1.0.1-202609070057-5 [skip ci] 2026-09-07 00:57:53 +00:00
薛佳帆 0f79e7d607 chore(basic-test): network-agent 对齐 master——Application values ref 改 master(与全站一致),镜像 tag 更新 develop-v.1.0.1-202609070041-4(CORS 修复) 2026-09-07 08:52:41 +08:00
王野 015ab6771d chore(gitops): update agent image tags to develop-v.1.0.1-202609050719-96 [skip ci] 2026-09-05 07:20:03 +00:00
王野 1c96858a74 feat(config): 移除Agent配置中的共享基础设施PostgreSQL凭据配置
移除了applications/demo/agents.yaml和applications/dev/disabled/agents.yaml中
的sharedInfra.postgres配置部分,同时从environments/demo/agent-common-values.yaml
和environments/dev/agent-common-values.yaml中调整了PostgreSQL配置结构,
将adminUsername改为username并添加了默认密码配置。

删除了不再需要的agent-postgres-role-rollout.md文档和
upsert-agent-postgres-credentials.sh脚本,简化了数据库凭据管理流程。

更新了environments/demo/agents.yaml和environments/dev/agents.yaml中
的Agent配置,移除了databaseUsername和postgresCredentialsSecret字段。
2026-09-05 15:18:41 +08:00
王野 067c15f023 chore(gitops): update agent image tags to develop-v.1.0.1-202609050625-95 [skip ci] 2026-09-05 06:26:56 +00:00
王野 e41c1ef463 Merge branch 'develop/v.1.0.1' 2026-09-04 22:36:38 +08:00
薛佳帆 5f96542180 Merge branch 'develop/v.1.0.1' 2026-09-04 16:24:36 +08:00
薛佳帆 3576205a5f chore(gitops): update sso image tags to develop-v.1.0.1-202609040753-48, publish db-scripts/sso/develop-v.1.0.1-202609040753-48.sql [skip ci] 2026-09-04 07:56:12 +00:00
王野 dd2237e24f chore(gitops): update ultra image tags to develop-v.1.0.1-202609030137-44 [skip ci] 2026-09-03 01:38:36 +00:00
王野 ffc9b44c73 chore(gitops): update agent image tags to develop-v.1.0.1-202609030136-94 [skip ci] 2026-09-03 01:38:16 +00:00
薛佳帆 dd8eabb5c4 chore(gitops): update sso image tags to develop-v.1.0.1-202609030134-47, publish db-scripts/sso/develop-v.1.0.1-202609030134-47.sql [skip ci] 2026-09-03 01:37:39 +00:00
王野 f5cba5e02b chore(gitops): update agent image tags to develop-v.1.0.1-202609030106-93 [skip ci] 2026-09-03 01:08:37 +00:00
王野 b58a2f5999 chore(gitops): update ultra image tags to develop-v.1.0.1-202609020615-43 [skip ci] 2026-09-02 06:15:50 +00:00
薛佳帆 5c331131e3 chore(gitops): update sso image tags to develop-v.1.0.1-202609020612-46, publish db-scripts/sso/develop-v.1.0.1-202609020612-46.sql [skip ci] 2026-09-02 06:15:06 +00:00
王野 3e72986505 chore(gitops): update agent image tags to develop-v.1.0.1-202609020612-92 [skip ci] 2026-09-02 06:14:55 +00:00
薛佳帆 52ada1e565 chore(gitops): update agent image tags to develop-v.1.0.1-202608310823-91 [skip ci] 2026-08-31 08:26:30 +00:00
薛佳帆 d6d2c53c09 chore(gitops): update agent image tags to develop-v.1.0.1-202608310804-90 [skip ci] 2026-08-31 08:06:21 +00:00
薛佳帆 28b5c53412 chore(gitops): update agent image tags to develop-v.1.0.1-202608310755-89 [skip ci] 2026-08-31 07:57:14 +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
王野 66e5a206f5 chore(gitops): update ultra image tags to develop-v.1.0.1-202608310641-42 [skip ci] 2026-08-31 06:42:10 +00:00
薛佳帆 a5f763a572 chore(gitops): update agent image tags to develop-v.1.0.1-202608310639-88 [skip ci] 2026-08-31 06:41:54 +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
王野 e42e16c972 chore(gitops): update edge image tags to develop-v.1.0.1-202608280807-46 [skip ci] 2026-08-28 08:08:47 +00:00
王野 05f8fc31ff chore(gitops): update agent image tags to develop-v.1.0.1-202608280806-87 [skip ci] 2026-08-28 08:07:02 +00:00
王野 54b43d98bb chore(gitops): update ultra image tags to develop-v.1.0.1-202608280805-41 [skip ci] 2026-08-28 08:05:55 +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
王野 564b51f990 chore(gitops): update ultra image tags to develop-v.1.0.1-202608270542-37 [skip ci] 2026-08-27 05:43:51 +00: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
薛佳帆 27d9b76d63 chore(gitops): update agent image tags to develop-v.1.0.1-202608260227-79 [skip ci] 2026-08-26 02:29:42 +00:00
薛佳帆 28fa6b5b53 chore(gitops): update agent image tags to develop-v.1.0.1-202608260206-78 [skip ci] 2026-08-26 02:09:51 +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
薛佳帆 fa5d18a8b7 chore(gitops): update agent image tags to develop-v.1.0.1-202608250723-77 [skip ci] 2026-08-25 07:25:56 +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
薛佳帆 811f6216ab chore(gitops): update agent image tags to develop-v.1.0.1-202608250630-76 [skip ci] 2026-08-25 06:31:59 +00:00
王野 c51aa0cb2e chore(gitops): update ultra image tags to develop-v.1.0.1-202608250631-35 [skip ci] 2026-08-25 06:31:50 +00:00
薛佳帆 86d69d1c3c chore(gitops): update sso image tags to develop-v.1.0.1-202608250629-41 [skip ci] 2026-08-25 06:30:57 +00:00
王野 3cce1c4a78 chore(gitops): update ultra image tags to develop-v.1.0.1-202608250505-34 [skip ci] 2026-08-25 05:06:16 +00:00
薛佳帆 1714f9a3ef chore(gitops): update agent image tags to develop-v.1.0.1-202608250504-75 [skip ci] 2026-08-25 05:05:22 +00:00
薛佳帆 8b7a875cc5 chore(gitops): update sso image tags to develop-v.1.0.1-202608250502-40 [skip ci] 2026-08-25 05:04:03 +00:00
王野 408059b616 chore(gitops): update ultra image tags to develop-v.1.0.1-202608240846-33 [skip ci] 2026-08-24 08:46:50 +00:00
薛佳帆 84a9bd86df chore(gitops): update agent image tags to develop-v.1.0.1-202608240845-74 [skip ci] 2026-08-24 08:46:20 +00:00
王野 43669888d7 chore(gitops): update ultra image tags to develop-v.1.0.1-202608240845-32 [skip ci] 2026-08-24 08:46:11 +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
王野 5cad07d750 chore(gitops): update sso image tags to develop-v.1.0.1-202608240839-39 [skip ci] 2026-08-24 08:41:04 +00:00
王野 3b251fcb3a chore(gitops): update ultra image tags to develop-v.1.0.1-202608240522-31 [skip ci] 2026-08-24 05:23:42 +00:00
薛佳帆 09c3fef72d chore(gitops): update agent image tags to develop-v.1.0.1-202608240519-73 [skip ci] 2026-08-24 05:22:19 +00:00
王野 3199374132 chore(gitops): update sso image tags to develop-v.1.0.1-202608240519-38 [skip ci] 2026-08-24 05:21:57 +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
薛佳帆 745d667c88 chore(gitops): update agent image tags to develop-v.1.0.1-202608200909-72 [skip ci] 2026-08-20 09:12:38 +00:00
薛佳帆 87b8c6a23d chore(gitops): update protocol image tags to develop-v.1.0.1-202608200840-21 [skip ci] 2026-08-20 08:40:33 +00:00
王野 c2979f297e chore(gitops): update agent image tags to develop-v.1.0.1-202608200835-71 [skip ci] 2026-08-20 08:38:14 +00:00
薛佳帆 ebd7d84f56 chore(gitops): update agent image tags to develop-v.1.0.1-202608200814-70 [skip ci] 2026-08-20 08:17:07 +00: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
薛佳帆 0a9fc004ec chore(gitops): update sso image tags to develop-v.1.0.1-202608200414-37 [skip ci] 2026-08-20 04:14:56 +00:00
薛佳帆 3e008b8363 chore(gitops): update agent image tags to develop-v.1.0.1-202608200340-69 [skip ci] 2026-08-20 03:41:53 +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
薛佳帆 420ac39dee chore(gitops): update agent image tags to develop-v.1.0.1-202608200307-68 [skip ci] 2026-08-20 03:09:35 +00:00
薛佳帆 b078eb588c chore(gitops): update sso image tags to develop-v.1.0.1-202608200305-36 [skip ci] 2026-08-20 03:07:11 +00:00
ximenchuifeng f30c6edd04 Merge branch 'develop/v.1.0.1' 2026-08-20 11:05:50 +08:00
薛佳帆 e388f0a001 chore(gitops): update agent image tags to develop-v.1.0.1-202608190856-67 [skip ci] 2026-08-19 08:58:26 +00:00
薛佳帆 104de13c98 chore(gitops): update agent image tags to develop-v.1.0.1-202608190843-66 [skip ci] 2026-08-19 08:45:52 +00:00
薛佳帆 7d311fd12d chore(gitops): update sso image tags to develop-v.1.0.1-202608190656-35 [skip ci] 2026-08-19 07:02:08 +00: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
薛佳帆 2011fc27a3 chore(gitops): update agent image tags to develop-v.1.0.1-202608190647-65 [skip ci] 2026-08-19 06:50:38 +00:00
王野 187d0ebd24 chore(gitops): update agent image tags to develop-v.1.0.1-202608190551-64 [skip ci] 2026-08-19 05:54:39 +00:00
薛佳帆 ac370539fd chore(gitops): update agent image tags to develop-v.1.0.1-202608190125-63 [skip ci] 2026-08-19 01:28:09 +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
王野 48c08abb17 chore(gitops): update agent image tags to develop-v.1.0.1-202608170634-60 [skip ci] 2026-08-17 06:36:59 +00:00
王野 20f662dc0e chore(gitops): update ultra image tags to develop-v.1.0.1-202608170635-27 [skip ci] 2026-08-17 06:36:40 +00:00
王野 a7f3cab88b chore(gitops): update agent image tags to develop-v.1.0.1-202608170616-59 [skip ci] 2026-08-17 06:16:57 +00:00
王野 8ae86daf23 chore(gitops): update ultra image tags to develop-v.1.0.1-202608170616-26 [skip ci] 2026-08-17 06:16:55 +00:00
王野 faa51d5237 chore(gitops): update agent image tags to develop-v.1.0.1-202608170519-58 [skip ci] 2026-08-17 05:22:04 +00:00
王野 14196f2c4c chore(gitops): update ultra image tags to develop-v.1.0.1-202608170518-25 [skip ci] 2026-08-17 05:20:56 +00:00
薛佳帆 61bdbf4a34 chore(gitops): update agent image tags to develop-v.1.0.1-202608170319-57 [skip ci] 2026-08-17 03:21:34 +00:00
薛佳帆 59e6a53078 chore(gitops): update agent image tags to develop-v.1.0.1-202608170300-56 [skip ci] 2026-08-17 03:03:26 +00:00
薛佳帆 25e8ff6545 chore(gitops): update agent image tags to develop-v.1.0.1-202608170230-55 [skip ci] 2026-08-17 02:32:18 +00:00
薛佳帆 be0c5aa7e6 chore(gitops): update agent image tags to develop-v.1.0.1-202608170221-54 [skip ci] 2026-08-17 02:23:40 +00:00
薛佳帆 9df2d51ffb chore(gitops): update agent image tags to develop-v.1.0.1-202608170154-53 [skip ci] 2026-08-17 01:55:49 +00:00
薛佳帆 e769108a55 chore(gitops): update sso image tags to develop-v.1.0.1-202608170152-34 [skip ci] 2026-08-17 01:53:45 +00:00
薛佳帆 972e797519 chore(gitops): update ultra image tags to develop-v.1.0.1-202608140850-24 [skip ci] 2026-08-14 08:51:27 +00:00
薛佳帆 6b7aab18e7 chore(gitops): update agent image tags to develop-v.1.0.1-202608140847-52 [skip ci] 2026-08-14 08:50:07 +00:00
薛佳帆 2362b51bbe chore(gitops): update agent image tags to develop-v.1.0.1-202608140408-51 [skip ci] 2026-08-14 04:11:45 +00:00
薛佳帆 2410e6666a chore(gitops): update ultra image tags to develop-v.1.0.1-202608140407-23 [skip ci] 2026-08-14 04:10:35 +00:00
薛佳帆 186147cb1e chore(gitops): update ultra image tags to develop-v.1.0.1-202608130912-22 [skip ci] 2026-08-13 09:14:37 +00:00
薛佳帆 2e8faed377 chore(gitops): update agent image tags to develop-v.1.0.1-202608130906-50 [skip ci] 2026-08-13 09:08:06 +00:00
薛佳帆 500595e44a chore(gitops): update sso image tags to develop-v.1.0.1-202608130903-33 [skip ci] 2026-08-13 09:05:50 +00:00
薛佳帆 1bdba135c8 chore(gitops): update agent image tags to develop-v.1.0.1-202608130700-49 [skip ci] 2026-08-13 07:03:00 +00:00
薛佳帆 369dabe03e chore(gitops): update agent image tags to develop-v.1.0.1-202608130401-48 [skip ci] 2026-08-13 04:03:22 +00:00
薛佳帆 6b15b83734 chore(gitops): update agent image tags to develop-v.1.0.1-202608130253-47 [skip ci] 2026-08-13 02:56:14 +00:00
薛佳帆 4ab3dec306 chore(gitops): update agent image tags to develop-v.1.0.1-202608130207-45 [skip ci] 2026-08-13 02:10:05 +00:00
薛佳帆 f459a4a540 chore(gitops): update agent image tags to develop-v.1.0.1-202608120901-44 [skip ci] 2026-08-12 09:02:22 +00:00
薛佳帆 9bfa27b530 chore(gitops): update agent image tags to develop-v.1.0.1-202608120841-43 [skip ci] 2026-08-12 08:42:47 +00:00
薛佳帆 7bb415d9ce chore(gitops): update sso image tags to develop-v.1.0.1-202608120836-32 [skip ci] 2026-08-12 08:40:50 +00:00
薛佳帆 e4529d00dd chore(gitops): update agent image tags to develop-v.1.0.1-202608120232-42 [skip ci] 2026-08-12 02:59:45 +00:00
王野 fcb63fe5f1 chore(gitops): update sso image tags to develop-v.1.0.1-202608111318-31 [skip ci] 2026-08-11 13:19:35 +00:00
王野 d7d8bd57f0 chore(gitops): update edge image tags to develop-v.1.0.1-202608111317-42 [skip ci] 2026-08-11 13:19:04 +00:00
王野 00cbf1771a chore(gitops): update ultra image tags to develop-v.1.0.1-202608111317-19 [skip ci] 2026-08-11 13:18:52 +00:00
王野 440ad8d617 chore(gitops): update agent image tags to develop-v.1.0.1-202608111303-41 [skip ci] 2026-08-11 13:06:10 +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
薛佳帆 a059c96528 chore(gitops): update agent image tags to develop-v.1.0.1-202608111119-40 [skip ci] 2026-08-11 11:21:34 +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
王野 145b1c1311 chore(gitops): update agent image tags to develop-v.1.0.1-202608110703-39 [skip ci] 2026-08-11 07:05:19 +00:00
王野 f4f34013af chore(gitops): update agent image tags to develop-v.1.0.1-202608110644-38 [skip ci] 2026-08-11 06:45:47 +00:00
王野 74324d6e18 chore(gitops): update edge image tags to develop-v.1.0.1-202608110643-38 [skip ci] 2026-08-11 06:45:01 +00:00
薛佳帆 4c9a3ca763 Merge branch 'develop/v.1.0.1' 2026-08-11 14:39:08 +08:00
薛佳帆 b8f2839f7a chore(gitops): update protocol image tags to develop-v.1.0.1-202608110634-18 [skip ci] 2026-08-11 06:34:42 +00:00
薛佳帆 abbeaa7e1c chore(gitops): update protocol image tags to develop-v.1.0.1-202608110621-17 [skip ci] 2026-08-11 06:21:59 +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
王野 865e5150d0 chore(gitops): update agent image tags to develop-v.1.0.1-202608110618-37 [skip ci] 2026-08-11 06:19:41 +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
王野 94f88b6978 chore(gitops): update agent image tags to develop-v.1.0.1-202608110421-36 [skip ci] 2026-08-11 04:23:34 +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
王野 f4dfc21beb chore(gitops): update ultra image tags to develop-v.1.0.1-202608070902-14 [skip ci] 2026-08-07 09:04:24 +00:00
王野 e18d714efe chore(gitops): update sso image tags to develop-v.1.0.1-202608070902-25 [skip ci] 2026-08-07 09:03:07 +00:00
王野 520f14f87a chore(gitops): update agent image tags to develop-v.1.0.1-202608070859-31 [skip ci] 2026-08-07 09:02:25 +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
王野 dd562f9999 chore(gitops): update agent image tags to develop-v.1.0.1-202608070748-30 [skip ci] 2026-08-07 07:51:30 +00:00
王野 c281edc559 chore(gitops): update edge image tags to develop-v.1.0.1-202608070748-26 [skip ci] 2026-08-07 07:51:09 +00:00
王野 a0e2458691 chore(gitops): update agent image tags to develop-v.1.0.1-202608070540-29 [skip ci] 2026-08-07 05:42:41 +00:00
王野 7e144debec chore(gitops): update edge image tags to develop-v.1.0.1-202608070411-25 [skip ci] 2026-08-07 04:12:47 +00:00
王野 87c3079b29 chore(gitops): update agent image tags to develop-v.1.0.1-202608070410-28 [skip ci] 2026-08-07 04:12:31 +00:00
王野 5bfb9c4c0d chore(gitops): update sso image tags to develop-v.1.0.1-202608070410-24 [skip ci] 2026-08-07 04:11:03 +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
王野 a756623d47 chore(gitops): update sso image tags to develop-v.1.0.1-202608070341-23 [skip ci] 2026-08-07 03:44:04 +00:00
王野 240561a7bc chore(gitops): update agent image tags to develop-v.1.0.1-202608070055-26 [skip ci] 2026-08-07 00:58:49 +00:00
薛佳帆 c77e0fc832 chore(gitops): update sso image tags to develop-v.1.0.1-202608070050-22 [skip ci] 2026-08-07 00:53:33 +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
薛佳帆 6dcd9bb86d chore(gitops): update ultra image tags to develop-v.1.0.1-202608060536-13 [skip ci] 2026-08-06 05:39:21 +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
41 changed files with 1725 additions and 169 deletions

No files matched your search

+110
View File
@@ -0,0 +1,110 @@
# ============================================================================
# .drone.yml — MixingX 交付晋级流水线(release-promote)— 本仓库第一条流水线
#
# 触发方式: 手动 (Drone Web 界面 → 打开 mixingx.deploy → NEW BUILD)
# 参数(可选,均有默认;Drone custom build 参数以同名环境变量注入各 step):
# RELEASE_VERSION — 交付版本号 v1.0.1;不传则自动递增 patch(查 chart 仓库上一个 tag);
# 可显式指定已存在版本(幂等复用,同版本发多客户)
# CUSTOMER — 客户目录名,默认 mxlexus(唯一客户时可省略)
# PLAN — 按服务交付计划(JSON 数组,每服务一条),示例:
# [{"service":"sso","action":"deliver","harborTag":"develop-v.1.0.1-202608250629-41"},
# {"service":"agent","action":"reuse","version":"v1.0.1"},
# {"service":"ultra","action":"keep"}]
# service: gateway/sso/ultra/audit/agent/edge;
# action: keep(缺省)/reuse(复用已交付版本)/deliver(交付 Harbor tag,
# 缺省取 demo 当前)/ci-now(行为同 deliver,release-notes 记为 ci-now)
# SERVICES — 兼容参数,逗号分隔服务名 = 这些服务 deliver(其余 keep)
# IMAGES — 兼容参数,逗号分隔 svc=harborTag = 该服务 deliver 且显式指定 tag
# (PLAN 存在时优先于 SERVICES/IMAGES;全空 = 6 服务全量交付,与改造前一致)
# CHART_ONLY — true 时只发 chart:跳过镜像基线与 retag,pin 只动 chart
# targetRevision 与 release-notes,默认 false
# RELEASE_NOTES — 发布说明,写入客户 release-notes.yaml,默认空
# DB_CHANGE — 逗号分隔服务名,本次含 DB 变更(须为本次非 keep 服务的子集),默认空
# OPERATOR — 发布操作人,默认 drone
# PROMOTE_PROTOCOLS — true 时连 protocol mock 镜像一起晋级,默认 false(现场不部署)
#
# 职责(四步,详见 ci/promote.sh;按服务部分交付设计见 hub docs/adr/0074):
# prepare: 解析 PLAN/版本号 + 生成交付基线 + 核对交付镜像清单
# retag : 基线镜像 develop-* → v1.0.x,bit 级复制推 ACR(ADR-0067,部分交付见
# hub docs/adr/0074),逐镜像记录 digest
# chart : chart 仓库 bump Chart.yaml + 打 tag chart-v1.0.x(已存在则复用跳过;
# 纯复用发布整步跳过)
# pin : release 分支客户目录按服务钉版(镜像 tag + chart tag) + release-notes.yaml
#
# 边界:
# - 不构建任何镜像(构建属于 9 个源码仓库的流水线)
# - 不触碰 deploy master(demo 写回由构建流水线负责)
# - git push 凭证走 Drone netrc 自动注入;推 ACR 走 secrets(acr_push_*)
# - 凭证禁止走构建参数(会明文进构建历史,ADR-0066)
#
# Secrets (Drone → mixingx.deploy → Settings → Secrets):
# acr_push_username / acr_push_password — ACR 推送凭证(✅ 已配置)
# harbor_username / harbor_password — Harbor 凭证(prepare 校验显式 harborTag 存在性;
# 未配置则跳过校验并警告)
# ============================================================================
kind: pipeline
type: docker
name: release-promote
trigger:
event:
- custom # 仅手动触发;push 事件(demo 写回)不触发任何东西
steps:
# ═══════════════════════════════════════════
# Step 1: 准备 — 解析 PLAN + 版本号 + 交付基线 + 镜像清单核对
# ═══════════════════════════════════════════
- name: prepare
image: 192.168.1.119:8888/mixingx/gitops-tools:latest
pull: if-not-exists
environment:
HARBOR_USER:
from_secret: harbor_username
HARBOR_PASS:
from_secret: harbor_password
commands:
- sh ci/promote.sh prepare
# ═══════════════════════════════════════════
# Step 2: 镜像晋级 — pull 119 → tag ACR → push + 记录 digest
# ═══════════════════════════════════════════
- name: retag-images
image: docker:24-dind
pull: if-not-exists
privileged: true
volumes:
- name: dockersock
path: /var/run/docker.sock
environment:
ACR_USER:
from_secret: acr_push_username
ACR_PASS:
from_secret: acr_push_password
ACR_REGISTRY: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com
HARBOR_REGISTRY: 192.168.1.119:8888/mixingx
commands:
- sh ci/promote.sh retag
# ═══════════════════════════════════════════
# Step 3: chart 版本化 — bump Chart.yaml + tag chart-v1.0.x(已存在则复用)
# ═══════════════════════════════════════════
- name: chart-tag
image: 192.168.1.119:8888/mixingx/gitops-tools:latest
pull: if-not-exists
commands:
- sh ci/promote.sh chart
# ═══════════════════════════════════════════
# Step 4: 交付分支钉版 — release 分支客户目录按服务钉版 + release-notes
# ═══════════════════════════════════════════
- name: pin-release
image: 192.168.1.119:8888/mixingx/gitops-tools:latest
pull: if-not-exists
commands:
- sh ci/promote.sh pin
volumes:
- name: dockersock
host:
path: /var/run/docker.sock
+6
View File
@@ -17,6 +17,12 @@ Demo environment:
2. Apply or create `bootstrap/mixingx-demo-root.yaml`.
3. Argo CD will create/sync the applications under `applications/`.
Dev environment (retired):
- The dev environment (namespace `mixingx-dev`, `dev.mixingx.local`) is retired; local development is covered by Aspire in `mixingx.hub`.
- Its manifests are kept inert under `applications/dev/disabled/` and `bootstrap/disabled/`; values under `environments/dev/` are kept for reference.
- See `applications/dev/README.md` for the rationale and re-enable steps.
Agent and edge fleets:
- `applications/agents.yaml` is an Argo CD ApplicationSet.
+6 -8
View File
@@ -11,7 +11,7 @@ spec:
- matrix:
generators:
- git:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
revision: master
files:
- path: environments/demo/agents.yaml
@@ -23,7 +23,7 @@ spec:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-agent-unit
helm:
@@ -35,21 +35,19 @@ spec:
site: "{{ .id }}"
description: "{{ .description }}"
phaseType: "{{ .phaseType }}"
sharedInfra:
postgres:
appUsername: "{{ .databaseUsername }}"
credentialsSecret:
name: "{{ .postgresCredentialsSecret }}"
{{- if hasKey . "nodeLabel" }}
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
{{- end }}
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+5 -2
View File
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-audit
helm:
@@ -14,12 +14,15 @@ spec:
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/audit-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+29
View File
@@ -0,0 +1,29 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-codeserver
namespace: argocd
spec:
project: default
sources:
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-codeserver
helm:
releaseName: mixingx-codeserver
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/codeserver-values.yaml
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
# 测试工具,自动同步(同客户仓先例);prune=false 与根应用一致
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-platform
helm:
@@ -14,12 +14,15 @@ spec:
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/platform-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+19 -3
View File
@@ -11,7 +11,7 @@ spec:
- matrix:
generators:
- git:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
revision: master
files:
- path: environments/demo/edges.yaml
@@ -23,7 +23,7 @@ spec:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-edge-unit
helm:
@@ -39,12 +39,28 @@ spec:
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
{{- end }}
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
{{- /* ADS Router 逐实例身份透传(chart 默认 enabled=true):实例缺 adsRouter
身份时不在此兜底,由 chart 渲染守卫明确拒绝。 */ -}}
{{- if hasKey . "adsRouter" }}
adsRouter:
localNetId: "{{ .adsRouter.localNetId }}"
publicAddress: "{{ .adsRouter.publicAddress }}"
{{- if hasKey .adsRouter "clientEndPoint" }}
clientEndPoint: "{{ .adsRouter.clientEndPoint }}"
{{- end }}
{{- if hasKey .adsRouter "externalPort" }}
externalPort: {{ .adsRouter.externalPort }}
{{- end }}
{{- end }}
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+5 -2
View File
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-gateway
helm:
@@ -14,12 +14,15 @@ spec:
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/gateway-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+5 -2
View File
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-infra
helm:
@@ -14,12 +14,15 @@ spec:
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/infra-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+4 -1
View File
@@ -6,12 +6,15 @@ metadata:
spec:
project: default
source:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
path: networking/longhorn-ui
destination:
server: https://kubernetes.default.svc
namespace: longhorn-system
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+3
View File
@@ -40,5 +40,8 @@ spec:
server: https://kubernetes.default.svc
namespace: longhorn-system
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+28
View File
@@ -0,0 +1,28 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-mqttx
namespace: argocd
spec:
project: default
sources:
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-mqttx
helm:
releaseName: mixingx-mqttx
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/mqttx-values.yaml
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
@@ -6,20 +6,23 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-network-agent
helm:
releaseName: mixingx-network-agent
valueFiles:
- $values/environments/basic-test/image-version.yaml
- $values/environments/basic-test/network-agent-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: develop/basic-test
- $values/environments/demo/image-version.yaml
- $values/environments/demo/network-agent-values.yaml
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+6 -3
View File
@@ -11,7 +11,7 @@ spec:
- matrix:
generators:
- git:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
revision: master
files:
- path: environments/demo/protocol-servers.yaml
@@ -23,7 +23,7 @@ spec:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-protocol-server-unit
helm:
@@ -46,12 +46,15 @@ spec:
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
{{- end }}
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+5 -2
View File
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-sso
helm:
@@ -14,12 +14,15 @@ spec:
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/sso-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+4 -1
View File
@@ -6,12 +6,15 @@ metadata:
spec:
project: default
source:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
path: storageclasses
destination:
server: https://kubernetes.default.svc
namespace: argocd
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- PruneLast=true
+5 -2
View File
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
- repoURL: http://git.mixingx.local/trace/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-ultra
helm:
@@ -14,12 +14,15 @@ spec:
valueFiles:
- $values/environments/demo/image-version.yaml
- $values/environments/demo/ultra-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
- repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+62
View File
@@ -0,0 +1,62 @@
# Dev 环境(已退役)
> 状态:自 2026-08-26 起退役。本目录仅保留历史配置与启用说明,Argo CD 不再同步 dev 环境。
## 为什么退役
- dev 环境的历史使命是验证 mixingx.deploy「分支 + 文件夹」GitOps 结构(master 分支 + `environments/`、`applications/` 按环境分目录)是否可行。该结构已被 demo 环境与 mxlexus 客户现场(release 分支)生产性使用,验证目的已达成。
- 本地开发由 Aspire(`aspire run`,见 mixingx.hub 仓库)完整覆盖,反馈更快,不再需要 K8s dev 环境。
- dev 使用的伞形 chart `release-charts/mixingx-platform` 是 demo 已淘汰的旧部署模式(参见 `applications/demo/disabled/platform-legacy.yaml`),与当前「每服务独立 release」的目标形态不一致。
## 保留了什么
- `disabled/` 下三个清单:`platform.yaml`(伞形平台 Application)、`agents.yaml` / `edges.yaml`(ApplicationSet)。根 Application 的目录源不递归子目录,放这里即不会被同步,与 `applications/demo/disabled/` 同一先例。
- `bootstrap/disabled/mixingx-dev-root.yaml`:dev 的 app-of-apps 根 Application。
- `environments/dev/` 下全部 values 原样保留(image-version、platform-values、agents、edges、`*-common-values`)。
注意:`mixingx-platform` chart 是 dev 唯一的消费者,退役后它在 `release-charts/` 中已无活体使用。重新启用 dev 前先确认该 chart 仍存在且受维护;若已被清理,应按 demo 的「每服务独立 release」模式重建,而不是恢复伞形模式。
## 集群侧清理(退役时执行一次)
根 Application 与子 Application 不会自动消失(root 的 syncPolicy 是 `prune: false`),需要在集群里手动删除:
```bash
kubectl -n argocd delete application mixingx-dev-root
kubectl -n argocd delete application mixingx-dev-platform mixingx-dev-agents mixingx-dev-edges
kubectl -n argocd delete application mixingx-dev-agent-demo mixingx-dev-edge-demo # ApplicationSet 生成的实例
kubectl delete namespace mixingx-dev
```
- Postgres / edge 数据盘的 PVC 带 `helm.sh/resource-policy: keep`,namespace 删除后 PV 可能残留,按需手动清理。
- 存储类(`longhorn-platform` / `longhorn-edge-local`)由 demo 的 storageclasses Application 管理,**不要删**。
## 如何重新启用
1. 前置条件:
- 集群已安装 Argo CD 并注册两个仓库(`mixingx.deploy.git`、`mixingx.hub.chart.git`)。
- 存储类存在:`kubectl get sc longhorn-platform longhorn-edge-local`(若集群上没有 demo 环境,先 apply `storageclasses/longhorn-demo.yaml`)。
- 节点标签:agent 默认调度到 `mixingx.io/edge-node=node1`、edge 到 `node2`(见 `environments/dev/agents.yaml`、`edges.yaml` 的 `nodeLabel`);按实际节点重新打标,或删掉 `nodeLabel` 字段。
- hosts/DNS:`dev.mixingx.local` 指向集群 ingress(traefik)。
- 镜像 tag:`environments/dev/image-version.yaml` 里只有一个历史分支构建的全局 tag,启用前确认 Harbor 上仍存在;不存在就先跑对应 Drone 流水线产出新 tag 再改该文件(dev 没有 CI 写回,tag 需手动维护)。
2. 恢复清单并推送:
```bash
mv applications/dev/disabled/*.yaml applications/dev/
mv bootstrap/disabled/mixingx-dev-root.yaml bootstrap/
git add -A && git commit && git push # 推到 master
```
3. 引导(根 Application 不自动创建,需手动 apply):
```bash
kubectl apply -f bootstrap/mixingx-dev-root.yaml
```
root 会建出 `mixingx-dev-platform` / `mixingx-dev-agents` / `mixingx-dev-edges` 三个子应用;子应用默认不自动 sync,需在 Argo CD UI 手动 Sync。
4. 验证:
```bash
kubectl -n mixingx-dev get pods
```
浏览器访问 `http://dev.mixingx.local`。
@@ -35,11 +35,6 @@ spec:
site: "{{ .id }}"
description: "{{ .description }}"
phaseType: "{{ .phaseType }}"
sharedInfra:
postgres:
appUsername: "{{ .databaseUsername }}"
credentialsSecret:
name: "{{ .postgresCredentialsSecret }}"
{{- if .nodeLabel }}
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
@@ -35,10 +35,22 @@ spec:
site: "{{ .id }}"
idWorkerId: {{ .idWorkerId }}
description: "{{ .description }}"
{{- if .nodeLabel }}
{{- if hasKey . "nodeLabel" }}
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
{{- end }}
{{- /* ADS Router 逐实例身份透传,契约同 demo(本模板保持停用)。 */ -}}
{{- if hasKey . "adsRouter" }}
adsRouter:
localNetId: "{{ .adsRouter.localNetId }}"
publicAddress: "{{ .adsRouter.publicAddress }}"
{{- if hasKey .adsRouter "clientEndPoint" }}
clientEndPoint: "{{ .adsRouter.clientEndPoint }}"
{{- end }}
{{- if hasKey .adsRouter "externalPort" }}
externalPort: {{ .adsRouter.externalPort }}
{{- end }}
{{- end }}
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: master
ref: values
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -6,7 +6,7 @@ metadata:
spec:
project: default
source:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
repoURL: http://git.mixingx.local/trace/mixingx.deploy.git
targetRevision: master
path: applications/demo
destination:
+25
View File
@@ -0,0 +1,25 @@
#!/bin/sh
# ============================================================================
# ci/auto-bump.sh — 交付版本号自动递增(release-promote 未传 RELEASE_VERSION 时调用)
#
# 规则: 查 chart 仓库已有 chart-vX.Y.Z tag 的最大值,patch +1;
# 无任何 tag 时从 v1.0.1 起步(与现有 appVersion 1.0.1 谱系对齐)。
# 输出: v1.0.2 这样的版本号(stdout,单行)
# ============================================================================
set -eu
CHART_REPO="${CHART_REPO:-http://git.mixingx.local/trace/mixingx.hub.chart.git}"
latest=$(git ls-remote --tags "$CHART_REPO" 'refs/tags/chart-v*' \
| sed -E 's#.*refs/tags/chart-v##' \
| sort -t. -k1,1n -k2,2n -k3,3n | tail -1 || true)
if [ -z "$latest" ]; then
echo "v1.0.1"
exit 0
fi
major=$(echo "$latest" | cut -d. -f1)
minor=$(echo "$latest" | cut -d. -f2)
patch=$(echo "$latest" | cut -d. -f3)
patch=$((patch + 1))
echo "v${major}.${minor}.${patch}"
Executable
+965
View File
@@ -0,0 +1,965 @@
#!/bin/sh
# ============================================================================
# ci/promote.sh — 交付晋级脚本(release-promote 流水线的执行体)— ADR-0067
# 按服务计划(PLAN)部分交付,设计见 hub docs/adr/0074
#
# 子命令(由 .drone.yml 的四个 step 分别调用;状态经 $WS 下的 .release-env /
# .baseline / .digests / .plan.json 文件在 step 间传递,WS=${DRONE_WORKSPACE:-/drone/src}):
#
# prepare 解析 PLAN/RELEASE_VERSION/CUSTOMER,生成交付基线(.baseline)与规范化
# 计划(.plan.json),克隆 chart 仓库核对交付镜像清单
# retag 基线镜像 pull 119 → tag ACR:vX.Y.Z → push(bit 级复制,不重新构建),
# 逐镜像记录 digest(.digests,供 release-notes 反向追踪)
# chart chart 仓库 Chart.yaml bump + commit + tag chart-vX.Y.Z + push
# (tag 已存在则复用跳过;纯复用发布整步跳过)
# pin release 分支:按 PLAN 逐服务钉 image tag(image-version keys 与/或
# valuesFiles 里的 image.tag)与 chart targetRevision(appFile 非空时),
# 追加 release-notes.yaml(最新在前),push
#
# 服务计划 PLAN(JSON 数组,每服务一条;未出现的服务 = keep):
# [{"service":"sso","action":"deliver","harborTag":"develop-v.1.0.1-202608250629-41"},
# {"service":"agent","action":"reuse","version":"v1.0.1"},
# {"service":"ultra","action":"keep"},
# {"service":"wifi","action":"pin-acr","acrTag":"develop-v.1.0.1-202609080530-26",
# "repos":["network-agent"],"keys":[],"appFile":"",
# "valuesFiles":["network-agent-values.yaml"]}]
# service: 任意服务名(六内置 + 带映射的自定义服务,见下)
# action : keep(缺省,不动)
# reuse(复用已交付版本 version,镜像已在 ACR 不重推)
# deliver(harborTag 为未交付过的 Harbor tag,缺省取 demo 当前,retag 到新版本号)
# ci-now(行为同 deliver,仅 release-notes 如实记录为 ci-now)
# pin-acr(acrTag 为 ACR 上已有 tag,原样钉进客户目录,不搬运不 retag——
# 镜像搬运已剥离给门户「直推 ACR」;版本号即所选 tag 名,
# chart 引用保持不变,ArgoCD 由 values 变更触发 sync)
# 交付映射(PLAN 条目自带,带任一字段即整体信任,缺省字段视为空):
# repos Harbor 镜像仓列表(retag/pin 的镜像来源;自带映射时必填)
# keys environments/<客户>/image-version.yaml 的行名(空 = 不进版本表)
# appFile applications/<客户>/ 下的 Application 文件(空 = 不随统一 chart,
# 即独立 chart 服务,Application 引用其自有 chart 的 master)
# valuesFiles environments/<客户>/ 下的 values 文件列表(钉版落点:替换其中
# image.tag;形态兼容 整行 registry/repo:tag / repository+tag 拆分 /
# image: 块下 tag:)
# 未带映射的条目回退 REPOS/KEYS/APPFILE 三张缺省字典(六内置服务);
# 非 keep 动作必须能落点:keys 与 valuesFiles 至少一项非空。
# 组件条目(component:true + name/acrTag/valuesFiles/imageName):第三方镜像
# (postgres/redis 等)精确替换客户 values 里的 tag,只支持 pin-acr/keep。
# 兼容参数: SERVICES=sso,agent(=这些服务 deliver,其余 keep)
# IMAGES=sso=tagX(=该服务 deliver 且显式 harborTag;逗号分隔多个)
# PLAN 存在时优先;全部缺省 = 6 内置服务全 deliver demo 当前 tag(与改造前一致)
# protocol mock 不进 PLAN,保留 PROMOTE_PROTOCOLS 独立开关
#
# 版本号分配:
# 有 deliver/ci-now/pin-acr(或 CHART_ONLY=true)→ 需要新版本号(RELEASE_VERSION 缺省 auto-bump);
# chart tag 已存在不再拒绝,记 CHART_TAG_EXISTS=true 复用(幂等,可同参数重跑/同版本发多客户)
# 全部 keep/reuse(纯复用发布)→ 不分配新版本号,chart 步骤跳过,
# reuse 服务 chart targetRevision 各指已有 chart-<version>
# pin-acr 也算正式发布:分配新版本号并 bump chart(应用引用跟随),镜像钉所选 tag 名
#
# 其他参数:
# CHART_ONLY=true 只发 chart:prepare 跳过镜像基线与 Harbor 校验,retag 整步跳过,
# pin 只动 chart targetRevision 与 release-notes
# ASSIGN_VERSION 是否分配新版本号(缺省 true)。false = 纯钉版发布:
# 不分配版本号、不 bump chart、不动平台 Application,
# 只钉 values/image-version 与 release-notes;此时 PLAN 中
# 不得有 deliver/ci-now(镜像 retag 的目标名就是版本号,必须有号)
# RELEASE_NOTES 发布说明,写入 release-notes.yaml 条目
# DB_CHANGE 逗号分隔服务名(须为本次非 keep 服务子集),条目 dbChange 标 true
# (仅作 release-notes/commit 标记,提示运维本次含数据库变更;
# 迁移脚本不由 CI 产出,运维自行生成并执行)
# OPERATOR 发布操作人,默认 drone
# PROMOTE_DRY_RUN=true 本地演练:docker 与 git push 仅打印不执行
#
# 原则:
# - 交付基线 = demo 正在跑且回归过的 develop tag 组合(只读 master,不改 master)
# - 客户目录只允许本流水线写(release 分支受保护,ADR-0068)
# - 全流程幂等:ACR 重推无害、chart tag 存在即复用、pin 幂等重写,失败可同参数重跑
# ============================================================================
set -eu
WS="${DRONE_WORKSPACE:-/drone/src}"
ENV_FILE="$WS/.release-env"
BASELINE_FILE="$WS/.baseline"
DIGESTS_FILE="$WS/.digests"
PLAN_FILE="$WS/.plan.json"
PLAN_TXT_FILE="$WS/.plan.txt"
FACTS_FILE="$WS/.plan-facts"
COMMIT_MSG_FILE="$WS/.commit-msg"
CHART_DIR="$WS/.ci/chart"
DEPLOY_REPO="${DEPLOY_REPO:-http://git.mixingx.local/trace/mixingx.deploy.git}"
CHART_REPO="${CHART_REPO:-http://git.mixingx.local/trace/mixingx.hub.chart.git}"
CHARTS_DIR="release-charts"
HARBOR_HOST="${HARBOR_HOST:-192.168.1.119:8888}"
DRY_RUN="${PROMOTE_DRY_RUN:-false}"
log() { echo "[promote] $*"; }
die() { echo "[promote] 错误: $*" >&2; exit 1; }
# 任意字符串 → shell source 安全的单引号字面量(内部 ' 转义为 '\'' )
shq() { printf "'%s'" "$(printf '%s' "$1" | sed "s/'/'\\\\''/g")"; }
# 外部副作用命令(推镜像/推 git)统一走这里:PROMOTE_DRY_RUN=true 时只打印
run() {
if [ "$DRY_RUN" = "true" ]; then
log "[dry-run] $*"
else
"$@"
fi
}
git_setup() {
git config --global url."http://git.mixingx.local/".insteadOf "git@git.mixingx.local:" 2>/dev/null || true
# 身份必须 --global:chart 步骤在克隆出的 chart 仓里 commit(pin 在 deploy 仓),
# 本地 config 只落在当前仓,克隆仓会因无 user.name/email 而 "unable to auto-detect email"
git config --global user.name "Drone Release"
git config --global user.email "drone-release@mixingx.local"
}
require_env() {
[ -f "$ENV_FILE" ] || die "缺少 $ENV_FILE,请先运行 prepare 步骤"
. "$ENV_FILE"
[ -n "${CUSTOMER:-}" ] || die "$ENV_FILE 内容不完整(缺 CUSTOMER)"
CHART_ONLY="${CHART_ONLY:-false}"
PURE_REUSE="${PURE_REUSE:-false}"
OPERATOR="${OPERATOR:-drone}"
RELEASE_NOTES="${RELEASE_NOTES:-}"
DB_CHANGE="${DB_CHANGE:-}"
PLAN="${PLAN:-}"
# 纯复用发布没有新版本号,RELEASE_VERSION/CHART_TAG 允许为空
if [ "$PURE_REUSE" != "true" ]; then
[ -n "${RELEASE_VERSION:-}" ] && [ -n "${CHART_TAG:-}" ] \
|| die "$ENV_FILE 内容不完整(缺 RELEASE_VERSION/CHART_TAG)"
fi
}
# ─────────────────────────────────────────────
# prepare
# ─────────────────────────────────────────────
do_prepare() {
# 客户解析:客户目录在 release 分支上(工作区是 master,不含客户目录)
# 唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场)
git fetch -q origin release || die "release 分支不存在,请先推送初始 release 分支"
CUSTOMERS=$(git ls-tree --name-only "origin/release" environments/ 2>/dev/null \
| sed 's#^environments/##' | sed 's#/$##' | grep -vE '^(_common|demo|dev)$' || true)
C_COUNT=$(printf '%s\n' "$CUSTOMERS" | grep -c . || true)
if [ -z "${CUSTOMER:-}" ]; then
if [ "$C_COUNT" = "1" ]; then
CUSTOMER="$CUSTOMERS"
log "未指定 CUSTOMER,唯一客户目录: $CUSTOMER"
else
die "检测到 ${C_COUNT} 个客户目录,不填 CUSTOMER 无法确定发给谁。现有客户: $(printf '%s ' $CUSTOMERS)"
fi
fi
printf '%s\n' "$CUSTOMERS" | grep -qx "$CUSTOMER" \
|| die "environments/$CUSTOMER 不在 release 分支上。现有客户: $(printf '%s ' $CUSTOMERS)"
CHART_ONLY="${CHART_ONLY:-false}"
case "$CHART_ONLY" in
true|false) : ;;
*) die "CHART_ONLY 只接受 true/false,收到: $CHART_ONLY" ;;
esac
export CHART_ONLY
# ── 解析服务计划(PLAN / 兼容参数 SERVICES、IMAGES / 缺省全量 deliver)──
# 产物:.plan.json(规范化全量计划,pin 步骤消费)、.plan-facts(HAS_DELIVER)、
# .plan.txt(PLAN JSON 原文留痕)、.baseline(仅 deliver/ci-now 服务的 repo)
python3 - "$WS/environments/demo/image-version.yaml" "$BASELINE_FILE" \
"$PLAN_FILE" "$FACTS_FILE" "$PLAN_TXT_FILE" <<'PY'
import base64, json, os, re, sys, urllib.error, urllib.request
import yaml
demo_path, baseline_path, plan_path, facts_path, plantxt_path = sys.argv[1:6]
CHART_ONLY = os.environ.get("CHART_ONLY", "false") == "true"
WITH_PROTOCOLS = os.environ.get("PROMOTE_PROTOCOLS", "false") == "true"
HARBOR_HOST = os.environ.get("HARBOR_HOST", "192.168.1.119:8888")
# ── 交付映射:PLAN 条目自带映射优先(信任 + 格式校验),三张字典是未带时的缺省 ──
# (pin 步骤经 .plan.json 继承每条目解析后的映射,勿另起副本)
DEFAULT_SERVICES = ["gateway", "sso", "ultra", "audit", "agent", "edge"]
ACTIONS = ["keep", "reuse", "deliver", "ci-now", "pin-acr"]
# 缺省服务 → 镜像 repo 列表(前后端共用同一 tag)
REPOS = {
"gateway": ["gateway"],
"sso": ["sso", "sso-web"],
"ultra": ["ultra", "ultra-web"],
"audit": ["audit", "audit-web"],
"agent": ["agent", "agent-web"],
"edge": ["edge", "edge-web"],
}
# 缺省服务 → image-version.yaml 中 images 下的 key 列表
KEYS = {
"gateway": ["gateway"],
"sso": ["sso", "ssoWeb"],
"ultra": ["ultra", "ultraWeb"],
"audit": ["audit", "auditWeb"],
"agent": ["agent", "agentWeb"],
"edge": ["edge", "edgeWeb"],
}
# 缺省服务 → applications/<客户>/ 下的 Application 文件
APPFILE = {
"gateway": "gateway.yaml",
"sso": "sso.yaml",
"ultra": "ultra.yaml",
"audit": "audit.yaml",
"agent": "agents.yaml",
"edge": "edges.yaml",
}
MAPPING_FIELDS = ("repos", "keys", "appFile", "valuesFiles")
def norm_mapping(svc, e):
"""PLAN 条目映射:带任一映射字段 = 整体信任(缺省字段视为空,不与字典合并);
未带映射 = 三张缺省字典;字典也没有 = None(keep 可无映射,非 keep 拒绝)"""
if not any(f in e for f in MAPPING_FIELDS):
if svc in REPOS:
return {"repos": REPOS[svc], "keys": KEYS[svc],
"appFile": APPFILE[svc], "valuesFiles": []}
return None
def field_list(name, pat, what):
raw = e.get(name) or []
if not isinstance(raw, list):
die(f"服务 {svc} 的映射字段 {name} 应为列表")
vals = []
for x in raw:
v = str(x).strip()
if v:
if not re.fullmatch(pat, v):
die(f"服务 {svc} 的映射字段 {name} 含非法值: {v}(应为{what})")
vals.append(v)
return vals
m = {
"repos": field_list("repos", r"[a-z0-9][a-z0-9._-]*", "镜像仓名"),
"keys": field_list("keys", r"[A-Za-z0-9][A-Za-z0-9_-]*", "image-version 行名"),
"appFile": "",
"valuesFiles": field_list("valuesFiles", r"[\w.-]+\.ya?ml", "values 文件名"),
}
app = str(e.get("appFile") or "").strip()
if app:
if not re.fullmatch(r"[\w.-]+\.ya?ml", app):
die(f"服务 {svc} 的映射字段 appFile 含非法值: {app}(应为文件名)")
m["appFile"] = app
if not m["repos"]:
die(f"服务 {svc} 自带映射缺 repos(Harbor 镜像仓,retag/pin 的镜像来源)")
return m
def die(msg):
sys.exit("[promote] 错误: " + msg)
data = yaml.safe_load(open(demo_path, encoding="utf-8")) or {}
images = data.get("images") or {}
def demo_tag(svc, mapping):
"""deliver/ci-now 缺省 harborTag = demo 当前 tag(前后端应共用同一 tag)。
有 keys 从 image-version 取;无 keys(独立 chart 服务)从 demo 的首个 values 文件取"""
if not mapping["keys"]:
p = os.path.join(os.path.dirname(demo_path), mapping["valuesFiles"][0])
if os.path.exists(p):
t = re.search(r"tag:\s*[\"']?([\w.\-]+)", open(p, encoding="utf-8").read())
if t:
return t.group(1)
die(f"服务 {svc} 缺省 harborTag 无法从 demo 的 {mapping['valuesFiles'][0]} 读取,请显式指定")
tags = []
for k in mapping["keys"]:
node = images.get(k)
if not isinstance(node, dict) or not node.get("tag"):
die(f"demo image-version 缺少 images.{k}.tag,无法取 {svc} 的 demo 当前 tag")
tags.append(str(node["tag"]))
if len(set(tags)) != 1:
die(f"demo image-version 中 {svc} 前后端 tag 不一致({', '.join(tags)}),请显式指定 harborTag")
return tags[0]
# ── 1. 解析 PLAN / 兼容参数 / 缺省 ──
raw_plan = (os.environ.get("PLAN") or "").strip()
entries = []
if raw_plan:
try:
plan = json.loads(raw_plan)
except json.JSONDecodeError as e:
die(f"PLAN JSON 解析失败: {e}")
if not isinstance(plan, list):
die('PLAN 应为 JSON 数组,每服务一条 {"service":..., "action":...}')
for i, e in enumerate(plan):
if not isinstance(e, dict) or ("service" not in e and not e.get("component")):
die(f"PLAN[{i}] 应为对象且含 service 字段(或 component 组件条目)")
entries.append(dict(e))
else:
selected = {}
for s in (os.environ.get("SERVICES") or "").split(","):
s = s.strip()
if s:
selected[s] = None # deliver,缺省 demo 当前 tag
for item in (os.environ.get("IMAGES") or "").split(","):
item = item.strip()
if not item:
continue
if "=" not in item:
die(f"IMAGES 条目应为 svc=harborTag,收到: {item}")
s, t = item.split("=", 1)
selected[s.strip()] = t.strip() or None
if selected:
for s, t in selected.items():
e = {"service": s, "action": "deliver"}
if t:
e["harborTag"] = t
entries.append(e)
else:
# 全部缺省 = 6 内置服务全 deliver demo 当前 tag(行为与改造前一致)
entries = [{"service": s, "action": "deliver"} for s in DEFAULT_SERVICES]
# ── 2. 校验 + 规范化(缺省六服务 + PLAN 带映射的额外服务 + 组件条目)──
norm, seen = {}, set()
component_entries = []
extra_order = [] # 非缺省字典的服务(PLAN 出现序;keep 条目也进,留痕一致)
for e in entries:
if e.get("component"):
# 系统组件(第三方镜像):映射随条目携带,只支持 pin-acr/keep
name = str(e.get("name") or "").strip()
tag = str(e.get("acrTag") or "").strip()
vfiles = [str(x).strip() for x in (e.get("valuesFiles") or []) if str(x).strip()]
iname = str(e.get("imageName") or "").strip()
if not (name and tag and vfiles and iname):
die(f"组件条目缺字段(name/acrTag/valuesFiles/imageName): {e}")
if name in seen:
die(f"条目名重复: {name}")
seen.add(name)
component_entries.append({"component": True, "name": name, "action": "pin-acr",
"acrTag": tag, "valuesFiles": vfiles, "imageName": iname})
continue
svc = e.get("service")
if not isinstance(svc, str) or not svc.strip():
die(f"PLAN 条目缺 service 或非字符串: {e}")
svc = svc.strip()
if svc in seen:
die(f"PLAN 中服务重复: {svc}")
seen.add(svc)
action = e.get("action", "keep")
if action not in ACTIONS:
die(f"非法 action: {action}(合法值: {', '.join(ACTIONS)})")
mapping = norm_mapping(svc, e)
if mapping is None:
# keep 允许无映射(纯 no-op 留痕);非 keep 必须自带映射或命中缺省字典
if action != "keep":
die(f"服务 {svc} 无交付映射(PLAN 未带映射,也不在缺省字典: {', '.join(DEFAULT_SERVICES)}),只能 keep")
mapping = {"repos": [], "keys": [], "appFile": "", "valuesFiles": []}
if action != "keep" and not mapping["keys"] and not mapping["valuesFiles"]:
die(f"服务 {svc} 非 keep 动作但映射无钉版落点(keys/valuesFiles 均空)")
if svc not in REPOS:
extra_order.append(svc)
n = {"service": svc, "action": action, **mapping}
if action == "reuse":
ver = str(e.get("version") or "")
if not re.fullmatch(r"v\d+\.\d+\.\d+", ver):
die(f"reuse 服务 {svc} 需提供 version(vX.Y.Z),收到: {ver or '(空)'}")
n["version"] = ver
elif action in ("deliver", "ci-now"):
tag = str(e.get("harborTag") or "").strip()
n["harborTag"] = tag or demo_tag(svc, mapping)
n["harborTagExplicit"] = bool(tag)
elif action == "pin-acr":
tag = str(e.get("acrTag") or "").strip()
if not tag:
die(f"pin-acr 服务 {svc} 需提供 acrTag(ACR 上已有的 tag 名)")
n["acrTag"] = tag
norm[svc] = n
plan_out = [norm.get(s) or {"service": s, "action": "keep",
"repos": REPOS[s], "keys": KEYS[s], "appFile": APPFILE[s],
"valuesFiles": []}
for s in DEFAULT_SERVICES]
plan_out += [norm.get(s) or {"service": s, "action": "keep",
"repos": [], "keys": [], "appFile": "", "valuesFiles": []}
for s in extra_order]
plan_out += component_entries
# 组件 pin-acr 也算正式发布(与门户 hasDeliver 同语义:分配版本号并 bump chart)
has_deliver = any(e["action"] in ("deliver", "ci-now", "pin-acr") for e in plan_out)
# ── 3. DB_CHANGE 校验:逗号分隔服务名,须为本次计划内非 keep 服务的子集 ──
db_change = [s.strip() for s in (os.environ.get("DB_CHANGE") or "").split(",") if s.strip()]
known = {e["service"] for e in plan_out if not e.get("component")}
nonkeep = {e["service"] for e in plan_out
if e["action"] != "keep" and not e.get("component")}
for s in db_change:
if s not in known:
die(f"DB_CHANGE 含未在计划中的服务名: {s}(计划内: {', '.join(sorted(known))})")
if s not in nonkeep:
die(f"DB_CHANGE 服务 {s} 本次为 keep,不在交付范围内(非 keep 服务: {', '.join(sorted(nonkeep)) or '无'})")
# ── 4. deliver/ci-now 显式 harborTag 的 Harbor 存在性校验 ──
explicit = [e for e in plan_out
if e["action"] in ("deliver", "ci-now") and e.get("harborTagExplicit")]
h_user, h_pass = os.environ.get("HARBOR_USER"), os.environ.get("HARBOR_PASS")
if explicit and not (h_user and h_pass):
print("[promote] 警告: 未提供 HARBOR_USER/HARBOR_PASS,跳过显式 harborTag 的 Harbor 存在性校验")
elif explicit:
auth = base64.b64encode(f"{h_user}:{h_pass}".encode()).decode()
for e in explicit:
for repo in e["repos"]:
url = f"http://{HARBOR_HOST}/v2/mixingx/{repo}/manifests/{e['harborTag']}"
req = urllib.request.Request(url, headers={
"Accept": ("application/vnd.oci.image.index.v1+json, "
"application/vnd.oci.image.manifest.v1+json, "
"application/vnd.docker.distribution.manifest.v2+json, "
"application/vnd.docker.distribution.manifest.list.v2+json"),
"Authorization": f"Basic {auth}"})
try:
with urllib.request.urlopen(req, timeout=15) as r:
if r.status != 200:
die(f"Harbor 校验 {repo}:{e['harborTag']} 返回 HTTP {r.status}")
except urllib.error.HTTPError as ex:
if ex.code == 404:
die(f"Harbor 上不存在镜像 {repo}:{e['harborTag']}(服务 {e['service']}),请核对 harborTag")
die(f"Harbor 校验 {repo}:{e['harborTag']} 失败: HTTP {ex.code}")
except urllib.error.URLError as ex:
die(f"无法连接 Harbor 校验 {repo}:{e['harborTag']}: {ex.reason}")
print(f"[promote] Harbor 存在性校验通过({len(explicit)} 个显式 harborTag)")
# ── 5. 交付基线(仅 deliver/ci-now 服务;CHART_ONLY 跳过)──
if not CHART_ONLY:
baseline = []
for e in plan_out:
if e["action"] in ("deliver", "ci-now"):
for repo in e["repos"]:
baseline.append(f"{repo} {e['harborTag']}")
# protocol mock 不进 PLAN,沿用 PROMOTE_PROTOCOLS 独立开关;
# 纯复用发布没有新版本号可钉,protocol 一并跳过
if WITH_PROTOCOLS:
if has_deliver:
for name, node in (images.get("protocol") or {}).items():
if isinstance(node, dict) and node.get("repository") and node.get("tag"):
baseline.append(f"{node['repository']} {node['tag']}")
print("[promote] PROMOTE_PROTOCOLS=true:protocol 镜像一并晋级")
else:
print("[promote] 警告: 纯复用发布无新版本号,PROMOTE_PROTOCOLS 本次不生效")
open(baseline_path, "w", encoding="utf-8").write("\n".join(baseline) + ("\n" if baseline else ""))
if baseline:
print(f"[promote] 交付基线 {len(baseline)} 个镜像: " + ", ".join(l.split()[0] for l in baseline))
else:
print("[promote] 交付基线为空(无 deliver/ci-now 服务)")
else:
print("[promote] CHART_ONLY=true:跳过镜像基线生成")
# ── 6. 落盘:.plan.json / .plan-facts / .plan.txt ──
json.dump(plan_out, open(plan_path, "w", encoding="utf-8"), ensure_ascii=False, indent=1)
open(facts_path, "w", encoding="utf-8").write("HAS_DELIVER=%s\n" % ("true" if has_deliver else "false"))
# PLAN JSON 原文(未提供时写规范化后的等价 JSON),仅作审计留痕;pin 实际消费 .plan.json
open(plantxt_path, "w", encoding="utf-8").write(raw_plan or json.dumps(plan_out, ensure_ascii=False))
for e in plan_out:
if e["action"] == "keep":
continue
svc_label = e.get("service") or e.get("name") or ""
extra = "(组件)" if e.get("component") else ""
print(f"[promote] 计划: {svc_label:<10} {e['action']:<8} {extra}{e.get('harborTag') or e.get('version') or e.get('acrTag') or ''}")
print(f"[promote] DB 变更服务: {', '.join(db_change) or '无'}")
PY
. "$FACTS_FILE" # HAS_DELIVER=true|false
# ── 版本号与 chart tag 分配 ──
ASSIGN_VERSION="${ASSIGN_VERSION:-true}"
case "$ASSIGN_VERSION" in true|false) : ;; *) die "ASSIGN_VERSION 只接受 true/false,收到: $ASSIGN_VERSION" ;; esac
HAS_REAL_DELIVER=$(python3 -c "
import json
plan = json.load(open('$PLAN_FILE'))
print('true' if any(e['action'] in ('deliver','ci-now') for e in plan) else 'false')")
if [ "$ASSIGN_VERSION" = "false" ] && [ "$HAS_REAL_DELIVER" = "true" ]; then
die "ASSIGN_VERSION=false 与 deliver/ci-now 互斥:镜像 retag 的目标名就是版本号,交付必须分配"
fi
GIVEN_VERSION="${RELEASE_VERSION:-}"
if [ "$ASSIGN_VERSION" = "true" ] && { [ "$HAS_DELIVER" = "true" ] || [ "$CHART_ONLY" = "true" ]; }; then
RELEASE_VERSION="${GIVEN_VERSION:-$(sh ci/auto-bump.sh)}"
case "$RELEASE_VERSION" in
v[0-9]*.[0-9]*.[0-9]*) : ;;
*) die "RELEASE_VERSION 格式应为 vX.Y.Z,收到: $RELEASE_VERSION" ;;
esac
CHART_TAG="chart-$RELEASE_VERSION"
# chart tag 已存在不再拒绝:幂等复用(同参数重跑/同一版本发多个客户)
if git ls-remote --tags "$CHART_REPO" "refs/tags/$CHART_TAG" | grep -q .; then
CHART_TAG_EXISTS=true
log "$CHART_TAG 已存在于 chart 仓库,复用(幂等)"
else
CHART_TAG_EXISTS=false
fi
PURE_REUSE=false
log "交付版本: $RELEASE_VERSION 客户: $CUSTOMER chart tag: $CHART_TAG"
else
# 无需新版本号(纯复用,或 ASSIGN_VERSION=false 的纯钉版):chart 步骤整体跳过
RELEASE_VERSION=""; CHART_TAG=""; CHART_TAG_EXISTS=false; PURE_REUSE=true
[ -z "$GIVEN_VERSION" ] || log "警告: 本次发布不分配新版本号,已忽略传入的 $GIVEN_VERSION"
log "本次发布不分配新版本号,chart 步骤将跳过"
fi
export ASSIGN_VERSION
# 克隆 chart 仓库(供 chart 步骤复用)并核对交付镜像清单
rm -rf "$WS/.ci"; mkdir -p "$WS/.ci"
git clone -q "$CHART_REPO" "$CHART_DIR"
python3 - "$CHART_DIR/delivery/image-manifest.yaml" <<'PY'
import sys, yaml
m = yaml.safe_load(open(sys.argv[1], encoding="utf-8")) or {}
missing = [e["acr"] for e in m.get("thirdParty", [])
if not e.get("optional") and not e.get("pushed")]
if missing:
sys.exit("[promote] 错误: 交付镜像清单存在未推送 ACR 的非可选镜像: " + ", ".join(missing) +
"\n 请先按 D2 用 cr_temp_user 临时 token 补推,再执行发布")
print("[promote] 交付镜像清单核对通过(第三方镜像齐备)")
PY
OPERATOR="${OPERATOR:-drone}"
RELEASE_NOTES="${RELEASE_NOTES:-}"
DB_CHANGE="${DB_CHANGE:-}"
# .release-env 是 shell source 的:自由文本值一律经 shq 单引号转义,防注入/断行
{
echo "RELEASE_VERSION=$(shq "$RELEASE_VERSION")"
echo "CUSTOMER=$(shq "$CUSTOMER")"
echo "CHART_TAG=$(shq "$CHART_TAG")"
echo "CHART_TAG_EXISTS=$CHART_TAG_EXISTS"
echo "CHART_ONLY=$CHART_ONLY"
echo "PURE_REUSE=$PURE_REUSE"
echo "ASSIGN_VERSION=$ASSIGN_VERSION"
echo "OPERATOR=$(shq "$OPERATOR")"
echo "RELEASE_NOTES=$(shq "$RELEASE_NOTES")"
echo "DB_CHANGE=$(shq "$DB_CHANGE")"
echo "PLAN=$(shq "$(cat "$PLAN_TXT_FILE")")"
} > "$ENV_FILE"
log "prepare 完成"
}
# ─────────────────────────────────────────────
# retag
# ─────────────────────────────────────────────
do_retag() {
require_env
if [ "$CHART_ONLY" = "true" ]; then
log "CHART_ONLY=true,镜像晋级整步跳过"
exit 0
fi
if [ ! -s "$BASELINE_FILE" ]; then
log "交付基线为空(纯复用发布或无 deliver/ci-now 服务),无镜像需晋级"
exit 0
fi
if [ "$DRY_RUN" = "true" ]; then
ACR_REGISTRY="${ACR_REGISTRY:-acr.example.com}"
HARBOR_REGISTRY="${HARBOR_REGISTRY:-harbor.example.com/mixingx}"
log "[dry-run] 跳过 ACR 登录,docker 命令仅打印"
else
: "${ACR_REGISTRY:?缺少 ACR_REGISTRY}"
: "${HARBOR_REGISTRY:?缺少 HARBOR_REGISTRY}"
: "${ACR_USER:?缺少 acr_push_username secret}"
: "${ACR_PASS:?缺少 acr_push_password secret}"
# 推 ACR 必须用 docker(ctr 有 blob unknown 问题,见底座 runbook)
printf %s "$ACR_PASS" | docker login "$ACR_REGISTRY" -u "$ACR_USER" --password-stdin \
|| die "ACR 登录失败(检查 secrets 与实例访问授权)"
fi
: > "$DIGESTS_FILE"
while IFS=' ' read -r repo tag; do
[ -n "$repo" ] || continue
log "晋级 $repo:$tag → mixingx/$repo:$RELEASE_VERSION"
if [ "$DRY_RUN" = "true" ]; then
run docker pull "$HARBOR_REGISTRY/$repo:$tag"
run docker tag "$HARBOR_REGISTRY/$repo:$tag" "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION"
run docker push "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION"
run docker rmi "$HARBOR_REGISTRY/$repo:$tag" "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION"
digest="sha256:dryrun-$repo"
else
docker pull "$HARBOR_REGISTRY/$repo:$tag" || die "拉取失败: $repo:$tag(119 上是否存在?)"
docker tag "$HARBOR_REGISTRY/$repo:$tag" "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION"
docker push "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION" || die "推送失败: $repo"
docker rmi "$HARBOR_REGISTRY/$repo:$tag" "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION" >/dev/null 2>&1 || true
# 记录 ACR 镜像 digest(供 release-notes 反向追踪);取不到则写空并警告,不 fail
digest=$(docker buildx imagetools inspect "$ACR_REGISTRY/mixingx/$repo:$RELEASE_VERSION" 2>/dev/null \
| awk '/^Digest:/ {print $2; exit}' || true)
[ -n "$digest" ] || log "警告: 未取到 $repo:$RELEASE_VERSION 的 digest,release-notes 将留空"
fi
printf '%s %s\n' "$repo" "${digest:-}" >> "$DIGESTS_FILE"
done < "$BASELINE_FILE"
log "镜像晋级完成: $(wc -l < "$BASELINE_FILE" | tr -d ' ') 个 → $ACR_REGISTRY/mixingx/*:$RELEASE_VERSION"
}
# ─────────────────────────────────────────────
# chart
# ─────────────────────────────────────────────
do_chart() {
require_env
git_setup
if [ "$PURE_REUSE" = "true" ]; then
log "纯复用发布(无 deliver/ci-now),不需要新 chart tag,chart 步骤跳过"
exit 0
fi
# 幂等:tag 已存在即复用,跳过整个 bump/tag/push(同参数重跑/同版本发多客户)
if git ls-remote --tags "$CHART_REPO" "refs/tags/$CHART_TAG" | grep -q .; then
log "$CHART_TAG 已存在于 chart 仓库,复用(幂等),跳过 bump/tag/push"
exit 0
fi
[ -d "$CHART_DIR/.git" ] || { rm -rf "$CHART_DIR"; git clone -q "$CHART_REPO" "$CHART_DIR"; }
cd "$CHART_DIR"
VER="${RELEASE_VERSION#v}"
for f in $CHARTS_DIR/*/Chart.yaml; do
python3 - "$f" "$VER" <<'PY'
import sys, re
path, ver = sys.argv[1], sys.argv[2]
t = open(path, encoding="utf-8").read()
t = re.sub(r'(?m)^version:\s*\S+', f'version: {ver}', t)
t = re.sub(r'(?m)^appVersion:\s*"?[^"\n]+"?', f'appVersion: "{ver}"', t)
open(path, "w", encoding="utf-8").write(t)
PY
done
git add -A
git diff --cached --quiet && die "Chart.yaml 无变化,异常(版本号相同?)"
git commit -q -m "release: bump chart version to $RELEASE_VERSION"
git tag "$CHART_TAG"
run git push -q origin HEAD:master "refs/tags/$CHART_TAG" || die "chart 仓库 push 失败(netrc 凭证?)"
N=$(ls -d $CHARTS_DIR/*/ | wc -l | tr -d ' ')
log "chart 已发布: $CHART_TAG($N 个 chart version=$VER)"
}
# ─────────────────────────────────────────────
# pin
# ─────────────────────────────────────────────
do_pin() {
require_env
git_setup
cd "$WS"
git fetch -q origin release || die "release 分支不存在,请先推送初始 release 分支(改造清单 B1)"
git checkout -q -B release origin/release
if [ "$CHART_ONLY" = "true" ] && [ -s "$PLAN_FILE" ] && grep -q '"component": *true' "$PLAN_FILE"; then
die "CHART_ONLY 与组件条目互斥(仅 chart 发布不动任何镜像)"
fi
ENVDIR="environments/$CUSTOMER"
APPDIR="applications/$CUSTOMER"
[ -d "$ENVDIR" ] || die "客户目录不存在: $ENVDIR"
[ -d "$APPDIR" ] || die "客户目录不存在: $APPDIR"
[ -f "$PLAN_FILE" ] || die "缺少 $PLAN_FILE,请先运行 prepare 步骤"
export CUSTOMER RELEASE_VERSION CHART_TAG CHART_ONLY PURE_REUSE OPERATOR RELEASE_NOTES DB_CHANGE
python3 - "$ENVDIR" "$APPDIR" "$PLAN_FILE" "$DIGESTS_FILE" "$COMMIT_MSG_FILE" <<'PY'
import json, os, re, sys
from datetime import date as date_type, datetime, timedelta, timezone
import yaml
envdir, appdir, plan_path, digests_path, commit_msg_path = sys.argv[1:6]
CUSTOMER = os.environ.get("CUSTOMER", "")
RELEASE_VERSION = os.environ.get("RELEASE_VERSION", "")
CHART_TAG = os.environ.get("CHART_TAG", "")
CHART_ONLY = os.environ.get("CHART_ONLY", "false") == "true"
PURE_REUSE = os.environ.get("PURE_REUSE", "false") == "true"
OPERATOR = os.environ.get("OPERATOR", "drone")
NOTES = os.environ.get("RELEASE_NOTES", "")
DB_CHANGE = [s for s in os.environ.get("DB_CHANGE", "").split(",") if s]
plan = json.load(open(plan_path, encoding="utf-8"))
actions = [e for e in plan if e["action"] != "keep" and not e.get("component")]
components = [e for e in plan if e.get("component")]
has_deliver = any(e["action"] in ("deliver", "ci-now") for e in plan)
# 平台 Application(infra/mqttx)不属于 PLAN 服务映射,跟随每次新 chart tag
# (保持旧版全量 sed 行为:全量交付时与改造前逐字节一致;纯复用发布无新 tag 则不动)
PLATFORM_APPFILES = ["infra.yaml", "mqttx.yaml"]
# retag 步骤记录的 ACR 镜像 digest,repo → digest(取不到的行第二列为空)
digests = {}
if os.path.exists(digests_path):
for line in open(digests_path, encoding="utf-8"):
parts = line.split()
if parts:
digests[parts[0]] = parts[1] if len(parts) > 1 else ""
iv_path = os.path.join(envdir, "image-version.yaml")
rn_path = os.path.join(envdir, "release-notes.yaml")
# ── 1) image-version.yaml:只钉有 keys 且非 keep 的服务(CHART_ONLY 不动镜像文件)──
from_tags, to_tags = {}, {}
def new_tag_of(e):
if e["action"] in ("deliver", "ci-now"):
return RELEASE_VERSION
if e["action"] == "pin-acr":
return e["acrTag"] # 所选 ACR tag 原样钉入,不 retag
return e["version"]
if not CHART_ONLY:
data = yaml.safe_load(open(iv_path, encoding="utf-8")) or {}
images = data.get("images") or {}
for e in [x for x in actions if x["keys"]]:
svc = e["service"]
new_tag = new_tag_of(e)
to_tags[svc] = new_tag
for i, key in enumerate(e["keys"]):
node = images.get(key)
if not isinstance(node, dict) or "tag" not in node:
sys.exit(f"[promote] 错误: {iv_path} 缺少 images.{key}.tag,无法为 {svc} 钉版")
if i == 0:
from_tags[svc] = str(node["tag"]) # 旧值留作 release-notes 的 from
node["tag"] = new_tag
print(f"[promote] {svc}: image {from_tags[svc]} → {new_tag}")
# images.protocol 幂等清理(客户现场本不该有 protocol mock)
images.pop("protocol", None)
# 顶层 tag 只在有 deliver/ci-now 时跟随新版本号;纯复用保持原值
if has_deliver:
data["tag"] = RELEASE_VERSION
yaml.safe_dump(data, open(iv_path, "w", encoding="utf-8"),
default_flow_style=False, sort_keys=False, allow_unicode=True)
print(f"[promote] {iv_path} 钉版完成(未选中服务原样保留)")
# ── 1.5) valuesFiles 服务:逐文件替换镜像 tag(独立 chart 服务的钉版落点)──
# 三种形态:A. <repo>:<tag> 整行 B. repository: 行 + 相邻 tag:
# C. image: 块下相邻 tag:(registry 由 _common/registry.yaml 提供、
# 仓名由 chart 缺省提供,客户 values 只钉 tag 时无 repo 行)
def replace_values_tag(vpath, repo, new_tag):
"""就地替换 vpath 中服务镜像的 tag,返回旧 tag;三种形态均未命中返回 None"""
lines = open(vpath, encoding="utf-8").readlines()
pat_a = re.compile("(" + re.escape(repo) + r"):([A-Za-z0-9][\w.\-]*)")
pat_b = re.compile(r"^(\s*tag:\s*)(\S+)\s*$")
for idx, line in enumerate(lines):
if not repo or repo not in line:
continue
m = pat_a.search(line)
if m: # 形态 A
old = m.group(2).strip("\"'")
lines[idx] = pat_a.sub(lambda _m: _m.group(1) + ":" + new_tag, line)
open(vpath, "w", encoding="utf-8").write("".join(lines))
return old
for j in range(idx + 1, min(idx + 4, len(lines))): # 形态 B
mb = pat_b.match(lines[j])
if mb:
old = mb.group(2).strip("\"'")
lines[j] = mb.group(1) + new_tag + "\n"
open(vpath, "w", encoding="utf-8").write("".join(lines))
return old
for idx, line in enumerate(lines): # 形态 C:首个 image: 块
if re.match(r"^image:\s*(#.*)?$", line):
for j in range(idx + 1, min(idx + 4, len(lines))):
mb = pat_b.match(lines[j])
if mb:
old = mb.group(2).strip("\"'")
lines[j] = mb.group(1) + new_tag + "\n"
open(vpath, "w", encoding="utf-8").write("".join(lines))
return old
break
return None
for e in [x for x in actions if x.get("valuesFiles")]:
svc = e["service"]
new_tag = new_tag_of(e)
olds = []
for vf in e["valuesFiles"]:
vpath = os.path.join(envdir, vf)
if not os.path.exists(vpath):
sys.exit(f"[promote] 错误: 客户目录缺 {vf}(服务 {svc} 的钉版 values 文件)")
old = replace_values_tag(vpath, e["repos"][0], new_tag)
if old is None:
sys.exit(f"[promote] 错误: {vf} 中未找到服务 {svc} 的镜像 tag(整行/拆分/image 块三种形态均未命中)")
olds.append(old)
print(f"[promote] {svc}: {vf} {old} → {new_tag}")
if svc not in from_tags:
from_tags[svc] = " / ".join(olds)
to_tags[svc] = new_tag
# ── 1.6) 系统组件:逐 values 文件精确替换该镜像的 tag(CHART_ONLY 已互斥)──
# 兼容两种 values 形态:A. image: <registry>/<imageName>:<tag>(整行)
# B. repository: <registry>/<imageName> + 相邻 tag: <tag>(拆分)
# 该客户没有的文件(目录结构差异)跳过并记录;全部未命中才报错。
for c in components:
pat_a = re.compile("(" + re.escape(c["imageName"]) + r"):([A-Za-z0-9][\w.\-]*)")
pat_b = re.compile(r"^(\s*tag:\s*)(\S+)\s*$")
hits = [] # (文件, 旧tag)
for vf in c["valuesFiles"]:
vpath = os.path.join(envdir, vf)
if not os.path.exists(vpath):
print(f"[promote] 组件 {c['name']}: {vf} 在客户目录不存在,跳过")
continue
lines = open(vpath, encoding="utf-8").readlines()
old_tag, hit_idx = None, None
for idx, line in enumerate(lines):
if c["imageName"] not in line:
continue
m = pat_a.search(line)
if m: # 形态 A:同行
old_tag, hit_idx = m.group(2).strip("\"'"), idx
lines[idx] = pat_a.sub(lambda _m: _m.group(1) + ":" + c["acrTag"], line)
break
for j in range(idx + 1, min(idx + 4, len(lines))): # 形态 B:邻近 tag: 字段
mb = pat_b.match(lines[j])
if mb:
old_tag, hit_idx = mb.group(2).strip("\"'"), j
lines[j] = mb.group(1) + c["acrTag"] + "\n"
break
if hit_idx is not None:
break
if hit_idx is not None:
open(vpath, "w", encoding="utf-8").write("".join(lines))
hits.append((vf, old_tag))
print(f"[promote] 组件 {c['name']}: {vf} {c['imageName']} {old_tag} → {c['acrTag']}")
if not hits:
sys.exit(f"[promote] 错误: 组件 {c['name']}({c['imageName']})在 {', '.join(c['valuesFiles'])} 中均未找到引用")
from_tags[c["name"]] = " / ".join(t for _, t in hits)
to_tags[c["name"]] = c["acrTag"]
else:
print("[promote] CHART_ONLY=true:image-version.yaml 不动")
# ── 2) applications chart targetRevision:只处理非 keep 服务对应的文件 ──
# (语义等价于按文件 sed,用 python 实现以便与 PLAN 共用服务→文件映射)
chart_from, chart_to = {}, {}
def retarget(path, new_ref, required):
if not os.path.exists(path):
if required:
sys.exit(f"[promote] 错误: 缺少 Application 文件 {path}")
print(f"[promote] 警告: {path} 不存在,跳过")
return None
text = open(path, encoding="utf-8").read()
m = re.search(r"chart-v\d+\.\d+\.\d+", text)
if not m:
if required:
sys.exit(f"[promote] 错误: {path} 中未找到 chart-vX.Y.Z targetRevision")
print(f"[promote] 警告: {path} 中未找到 chart-vX.Y.Z targetRevision,跳过")
return None
old_ref = m.group(0)
new_text = re.sub(r"chart-v\d+\.\d+\.\d+", new_ref, text)
if new_text != text:
open(path, "w", encoding="utf-8").write(new_text)
print(f"[promote] {path}: {old_ref} → {new_ref}")
return old_ref, new_ref
for e in actions:
if not e["appFile"]:
print(f"[promote] {e['service']}: 无 appFile 映射,chart 引用不动(独立 chart 服务)")
continue
if e["action"] == "pin-acr" and not CHART_TAG:
# 未分配版本号(ASSIGN_VERSION=false):只钉镜像 tag,chart 引用不动
print(f"[promote] {e['service']}: 未分配版本号,chart 引用不动")
continue
new_ref = CHART_TAG if e["action"] in ("deliver", "ci-now", "pin-acr") else f"chart-{e['version']}"
r = retarget(os.path.join(appdir, e["appFile"]), new_ref, required=True)
if r:
chart_from[e["service"]], chart_to[e["service"]] = r
# 平台文件跟随新 chart tag(纯复用发布无新版本号,不动)
if not PURE_REUSE:
for f in PLATFORM_APPFILES:
retarget(os.path.join(appdir, f), CHART_TAG, required=False)
# ── 3) release-notes.yaml:追加日志,新条目插 releases 列表最前 ──
rn = {}
if os.path.exists(rn_path):
rn = yaml.safe_load(open(rn_path, encoding="utf-8")) or {}
if not isinstance(rn, dict):
rn = {}
releases = rn.get("releases")
if not isinstance(releases, list):
releases = []
# safe_load 会把 ISO8601 date 解析成 datetime,重新落盘前归一化回原字符串,保证幂等
for rel in releases:
d = rel.get("date") if isinstance(rel, dict) else None
if isinstance(d, datetime):
rel["date"] = d.replace(microsecond=0).isoformat()
elif isinstance(d, date_type):
rel["date"] = d.isoformat()
def find_reuse_source(svc, version):
"""reuse 服务的 sourceTag/digest 从既有 release-notes 中该服务该版本的条目拷贝"""
for rel in releases:
for s in (rel.get("services") or []):
if s.get("name") == svc and str(s.get("to")) == version:
return str(s.get("sourceTag") or ""), str(s.get("digest") or "")
return "", ""
svc_entries, src_tags = [], {}
for e in actions + components:
svc, action = e.get("service") or e.get("name"), e["action"]
if e.get("component"):
# 组件:替换 values 文件里的镜像 tag(已做),chart 无关,如实记账
frm, to = from_tags.get(svc, ""), to_tags.get(svc, "")
src_tags[svc] = e.get("acrTag", "")
svc_entries.append({"name": svc, "action": action, "from": frm, "to": to,
"sourceTag": e.get("acrTag", ""), "digest": "",
"dbChange": False, "component": True})
continue
if CHART_ONLY:
# CHART_ONLY 条目:from/to 记 chart tag 变化,sourceTag/digest 留空
frm, to = chart_from.get(svc, ""), chart_to.get(svc, "")
source_tag = digest = ""
elif action in ("deliver", "ci-now"):
frm, to = from_tags.get(svc, ""), to_tags.get(svc, "")
source_tag = e.get("harborTag", "")
# 前后端共用同一 tag,digest 取首个 repo(后端)
digest = digests.get(e["repos"][0], "")
if not digest:
print(f"[promote] 警告: {svc} 未取到镜像 digest,release-notes 留空")
elif action == "pin-acr":
# 源即 ACR 上所选 tag 本身,如实记;未搬运,无 digest
frm, to = from_tags.get(svc, ""), to_tags.get(svc, "")
source_tag = e.get("acrTag", "")
digest = ""
else: # reuse
frm, to = from_tags.get(svc, ""), e["version"]
source_tag, digest = find_reuse_source(svc, e["version"])
if not source_tag and not digest:
print(f"[promote] 警告: 既往 release-notes 中未找到 {svc} {e['version']} 的交付记录,"
f"sourceTag/digest 留空")
src_tags[svc] = source_tag
svc_entries.append({"name": svc, "action": action, "from": frm, "to": to,
"sourceTag": source_tag, "digest": digest,
"dbChange": svc in DB_CHANGE})
if svc_entries or NOTES.strip():
now = datetime.now(timezone(timedelta(hours=8))).replace(microsecond=0).isoformat()
releases.insert(0, {"date": now, "operator": OPERATOR, "notes": NOTES,
"services": svc_entries})
rn["releases"] = releases
yaml.safe_dump(rn, open(rn_path, "w", encoding="utf-8"),
default_flow_style=False, sort_keys=False, allow_unicode=True)
print(f"[promote] {rn_path} 已追加发布记录({len(svc_entries)} 个服务)")
else:
print("[promote] 全部服务 keep 且无 RELEASE_NOTES,release-notes 不变")
# ── 5) commit message:服务清单(action/from→to)与 RELEASE_NOTES ──
if PURE_REUSE:
kind = "钉版发布" if svc_entries else "纯复用发布"
title = f"release: {CUSTOMER} {kind}(无新版本号)"
elif CHART_ONLY:
title = f"release: {CUSTOMER} chart 交付 {CHART_TAG}(CHART_ONLY)"
else:
title = f"release: {CUSTOMER} 交付 {RELEASE_VERSION}({CHART_TAG})"
lines = [title, "", "服务清单:"]
for e in svc_entries:
seg = f"- {e['name']}: {e['action']} {e['from']} → {e['to']}"
if e["sourceTag"]:
seg += f"(source: {e['sourceTag']})"
if e["dbChange"]:
seg += " [db-change]"
lines.append(seg)
if not svc_entries:
lines.append("- (无服务变更)")
kept = [e["service"] for e in plan if e["action"] == "keep"]
if kept:
lines.append(f"其余服务保持现状(keep): {', '.join(kept)}")
if NOTES.strip():
lines += ["", f"release-notes: {NOTES}"]
lines += ["", f"operator: {OPERATOR}"]
open(commit_msg_path, "w", encoding="utf-8").write("\n".join(lines) + "\n")
PY
git add "$ENVDIR" "$APPDIR"
if git diff --cached --quiet; then
# 纯 keep(且无 release-notes 变化)是合法空操作,明确提示而非困惑报错
log "本次发布为空操作(全部服务 keep 且无 release-notes 等变化),release 分支未产生提交"
exit 0
fi
git commit -q -F "$COMMIT_MSG_FILE"
run git push -q origin release || die "release 分支 push 失败(分支保护?netrc 凭证?)"
log "交付分支已更新: environments/$CUSTOMER"
log ""
log "════════ 发布完成 ════════"
if [ "$PURE_REUSE" = "true" ]; then
log "纯复用发布(无新版本号)"
else
log "版本: $RELEASE_VERSION (chart: $CHART_TAG)"
fi
log "现场: ArgoCD 约 3 分钟内自动 sync"
}
case "${1:-}" in
prepare) do_prepare ;;
retag) do_retag ;;
chart) do_chart ;;
pin) do_pin ;;
*) echo "用法: promote.sh prepare|retag|chart|pin" >&2; exit 1 ;;
esac
+311
View File
@@ -0,0 +1,311 @@
# 生产数据库变更运行手册
> 适用环境:客户生产环境(如 mxlexus,namespace `mixingx`)。
> 决策依据:hub 仓库 `docs/adr/0074-per-service-release-and-two-phase-cd.md`(生产 DB 变更全人工,expand-contract 纪律)。
> 本手册随 `mixingx.deploy` 仓库 release 分支交付,执行时以现场拿到的版本为准。
## 0. 适用范围与铁律
| 服务 | 是否适用本手册 | 说明 |
|---|---|---|
| sso / ultra / agent | ✅ 适用 | .NET + EF Core,生产已关闭启动自动迁移,变更必须人工执行脚本 |
| audit | ❌ 不适用 | Node.js,自带幂等迁移 + advisory lock,启动时自动执行,无需人工 |
| edge | ❌ 不适用 | 数据在本地数据目录,不用 PostgreSQL |
| gateway | ❌ 不适用 | 无数据库 |
铁律(违反任何一条都可能造成生产事故):
1. **先库后应用**:先执行数据库脚本,确认成功后,再让客户在更新中心点「更新应用」。expand-contract 纪律保证新 schema 兼容旧应用,反着来则旧代码可能访问不到新结构。
2. **执行脚本前必先备份**,没有例外。
3. **一次只动一个服务**,不要并行开多个库操作。
4. **数据库通道用完立即关闭**,任何数据库端口不得常开。
5. **生产时段不动库**,与客户约定维护窗口。
## 1. 何时执行
更新中心里某个版本标记了「含数据库变更」,或发版通知中注明该服务带迁移脚本。未标记的版本不涉及本手册。
**新客户首装**:生产环境关闭了启动自动迁移,首次部署时数据库是空的——必须先按本手册对每个带库服务(sso/ultra/agent)执行一次初始脚本(幂等脚本支持空库,会创建全部表结构),再启动应用,否则应用会因缺表无法启动。首装时按「流程一→三→四→五」执行(流程二备份对空库可跳过),全部服务执行完再通知验收。
## 2. 准备
1. 获取迁移脚本(随版本交付,幂等,可重复执行):
```bash
git clone -b release https://gitee.com/mixing-tech/mixingx.deploy.git
cd mixingx.deploy/db-scripts
ls sso/ ultra/ agent/ # 按服务分目录,文件名即版本号,如 v1.0.4.sql
```
> 注:`db-scripts/` 由构建流水线生成(ADR-0074 实施阶段 2)。流水线改造完成前,脚本由开发随发版通知手动提供,后续流程相同。
2. 确认本次要执行的服务清单(可能只有一个,如 `sso/v1.0.4.sql`)。
3. 运维机器要求:能 `kubectl` 访问客户集群(kubeconfig 已配好);有 `psql`/`pg_dump` 客户端(PostgreSQL 17),或用下文「kubectl exec 变体」免除客户端安装。
## 3. 流程一:开启数据库通道
数据库 Service 命名规律:`<release名>-postgres-service`。先发现实际名称:
```bash
kubectl -n mixingx get svc | grep postgres-service
# 预期看到(示例):
# mixingx-sso-postgres-service ClusterIP ... 5432/TCP
# mixingx-ultra-postgres-service ClusterIP ... 5432/TCP
# mixingx-agent-mxlexus-postgres-service ClusterIP ... 5432/TCP
```
开 NodePort(以 sso 为例):
```bash
kubectl -n mixingx patch svc mixingx-sso-postgres-service \
--type='json' -p='[{"op":"replace","path":"/spec/type","value":"NodePort"}]'
kubectl -n mixingx get svc mixingx-sso-postgres-service
# 记下端口映射,如 5432:31543/TCP → NodePort = 31543
```
取节点 IP:
```bash
kubectl get nodes -o wide # 任取一台节点的 INTERNAL-IP
```
连接信息即:`主机=<节点IP> 端口=<NodePort> 用户=postgres 密码=<见速查表> 数据库=<见速查表>`。
**变体(推荐用于纯命令行场景,不落集群状态)**:
```bash
kubectl -n mixingx port-forward svc/mixingx-sso-postgres-service 15432:5432
# 另开终端连接 localhost:15432;用毕 Ctrl+C 即关闭,跳过流程五
```
## 4. 流程二:备份(执行脚本前必做)
```bash
pg_dump -h <节点IP> -p <NodePort> -U postgres -Fc \
-d sso-db -f sso-db-$(date +%Y%m%d-%H%M)-pre-v1.0.4.dump
```
- 命名规则:`<库名>-<日期时间>-pre-<目标版本>.dump`。
- 保存位置:运维机器本地 + 一份拷出场外(U 盘/文件服务器),**每个库至少保留最近 3 份**。
- 恢复期间数据说明:恢复 = 回到备份时刻,备份之后的写入会丢。执行前向客户确认这一点。
## 5. 流程三:执行迁移脚本
```bash
psql -h <节点IP> -p <NodePort> -U postgres -d sso-db -v ON_ERROR_STOP=1 -f sso/v1.0.4.sql
```
- 脚本是幂等的(`--idempotent` 生成,自动跳过已应用的迁移),执行中断或重复执行都安全,直接重跑即可。
- `ON_ERROR_STOP=1`:遇错立即停止,不要带病继续。
- 多服务时逐个重复流程四→五,一次一个。
## 6. 流程四:验证
```bash
psql -h <节点IP> -p <NodePort> -U postgres -d sso-db \
-c 'select migration_id from "__EFMigrationsHistory" order by migration_id desc limit 3;'
```
- 最上面一条应是本次目标迁移(与发版通知中写明的一致)。
- 旧应用仍在运行,确认其无报错(expand-contract 保证兼容):
```bash
kubectl -n mixingx logs deploy/mixingx-sso --tail=50
```
## 7. 流程五:关闭通道
```bash
kubectl -n mixingx patch svc mixingx-sso-postgres-service \
--type='json' -p='[{"op":"replace","path":"/spec/type","value":"ClusterIP"}]'
```
验证已恢复 `ClusterIP` 后,通知客户:可以到更新中心点击该服务的「更新」。
## 8. 故障恢复(脚本执行失败或升级后异常)
1. 保持通道开启,停止对应应用(防止继续写入):
```bash
kubectl -n mixingx scale deploy/mixingx-sso --replicas=0
```
2. 用流程二的备份恢复:
```bash
pg_restore -h <节点IP> -p <NodePort> -U postgres -d sso-db \
--clean --if-exists sso-db-20260826-2200-pre-v1.0.4.dump
```
> `--clean` 会删现有对象,确认备份文件无误后再执行。不确定时先恢复到临时库核对。
3. 恢复应用副本数,验证启动正常。
4. 如镜像已更新,到更新中心点「回滚」回到上一同步版本。
5. 关闭通道,填写执行记录,事故上报 MixingX 支持。
> 本节是迁移失败场景的快速路径;完整的还原流程(确认项、验证、版本对齐)见第 11 节。
## 9. AI 协同执行约定
允许运维借助 AI 工具(Kimi Code、Claude Code 等)执行本手册,但必须遵守以下分层模型。**「生产 DB 操作人为主」原则不因 AI 介入而改变:AI 是领航员,人是手和责任人。**
### 9.1 三层权限模型
| 层级 | 范围 | AI 权限 |
|---|---|---|
| L1 只读发现 | `kubectl get/describe/logs`、`pg_restore -l`、各种 `SELECT` 查询 | AI 可直接执行并解读输出 |
| L2 可逆操作 | 开/关 NodePort、`pg_dump` 备份、`psql -f` 执行迁移脚本、流程四验证 | AI 生成填好参数的命令,**人逐条审阅后亲手执行**,输出贴回给 AI 解读 |
| L3 不可逆操作(红线) | `pg_restore --clean`、`scale --replicas=0`、删库/删表、任何写入数据的 DML | AI 只准分析和起草,**人独立核对参数后执行**,AI 不得催促、不得代按 |
### 9.2 执行参数块(每次执行前由人填写,AI 只准使用块内参数)
```yaml
customer: mxlexus # 客户名
namespace: mixingx # 目标 namespace
service: sso # 本次操作的服务:sso / ultra / agent
target_version: v1.0.4 # 目标版本(还原场景填备份对应版本)
db_name: sso-db # 数据库名
pg_service: mixingx-sso-postgres-service
dump_file: "" # 还原时必填:备份文件名,由人确认时间点后填写
```
### 9.3 确认门(AI 必须停下等人工确认)
1. 执行迁移脚本前:AI 复述「服务 / 库 / 脚本文件 / 目标版本」,人确认后才给命令;
2. 还原前:AI 复述「备份文件名 + 备份时间点 + 将丢失该时间点之后的数据」,人明确同意;
3. 任何命令输出与预期不符时:停止推进,分析后再继续,禁止跳过。
### 9.4 给 AI 的上下文提示词(复制即用,尖括号内容由人填写)
```text
你是 MixingX 生产数据库运维助手。请严格按 mixingx.deploy 仓库
docs/runbooks/db-change.md 执行操作,并遵守:
1. 环境:K8s namespace=<namespace>,服务=<service>,库=<db_name>,
PG Service=<pg_service>,目标版本=<target_version>。
2. 铁律:先备份后执行;先库后应用;一次只动一个服务;通道用完即关。
3. 权限:L1 只读命令你可直接执行;L2 命令你生成后必须由我亲手执行;
L3(pg_restore --clean、scale replicas=0、任何删改数据的操作)你只起草,
参数由我独立核对,你不得代执行。
4. 流程:先做 L1 发现(service/pod/节点/当前迁移版本)→ 列出完整操作计划
→ 逐条给 L2 命令并等我贴回输出 → 每个确认门停下等我确认。
5. 禁止编造任何参数;不确定就停下来问我。
```
## 10. 数据库备份操作手册(例行/独立)
适用:发版前备份(流程二的展开)、日常例行备份、客户索要的定期留档。
**关键认知:每个服务的 PostgreSQL 是独立实例(各自 StatefulSet),不存在"一个端口备份所有库"——每个库走自己的通道或自己的 Pod。**
### 10.1 备份清单
| 数据库 | 所在 StatefulSet | 说明 |
|---|---|---|
| `sso-db` | `mixingx-sso-postgres` | 必备 |
| `ultra-db` | `mixingx-ultra-postgres` | 必备 |
| `agent-db` | `mixingx-agent-<id>-postgres`(每实例一个) | 必备 |
| `audit-db` | `mixingx-audit-postgres` | 审计日志,系统内已按月分区并保留 6 个月;是否额外备份由客户合规要求决定 |
### 10.2 推荐方式:kubectl exec(无需开任何端口)
```bash
TS=$(date +%Y%m%d-%H%M)
kubectl -n mixingx get pods | grep postgres # 先发现实际 Pod 名
kubectl -n mixingx exec mixingx-sso-postgres-0 \
-- pg_dump -U postgres -Fc sso-db > sso-db-$TS.dump
kubectl -n mixingx exec mixingx-ultra-postgres-0 \
-- pg_dump -U postgres -Fc ultra-db > ultra-db-$TS.dump
kubectl -n mixingx exec mixingx-agent-mxlexus-postgres-0 \
-- pg_dump -U postgres -Fc agent-db > agent-db-$TS.dump
```
### 10.3 NodePort 方式(大库或需要 GUI 工具时)
按「流程一」逐服务开 NodePort,然后逐服务执行:
```bash
pg_dump -h <节点IP> -p <该服务的NodePort> -U postgres -Fc -d <db> -f <db>-$TS.dump
```
### 10.4 备份验证与保管
```bash
pg_restore -l sso-db-$TS.dump | head -20 # 能列出归档目录即为有效备份
```
- 命名:`<库名>-<日期时间>[-pre-<版本>].dump`。
- 保管:本地 + 场外各一份,每库至少保留最近 3 份;介质故障时备份即无效,场外副本不是可选项。
## 11. 数据库还原操作手册(独立)
适用:整库灾难恢复、误操作回退。**迁移脚本执行失败的快速恢复走第 8 节,本节是完整流程。**
### 11.1 还原前三个确认(缺一不可)
1. 客户书面/聊天记录认可:**恢复到哪个时间点**,并接受该时间点之后的数据丢失;
2. 备份文件有效:`pg_restore -l <dump文件> | head` 能列出内容;
3. 当前处于维护窗口,应用侧已知情。
### 11.2 还原步骤(以 sso-db 为例)
```bash
# 1. 停应用,防止恢复期间写入
kubectl -n mixingx scale deploy/mixingx-sso --replicas=0
# 2a. exec 方式恢复(推荐,无需开端口)
cat sso-db-20260826-2200-pre-v1.0.4.dump | kubectl -n mixingx exec -i mixingx-sso-postgres-0 \
-- pg_restore -U postgres -d sso-db --clean --if-exists
# 2b. 或 NodePort 方式(先按流程一开篇)
pg_restore -h <节点IP> -p <NodePort> -U postgres -d sso-db \
--clean --if-exists sso-db-20260826-2200-pre-v1.0.4.dump
# 3. 验证:表回来了、行数合理、迁移版本与备份一致
kubectl -n mixingx exec mixingx-sso-postgres-0 -- psql -U postgres -d sso-db \
-c 'select migration_id from "__EFMigrationsHistory" order by migration_id desc limit 3;'
# 4. 恢复应用
kubectl -n mixingx scale deploy/mixingx-sso --replicas=2
kubectl -n mixingx rollout status deploy/mixingx-sso
```
5. **版本对齐**:还原后数据库回到了旧迁移版本,应用镜像也必须是配套的旧版本——到更新中心对该服务点「回滚」。不要出现「新镜像 + 旧库」的组合。
6. 关闭通道(若开过),填写执行记录。
### 11.3 红线
- 禁止未做 11.1 三项确认就执行 `--clean`;
- 禁止在生产时段还原;
- 还原多个库时逐库进行,一次一个。
## 12. 执行记录(每次必填)
| 字段 | 内容 |
|---|---|
| 日期/执行人 | |
| 客户/环境 | 如 mxlexus / mixingx |
| 服务与目标版本 | 如 sso v1.0.4 |
| 备份文件路径 | |
| 脚本执行结果 | 成功 / 失败(附报错) |
| 迁移版本验证 | `__EFMigrationsHistory` 最新 migration_id |
| 通道关闭确认 | 是 / 否 |
| 客户已点更新 | 是 / 否 / 时间 |
## 附录:速查表
| 项 | 值 |
|---|---|
| namespace | `mixingx` |
| PG Service | `<release名>-postgres-service`,用 `kubectl -n mixingx get svc \| grep postgres-service` 发现 |
| PG 端口 | 5432(集群内) |
| 用户名 | `postgres` |
| 密码 | chart 默认 `Admin12345`;如 `environments/<customer>/*-values.yaml` 覆盖了 `sharedInfra.postgres.password`,以覆盖值为准 |
| 数据库名 | sso → `sso-db`,ultra → `ultra-db`,agent → `agent-db`;以 `kubectl -n mixingx exec <postgres-pod> -- env \| grep POSTGRES_DB` 为准 |
| 迁移脚本 | release 分支 `db-scripts/<service>/<version>.sql` |
| 历史表 | `"__EFMigrationsHistory"` |
| 备选通道 | `kubectl -n mixingx port-forward svc/<pg-service> 15432:5432` |
| 免客户端变体 | `kubectl -n mixingx exec -it <postgres-pod> -- psql -U postgres -d <db>`(配合 `kubectl cp` 传脚本/dump) |
@@ -1,12 +0,0 @@
# network-agent(设备网络控制台):每节点 DaemonSet,提供主机网口与 WiFi 配置 API(:9750)
# 前置条件:节点已执行 chart 仓 scripts/provision-host.sh(安装并托管 NetworkManager)
image:
tag: develop-v.1.0.1-202609040715-3
# 鉴权令牌:为空 = 不鉴权(仅限内网联调)。
# 配置后前端弹窗请求头需带 Authorization: Bearer <token>(当前前端未实现,保持为空)
authToken: ""
corsOrigins: "*"
rollbackTimeoutSeconds: 60
k3sRestartOnIpChange: true
+3 -5
View File
@@ -16,13 +16,10 @@ images:
sharedInfra:
postgres:
adminUsername: postgres
username: postgres
password: "Admin12345"
port: 5432
idleInTransactionSessionTimeout: 60s
credentialsSecret:
adminPasswordKey: admin-password
appPasswordKey: app-password
connectionStringKey: connection-string
redis:
host: redis-service
port: 6379
@@ -44,3 +41,4 @@ mqttCredentials:
audit:
publisher:
enabled: true
@@ -1,56 +0,0 @@
# Agent PostgreSQL runtime role rollout
The demo Agent uses a dedicated PostgreSQL login. Passwords and the complete
connection string are stored only in a Kubernetes Secret and are not committed.
## Prepare the Secret
Load the administrator password already used by the Agent PostgreSQL instance
and a distinct application password from the approved vault into the operator
shell environment, then run:
```bash
AGENT_POSTGRES_ADMIN_PASSWORD='<from-vault>' \
AGENT_POSTGRES_APP_PASSWORD='<from-vault>' \
./scripts/upsert-agent-postgres-credentials.sh mixingx demo-2 agent_demo_2
```
The script is idempotent. Do not place either value in a values file, command
argument, or shell history. It writes short-lived mode-`0700` input files and
removes them on exit, so the values are not exposed through `kubectl` process
arguments. The generated Secret contains `admin-password`, `app-password`, and
a `connection-string` whose username is `agent_demo_2`.
## Roll out
1. Sync `mixingx-agent-demo-2` in Argo CD. The PostgreSQL StatefulSet consumes
the administrator password; the Agent init container waits for PostgreSQL,
provisions the runtime role, transfers existing `public` objects, and applies
the database-local timeout.
2. When rotating an existing Secret, restart the Agent deployment explicitly:
```bash
kubectl --namespace mixingx rollout restart deployment/agent-demo-2-deployment
kubectl --namespace mixingx rollout status deployment/agent-demo-2-deployment --timeout=300s
```
3. Verify the backend container receives only the application connection string.
The administrator login remains reserved for provisioning, backup, and manual
maintenance. Startup EF Core migrations run as the database-owning application
role; `statement_timeout` and `lock_timeout` are explicitly left unset.
## Verify
Run the following through a temporary `psql` Pod or an approved database client,
using the application credential from the Secret:
```sql
SHOW idle_in_transaction_session_timeout;
SHOW statement_timeout;
SHOW lock_timeout;
SELECT rolname, rolsuper, rolcreatedb, rolcreaterole
FROM pg_roles
WHERE rolname = current_user;
```
Expected values are `1min`, `0`, `0`, and all three privilege flags `false`.
-2
View File
@@ -2,5 +2,3 @@ agents:
- id: demo-2
description: Demo Agent 2
phaseType: DieCasting
databaseUsername: agent_demo_2
postgresCredentialsSecret: agent-demo-2-postgres-credentials
+24
View File
@@ -0,0 +1,24 @@
# MixingX code-server — demo 环境 values
# 测试版浏览器 IDE;镜像 mixingx/codeserver(mxcicd 构建,预装插件,不走 image-version.yaml 的 images 机制)。
# 密码为部署时随机生成(明文,家规同 postgres/redis);修改后 ArgoCD 自动滚动重启生效。
codeserver:
name: codeserver
replicas: 1
description: "浏览器版 VS Code(测试,demo)"
image:
repository: 192.168.1.119:8888/mixingx/codeserver
tag: v0.2.0
password: "4V21baEkh3C6jOLetFcgVD9mDF6uPs1S"
storage:
className: local-path
size: 5Gi
keep: true
ingress:
enabled: true
className: traefik
host: codeserver.mixingx.local
annotations:
traefik.ingress.kubernetes.io/router.entrypoints: web
+10
View File
@@ -2,6 +2,16 @@ edges:
- id: demo
idWorkerId: 17
description: Demo Edge
# ADS Router 本方身份:显式分配,重启不变,绝不从 Pod IP 推导。
# localNetId 第 4 字节与 idWorkerId 对齐便于记忆;列表内前 4 字节互异(10.200.0.17 / 10.200.0.18)。
adsRouter:
localNetId: "10.200.0.17.1.1"
# 运维占位:demo 集群节点出站地址,两 Edge 同出口(多 Edge 同出口验收场景);
# 上线前按现场 PLC 可回程的实际地址核实替换。
publicAddress: "192.168.1.173"
- id: demo-2
idWorkerId: 18
description: Demo Edge 2
adsRouter:
localNetId: "10.200.0.18.1.1"
publicAddress: "192.168.1.173" # 同 demo:运维占位,两 Edge 同出口
+18 -15
View File
@@ -4,47 +4,50 @@ timezone: Asia/Shanghai
images:
gateway:
repository: gateway
tag: develop-v.1.0.1-202608050744-6
tag: develop-v.1.0.1-202611170743-6
sso:
repository: sso
tag: develop-v.1.0.1-202608050742-21
tag: develop-v.1.0.1-202611170744-9
ssoWeb:
repository: sso-web
tag: develop-v.1.0.1-202608050742-21
tag: develop-v.1.0.1-202611170744-9
ultra:
repository: ultra
tag: develop-v.1.0.1-202608050746-12
tag: develop-v.1.0.1-202611170745-9
ultraWeb:
repository: ultra-web
tag: develop-v.1.0.1-202608050746-12
tag: develop-v.1.0.1-202611170745-9
audit:
repository: audit
tag: develop-v.1.0.1-202607100612-4
tag: develop-v.1.0.1-202611170746-8
edge:
repository: edge
tag: develop-v.1.0.1-202608050745-19
tag: develop-v.1.0.1-202611170748-14
edgeWeb:
repository: edge-web
tag: develop-v.1.0.1-202608050745-19
tag: develop-v.1.0.1-202611170748-14
agent:
repository: agent
tag: develop-v.1.0.1-202608050748-25
tag: develop-v.1.0.1-202611170746-15
agentWeb:
repository: agent-web
tag: develop-v.1.0.1-202608050748-25
tag: develop-v.1.0.1-202611170746-15
protocol:
opcua:
repository: opcua
tag: develop-v.1.0.1-202608050747-15
tag: develop-v.1.0.1-202611030041-1
modbus:
repository: modbus
tag: develop-v.1.0.1-202608050747-15
tag: develop-v.1.0.1-202611030041-1
ads:
repository: ads
tag: develop-v.1.0.1-202608050747-15
tag: develop-v.1.0.1-202611030041-1
s7:
repository: s7
tag: develop-v.1.0.1-202608050747-15
tag: develop-v.1.0.1-202611030041-1
s7-diecast:
repository: s7-diecast
tag: develop-v.1.0.1-202608050747-15
tag: develop-v.1.0.1-202611030041-1
auditWeb:
repository: audit-web
tag: develop-v.1.0.1-202611170746-8
+15
View File
@@ -0,0 +1,15 @@
# MixingX MQTTX Web — demo 环境 values
# MQTTX Web 用公共镜像 emqx/mqttx-web(不进 Harbor),不走 image-version.yaml 的 images 机制。
# 仅在此覆盖 demo 环境的 Ingress host(*.mixingx.local DNS 在 demo 环境可用)。
mqttx:
name: mqttx
replicas: 1
description: "MQTT 监控客户端 (demo)"
ingress:
enabled: true
className: traefik
host: mqttx.mixingx.local
annotations:
traefik.ingress.kubernetes.io/router.entrypoints: web
@@ -0,0 +1,6 @@
image:
tag: develop-v.1.0.1-202611170748-6
authToken: ''
corsOrigins: '*'
rollbackTimeoutSeconds: 60
k3sRestartOnIpChange: true
+9
View File
@@ -111,6 +111,15 @@ servers:
image: opcua
port: 4840
scene: /scenes/opcua/diecast-parameters.json
# 定量炉:铝液温度 660-670 波动;铝液液位每分钟降 ~5(±0.3),跌破 20 回满 ~100(±1.5),3s 一变
- id: opcua-dosing-furnace
type: opcua
image: opcua
port: 4840
scene: /scenes/opcua/dosing-furnace.json
args:
- "--name"
- "定量炉MockServer"
- id: modbus-basic-1
type: modbus
image: modbus
+3
View File
@@ -0,0 +1,3 @@
# Dev 环境 values(已退役)
dev 环境已退役,本目录 values 仅作历史保留,Argo CD 不再引用。退役原因与重新启用步骤见 [../../applications/dev/README.md](../../applications/dev/README.md)。
+2 -5
View File
@@ -14,13 +14,10 @@ images:
sharedInfra:
postgres:
adminUsername: postgres
username: postgres
password: "Admin12345"
port: 5432
idleInTransactionSessionTimeout: 60s
credentialsSecret:
adminPasswordKey: admin-password
appPasswordKey: app-password
connectionStringKey: connection-string
redis:
host: redis-service
port: 6379
-2
View File
@@ -3,5 +3,3 @@ agents:
description: Dev Agent
phaseType: DieCasting # 工序类型(注入 AGENT_PHASE_TYPE),对应 apphost WithPhaseType
nodeLabel: node1
databaseUsername: agent_dev
postgresCredentialsSecret: agent-demo-postgres-credentials
+5
View File
@@ -3,3 +3,8 @@ edges:
idWorkerId: 17
description: Dev Edge
nodeLabel: node2
# ADS Router 本方身份,契约同 demo(本环境模板停用,仅维护契约);
# 第三字节取 1 与 demo 环境(10.200.0.*)区分作用域。
adsRouter:
localNetId: "10.200.1.17.1.1"
publicAddress: "192.168.1.173" # 运维占位,启用前按现场核实替换
@@ -1,32 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
namespace="${1:?usage: $0 <namespace> <site> <app-username>}"
site="${2:?usage: $0 <namespace> <site> <app-username>}"
app_username="${3:?usage: $0 <namespace> <site> <app-username>}"
: "${AGENT_POSTGRES_ADMIN_PASSWORD:?set AGENT_POSTGRES_ADMIN_PASSWORD}"
: "${AGENT_POSTGRES_APP_PASSWORD:?set AGENT_POSTGRES_APP_PASSWORD}"
database_name="agent-db-${site}"
postgres_host="agent-${site}-postgres-service"
secret_name="agent-${site}-postgres-credentials"
escaped_app_password=${AGENT_POSTGRES_APP_PASSWORD//\"/\"\"}
connection_string="Host=${postgres_host};Port=5432;Username=${app_username};Password=\"${escaped_app_password}\";Database=${database_name}"
credentials_directory=$(mktemp -d)
trap 'rm -rf -- "${credentials_directory}"' EXIT
chmod 700 "${credentials_directory}"
printf '%s' "${AGENT_POSTGRES_ADMIN_PASSWORD}" > "${credentials_directory}/admin-password"
printf '%s' "${AGENT_POSTGRES_APP_PASSWORD}" > "${credentials_directory}/app-password"
printf '%s' "${connection_string}" > "${credentials_directory}/connection-string"
kubectl --namespace "${namespace}" create secret generic "${secret_name}" \
--from-file=admin-password="${credentials_directory}/admin-password" \
--from-file=app-password="${credentials_directory}/app-password" \
--from-file=connection-string="${credentials_directory}/connection-string" \
--dry-run=client \
--output=yaml \
| kubectl apply --filename=-
echo "Updated ${namespace}/${secret_name}; restart the Agent Deployment to consume changed values."