From 8b4f3efa9fd34097917fa5fae76b8b9944f1cd65 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Tue, 8 Sep 2026 11:29:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(ci):=20promote.sh=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=20pin-acr=20=E2=80=94=E2=80=94=20=E9=80=89=20ACR=20=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=20tag=20=E5=8E=9F=E6=A0=B7=E9=92=89=E5=85=A5=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 镜像搬运已剥离给门户「直推 ACR」(crane);发布侧新增 PLAN action pin-acr: - PLAN: {"service":..,"action":"pin-acr","acrTag":""} - 不进交付基线(不搬运不 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) --- ci/promote.sh | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/ci/promote.sh b/ci/promote.sh index 8ef4d2d..8845d45 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -24,6 +24,9 @@ # 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) # 兼容参数: SERVICES=sso,agent(=这些服务 deliver,其余 keep) # IMAGES=sso=tagX(=该服务 deliver 且显式 harborTag;逗号分隔多个) # PLAN 存在时优先;全部缺省 = 6 服务全 deliver demo 当前 tag(与改造前一致) @@ -32,8 +35,8 @@ # 版本号分配: # 有 deliver/ci-now(或 CHART_ONLY=true)→ 需要新版本号(RELEASE_VERSION 缺省 auto-bump); # chart tag 已存在不再拒绝,记 CHART_TAG_EXISTS=true 复用(幂等,可同参数重跑/同版本发多客户) -# 全部 keep/reuse(纯复用发布)→ 不分配新版本号,chart 步骤跳过, -# reuse 服务 chart targetRevision 各指已有 chart- +# 全部 keep/reuse/pin-acr(纯复用发布)→ 不分配新版本号,chart 步骤跳过, +# reuse 服务 chart targetRevision 各指已有 chart-;pin-acr 服务 chart 引用不动 # # 其他参数: # CHART_ONLY=true 只发 chart:prepare 跳过镜像基线与 Harbor 校验,retag 整步跳过, @@ -146,7 +149,7 @@ HARBOR_HOST = os.environ.get("HARBOR_HOST", "192.168.1.119:8888") # ── 服务映射常量表(pin 步骤经 .plan.json 继承同一份定义,勿另起副本)── ALL = ["gateway", "sso", "ultra", "audit", "agent", "edge"] -ACTIONS = ["keep", "reuse", "deliver", "ci-now"] +ACTIONS = ["keep", "reuse", "deliver", "ci-now", "pin-acr"] # 服务 → 镜像 repo 列表(前后端共用同一 tag) REPOS = { "gateway": ["gateway"], @@ -254,6 +257,11 @@ for e in entries: tag = str(e.get("harborTag") or "").strip() n["harborTag"] = tag or demo_tag(svc) 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]} @@ -329,7 +337,7 @@ open(plantxt_path, "w", encoding="utf-8").write(raw_plan or json.dumps(plan_out, for e in plan_out: if e["action"] == "keep": continue - print(f"[promote] 计划: {e['service']:<8} {e['action']:<8} {e.get('harborTag') or e.get('version') or ''}") + print(f"[promote] 计划: {e['service']:<8} {e['action']:<8} {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 @@ -541,7 +549,12 @@ if not CHART_ONLY: images = data.get("images") or {} for e in actions: svc = e["service"] - new_tag = RELEASE_VERSION if e["action"] in ("deliver", "ci-now") else e["version"] + if e["action"] in ("deliver", "ci-now"): + new_tag = RELEASE_VERSION + elif e["action"] == "pin-acr": + new_tag = e["acrTag"] # 所选 ACR tag 原样钉入,不 retag + else: + new_tag = e["version"] to_tags[svc] = new_tag for i, key in enumerate(e["keys"]): node = images.get(key) @@ -586,6 +599,10 @@ def retarget(path, new_ref, required): return old_ref, new_ref for e in actions: + if e["action"] == "pin-acr": + # pin-acr 只钉镜像 tag,chart 引用保持不变(values 变更即可触发 ArgoCD sync) + print(f"[promote] {e['service']}: chart 引用保持不变(pin-acr)") + continue new_ref = CHART_TAG if e["action"] in ("deliver", "ci-now") else f"chart-{e['version']}" r = retarget(os.path.join(appdir, e["appFile"]), new_ref, required=True) if r: @@ -634,6 +651,11 @@ for e in actions: 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"]) From eb44c30dbb5368f7753411e44241352a883f96b6 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Tue, 8 Sep 2026 12:41:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(ci):=20pin-acr=20=E4=B9=9F=E7=AE=97?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8F=91=E5=B8=83=E2=80=94=E2=80=94=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=89=88=E6=9C=AC=E5=8F=B7=E5=B9=B6=20bump=20chart(?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=BC=95=E7=94=A8=E8=B7=9F=E9=9A=8F),?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E4=BB=8D=E9=92=89=E6=89=80=E9=80=89=20tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 此前 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) --- ci/promote.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ci/promote.sh b/ci/promote.sh index 8845d45..7d922f5 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -33,10 +33,11 @@ # protocol mock 不进 PLAN,保留 PROMOTE_PROTOCOLS 独立开关 # # 版本号分配: -# 有 deliver/ci-now(或 CHART_ONLY=true)→ 需要新版本号(RELEASE_VERSION 缺省 auto-bump); +# 有 deliver/ci-now/pin-acr(或 CHART_ONLY=true)→ 需要新版本号(RELEASE_VERSION 缺省 auto-bump); # chart tag 已存在不再拒绝,记 CHART_TAG_EXISTS=true 复用(幂等,可同参数重跑/同版本发多客户) -# 全部 keep/reuse/pin-acr(纯复用发布)→ 不分配新版本号,chart 步骤跳过, -# reuse 服务 chart targetRevision 各指已有 chart-;pin-acr 服务 chart 引用不动 +# 全部 keep/reuse(纯复用发布)→ 不分配新版本号,chart 步骤跳过, +# reuse 服务 chart targetRevision 各指已有 chart- +# pin-acr 也算正式发布:分配新版本号并 bump chart(应用引用跟随),镜像钉所选 tag 名 # # 其他参数: # CHART_ONLY=true 只发 chart:prepare 跳过镜像基线与 Harbor 校验,retag 整步跳过, @@ -266,7 +267,7 @@ for e in entries: plan_out = [norm.get(s) or {"service": s, "action": "keep", "repos": REPOS[s], "keys": KEYS[s], "appFile": APPFILE[s]} for s in ALL] -has_deliver = any(e["action"] in ("deliver", "ci-now") for e in plan_out) +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()] @@ -599,11 +600,7 @@ def retarget(path, new_ref, required): return old_ref, new_ref for e in actions: - if e["action"] == "pin-acr": - # pin-acr 只钉镜像 tag,chart 引用保持不变(values 变更即可触发 ArgoCD sync) - print(f"[promote] {e['service']}: chart 引用保持不变(pin-acr)") - continue - new_ref = CHART_TAG if e["action"] in ("deliver", "ci-now") else f"chart-{e['version']}" + 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