From 56207aa5e1c04936bb088caa1196718aa93ba2d6 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Thu, 27 Aug 2026 12:07:49 +0800 Subject: [PATCH] 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). --- .drone.yml | 49 +++- ci/promote.sh | 667 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 607 insertions(+), 109 deletions(-) diff --git a/.drone.yml b/.drone.yml index c29d245..aa02864 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,16 +2,34 @@ # .drone.yml — MixingX 交付晋级流水线(release-promote)— 本仓库第一条流水线 # # 触发方式: 手动 (Drone Web 界面 → 打开 mixingx.deploy → NEW BUILD) -# 参数(可选,均有默认): -# RELEASE_VERSION — 交付版本号 v1.0.1;不传则自动递增 patch(查 chart 仓库上一个 tag) -# CUSTOMER — 客户目录名,默认 mxlexus +# 参数(可选,均有默认;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): -# prepare: 解析版本号 + 读 demo 交付基线 + 核对交付镜像清单 -# retag : 16 业务镜像 develop-* → v1.0.x,bit 级复制推 ACR(ADR-0067) -# chart : chart 仓库 bump Chart.yaml + 打 tag chart-v1.0.x -# pin : release 分支客户目录钉版(镜像 tag + chart tag) +# 职责(四步,详见 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 个源码仓库的流水线) @@ -21,6 +39,8 @@ # # Secrets (Drone → mixingx.deploy → Settings → Secrets): # acr_push_username / acr_push_password — ACR 推送凭证(✅ 已配置) +# harbor_username / harbor_password — Harbor 凭证(prepare 校验显式 harborTag 存在性; +# 未配置则跳过校验并警告) # ============================================================================ kind: pipeline @@ -33,16 +53,21 @@ trigger: steps: # ═══════════════════════════════════════════ - # Step 1: 准备 — 版本号 + 交付基线 + 镜像清单核对 + # 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 + # Step 2: 镜像晋级 — pull 119 → tag ACR → push + 记录 digest # ═══════════════════════════════════════════ - name: retag-images image: docker:24-dind @@ -62,7 +87,7 @@ steps: - sh ci/promote.sh retag # ═══════════════════════════════════════════ - # Step 3: chart 版本化 — bump Chart.yaml + tag chart-v1.0.x + # Step 3: chart 版本化 — bump Chart.yaml + tag chart-v1.0.x(已存在则复用) # ═══════════════════════════════════════════ - name: chart-tag image: 192.168.1.119:8888/mixingx/gitops-tools:latest @@ -71,7 +96,7 @@ steps: - sh ci/promote.sh chart # ═══════════════════════════════════════════ - # Step 4: 交付分支钉版 — release 分支客户目录 + # Step 4: 交付分支钉版 — release 分支客户目录按服务钉版 + release-notes # ═══════════════════════════════════════════ - name: pin-release image: 192.168.1.119:8888/mixingx/gitops-tools:latest diff --git a/ci/promote.sh b/ci/promote.sh index cbd896c..8ef4d2d 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -1,35 +1,85 @@ #!/bin/sh # ============================================================================ # ci/promote.sh — 交付晋级脚本(release-promote 流水线的执行体)— ADR-0067 +# 按服务计划(PLAN)部分交付,设计见 hub docs/adr/0074 # -# 子命令(由 .drone.yml 的四个 step 分别调用,状态经 /drone/src/.release-env -# 与 /drone/src/.baseline 文件在 step 间传递): +# 子命令(由 .drone.yml 的四个 step 分别调用;状态经 $WS 下的 .release-env / +# .baseline / .digests / .plan.json 文件在 step 间传递,WS=${DRONE_WORKSPACE:-/drone/src}): # -# prepare 解析 RELEASE_VERSION/CUSTOMER,读 demo image-version 的 develop tag -# 组合(= 交付基线),克隆 chart 仓库核对交付镜像清单 -# retag 交付基线镜像 pull 119 → tag ACR:v1.0.x → push(bit 级复制,不重新构建) -# chart chart 仓库 10 个 Chart.yaml bump + commit + tag chart-v1.0.x + push -# pin deploy release 分支:客户 image-version 钉 v1.0.x + -# applications 客户目录 targetRevision 钉 chart tag + push +# 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 与 chart targetRevision, +# 追加 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: gateway / sso / ultra / audit / agent / edge(前后端一对,共用 tag) +# action : keep(缺省,不动) +# reuse(复用已交付版本 version,镜像已在 ACR 不重推) +# deliver(harborTag 为未交付过的 Harbor tag,缺省取 demo 当前,retag 到新版本号) +# ci-now(行为同 deliver,仅 release-notes 如实记录为 ci-now) +# 兼容参数: SERVICES=sso,agent(=这些服务 deliver,其余 keep) +# IMAGES=sso=tagX(=该服务 deliver 且显式 harborTag;逗号分隔多个) +# PLAN 存在时优先;全部缺省 = 6 服务全 deliver demo 当前 tag(与改造前一致) +# protocol mock 不进 PLAN,保留 PROMOTE_PROTOCOLS 独立开关 +# +# 版本号分配: +# 有 deliver/ci-now(或 CHART_ONLY=true)→ 需要新版本号(RELEASE_VERSION 缺省 auto-bump); +# chart tag 已存在不再拒绝,记 CHART_TAG_EXISTS=true 复用(幂等,可同参数重跑/同版本发多客户) +# 全部 keep/reuse(纯复用发布)→ 不分配新版本号,chart 步骤跳过, +# reuse 服务 chart targetRevision 各指已有 chart- +# +# 其他参数: +# CHART_ONLY=true 只发 chart:prepare 跳过镜像基线与 Harbor 校验,retag 整步跳过, +# pin 只动 chart targetRevision 与 release-notes +# RELEASE_NOTES 发布说明,写入 release-notes.yaml 条目 +# DB_CHANGE 逗号分隔服务名(须为本次非 keep 服务子集),条目 dbChange 标 true +# OPERATOR 发布操作人,默认 drone +# PROMOTE_DRY_RUN=true 本地演练:docker 与 git push 仅打印不执行 # # 原则: # - 交付基线 = demo 正在跑且回归过的 develop tag 组合(只读 master,不改 master) # - 客户目录只允许本流水线写(release 分支受保护,ADR-0068) -# - 任何一步失败即终止,不留半成品(ACR 里的 v1.0.x tag 幂等可重推) +# - 全流程幂等: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:-https://gitee.com/mixing-tech/mixingx.deploy.git}" CHART_REPO="${CHART_REPO:-https://gitee.com/mixing-tech/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."https://gitee.com/".insteadOf "git@gitee.com:" 2>/dev/null || true git config user.name "Drone Release" @@ -39,8 +89,18 @@ git_setup() { require_env() { [ -f "$ENV_FILE" ] || die "缺少 $ENV_FILE,请先运行 prepare 步骤" . "$ENV_FILE" - [ -n "${RELEASE_VERSION:-}" ] && [ -n "${CUSTOMER:-}" ] && [ -n "${CHART_TAG:-}" ] \ - || die "$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 } # ───────────────────────────────────────────── @@ -64,48 +124,240 @@ do_prepare() { printf '%s\n' "$CUSTOMERS" | grep -qx "$CUSTOMER" \ || die "environments/$CUSTOMER 不在 release 分支上。现有客户: $(printf '%s ' $CUSTOMERS)" - RELEASE_VERSION="${RELEASE_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" ;; + CHART_ONLY="${CHART_ONLY:-false}" + case "$CHART_ONLY" in + true|false) : ;; + *) die "CHART_ONLY 只接受 true/false,收到: $CHART_ONLY" ;; esac - CHART_TAG="chart-$RELEASE_VERSION" + export CHART_ONLY - log "交付版本: $RELEASE_VERSION 客户: $CUSTOMER chart tag: $CHART_TAG" + # ── 解析服务计划(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 - # 防重复发布:chart tag 已存在即拒绝(交付版本号不可变) - if git ls-remote --tags "$CHART_REPO" "refs/tags/$CHART_TAG" | grep -q .; then - die "$CHART_TAG 已存在于 chart 仓库,交付版本不可复用;请递增版本号" - fi +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") - # 读 demo 交付基线(此刻 master 的 develop tag 组合 = demo 正跑且回归过的版本) - python3 - "$WS/environments/demo/image-version.yaml" "$BASELINE_FILE" "${PROMOTE_PROTOCOLS:-false}" <<'PY' -import sys, yaml -src, dst, with_protocols = sys.argv[1], sys.argv[2], sys.argv[3] == "true" -data = yaml.safe_load(open(src, encoding="utf-8")) +# ── 服务映射常量表(pin 步骤经 .plan.json 继承同一份定义,勿另起副本)── +ALL = ["gateway", "sso", "ultra", "audit", "agent", "edge"] +ACTIONS = ["keep", "reuse", "deliver", "ci-now"] +# 服务 → 镜像 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", +} + +def die(msg): + sys.exit("[promote] 错误: " + msg) + +data = yaml.safe_load(open(demo_path, encoding="utf-8")) or {} images = data.get("images") or {} -lines = [] -def walk(prefix, node): - for k, v in node.items(): - key = f"{prefix}.{k}" if prefix else k - if not isinstance(v, dict): + +def demo_tag(svc): + """deliver/ci-now 缺省 harborTag = demo 当前 tag(前后端应共用同一 tag)""" + tags = [] + for k in KEYS[svc]: + 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: + die(f"PLAN[{i}] 应为对象且含 service 字段") + 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 "repository" in v and "tag" in v: - lines.append((key, v["repository"], v["tag"])) + 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 ALL] + +# ── 2. 校验 + 规范化为全量 6 服务计划 ── +norm, seen = {}, set() +for e in entries: + svc = e.get("service") + if svc not in ALL: + die(f"非法服务名: {svc}(合法值: {', '.join(ALL)})") + 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)})") + n = {"service": svc, "action": action, + "repos": REPOS[svc], "keys": KEYS[svc], "appFile": APPFILE[svc]} + 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) + n["harborTagExplicit"] = bool(tag) + norm[svc] = n +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) + +# ── 3. DB_CHANGE 校验:逗号分隔服务名,须为本次非 keep 服务的子集 ── +db_change = [s.strip() for s in (os.environ.get("DB_CHANGE") or "").split(",") if s.strip()] +nonkeep = {e["service"] for e in plan_out if e["action"] != "keep"} +for s in db_change: + if s not in ALL: + die(f"DB_CHANGE 含非法服务名: {s}(合法值: {', '.join(ALL)})") + 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.docker.distribution.manifest.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: - walk(key, v) -walk("", images) -out, skipped = [], [] -for key, repo, tag in lines: - if key.startswith("protocol.") and not with_protocols: - skipped.append(key); continue - if not repo or not tag: - sys.exit(f"[promote] 错误: demo image-version 中 {key} 缺 repository/tag") - out.append(f"{repo} {tag}") -open(dst, "w", encoding="utf-8").write("\n".join(out) + "\n") -print(f"[promote] 交付基线 {len(out)} 个镜像: " + ", ".join(l.split()[0] for l in out)) -if skipped: print(f"[promote] 跳过 protocol 镜像: {', '.join(skipped)}") + 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 + print(f"[promote] 计划: {e['service']:<8} {e['action']:<8} {e.get('harborTag') or e.get('version') or ''}") +print(f"[promote] DB 变更服务: {', '.join(db_change) or '无'}") PY + . "$FACTS_FILE" # HAS_DELIVER=true|false + + # ── 版本号与 chart tag 分配 ── + GIVEN_VERSION="${RELEASE_VERSION:-}" + if [ "$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 + # 纯复用发布(全部 keep/reuse):不需要新版本号,chart 步骤整体跳过 + RELEASE_VERSION=""; CHART_TAG=""; CHART_TAG_EXISTS=false; PURE_REUSE=true + [ -z "$GIVEN_VERSION" ] || log "警告: 纯复用发布不需要新版本号,已忽略传入的 $GIVEN_VERSION" + log "纯复用发布(无 deliver/ci-now):不分配新版本号,chart 步骤将跳过" + fi # 克隆 chart 仓库(供 chart 步骤复用)并核对交付镜像清单 rm -rf "$WS/.ci"; mkdir -p "$WS/.ci" @@ -121,11 +373,22 @@ if missing: print("[promote] 交付镜像清单核对通过(第三方镜像齐备)") PY - cat > "$ENV_FILE" < "$ENV_FILE" log "prepare 完成" } @@ -134,22 +397,49 @@ EOF # ───────────────────────────────────────────── do_retag() { require_env - : "${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 与实例访问授权)" + 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" - 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 + 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" } @@ -160,6 +450,15 @@ do_retag() { 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" @@ -178,8 +477,9 @@ PY git diff --cached --quiet && die "Chart.yaml 无变化,异常(版本号相同?)" git commit -q -m "release: bump chart version to $RELEASE_VERSION" git tag "$CHART_TAG" - git push -q origin HEAD:master "refs/tags/$CHART_TAG" || die "chart 仓库 push 失败(netrc 凭证?)" - log "chart 已发布: $CHART_TAG(10 个 chart version=$VER)" + 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)" } # ───────────────────────────────────────────── @@ -197,45 +497,218 @@ do_pin() { APPDIR="applications/$CUSTOMER" [ -d "$ENVDIR" ] || die "客户目录不存在: $ENVDIR" [ -d "$APPDIR" ] || die "客户目录不存在: $APPDIR" + [ -f "$PLAN_FILE" ] || die "缺少 $PLAN_FILE,请先运行 prepare 步骤" - # 1) image-version 全部钉到交付版本(保留 repository 映射,protocol 整段删除) - python3 - "$ENVDIR/image-version.yaml" "$RELEASE_VERSION" <<'PY' -import sys, yaml -path, ver = sys.argv[1], sys.argv[2] -data = yaml.safe_load(open(path, encoding="utf-8")) or {} -data.pop("protocol", None) -def pin(node): - for k, v in node.items(): - if isinstance(v, dict): pin(v) - elif k == "tag": node[k] = ver -for key in ("images",): - if key in data: pin(data[key]) -if "images" in data: data["images"].pop("protocol", None) -data["tag"] = ver -yaml.safe_dump(data, open(path, "w", encoding="utf-8"), - default_flow_style=False, sort_keys=False, allow_unicode=True) -print(f"[promote] {path} 已钉版 {ver}") + 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"] +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:只钉非 keep 服务的 key(CHART_ONLY 不动镜像文件)── +from_tags, to_tags = {}, {} +if not CHART_ONLY: + data = yaml.safe_load(open(iv_path, encoding="utf-8")) or {} + 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"] + 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} 钉版完成(未选中服务原样保留)") +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: + 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: + 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: + svc, action = e["service"], e["action"] + 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 留空") + 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 不变") + +# ── 4) db-scripts 检查(只警告不 fail)── +# 2b 改造后:sso/agent/ultra 构建流水线在构建时生成幂等迁移 SQL,以 harbor tag 命名 +# 存放于仓库根 db-scripts//(如 db-scripts/sso/develop-v.1.0.1-xxx.sql),pin 时带至 release +for svc in DB_CHANGE: + d = os.path.join("db-scripts", svc) + st = src_tags.get(svc, "") + hit = os.path.isdir(d) and bool(st) and any(st in f for f in os.listdir(d)) + if not hit: + print(f"[promote] 警告: {svc} 声明了 DB 变更,但 db-scripts/{svc}/ 下未找到与 " + f"{st or '(无 sourceTag)'} 对应的脚本,请确认迁移 SQL 已随构建流水线写回") + +# ── 5) commit message:服务清单(action/from→to)与 RELEASE_NOTES ── +if PURE_REUSE: + title = f"release: {CUSTOMER} 纯复用发布(无新版本号)" +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 - # 2) applications 客户目录的 chart targetRevision → 新 chart tag - # (只替换 chart-vX.Y.Z 模式;deploy 仓库自身的 targetRevision: release 不动) - sed -i.bak -E "s/chart-v[0-9]+\\.[0-9]+\\.[0-9]+/$CHART_TAG/g" "$APPDIR"/*.yaml - rm -f "$APPDIR"/*.yaml.bak - grep -rn "$CHART_TAG" "$APPDIR" >/dev/null || die "$APPDIR 中未找到可替换的 chart targetRevision" - git add "$ENVDIR" "$APPDIR" - git diff --cached --quiet && die "钉版后无变化(版本号未变?)" - BASELINE_TAGS=$(sed 's/^/ /' "$BASELINE_FILE") - git commit -q -m "release: $CUSTOMER 钉版 $RELEASE_VERSION - -交付基线(develop tag 组合,源自 demo image-version): -$BASELINE_TAGS -chart: $CHART_TAG" - git push -q origin release || die "release 分支 push 失败(分支保护?netrc 凭证?)" - log "交付分支已钉版: environments/$CUSTOMER → $RELEASE_VERSION" + 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 "════════ 发布完成 ════════" - log "版本: $RELEASE_VERSION (chart: $CHART_TAG)" + if [ "$PURE_REUSE" = "true" ]; then + log "纯复用发布(无新版本号)" + else + log "版本: $RELEASE_VERSION (chart: $CHART_TAG)" + fi log "现场: ArgoCD 约 3 分钟内自动 sync" }