diff --git a/deploy/deploy.yaml b/deploy/deploy.yaml index 3748f3b1..bb6c1bf5 100644 --- a/deploy/deploy.yaml +++ b/deploy/deploy.yaml @@ -244,8 +244,8 @@ lanes: publicEndpoints: frontend: https://hwlab-v03.74-48-78-17.nip.io api: https://hwlab-v03.74-48-78-17.nip.io - legacyFrontend: http://74.48.78.17:19766 - legacyApi: http://74.48.78.17:19767 + legacyFrontend: http://74.48.78.17:20666 + legacyApi: http://74.48.78.17:20667 artifactCatalog: deploy/artifact-catalog.v03.json runtimePath: runtime-v03 imageTagMode: full diff --git a/docs/reference/spec-lane-expansion.md b/docs/reference/spec-lane-expansion.md index 522a5bab..ab76e9f0 100644 --- a/docs/reference/spec-lane-expansion.md +++ b/docs/reference/spec-lane-expansion.md @@ -21,9 +21,9 @@ node scripts/hwlab-lane-expand.mjs configure --lane v03 --from v02 --write | `v03` | artifact catalog `deploy/artifact-catalog.v03.json` | | `v03` | Argo Application `hwlab-node-v03` | | `v03` | Tekton Pipeline `hwlab-v03-ci-image-publish` | -| `v03` | default legacy FRP ports `19766/19767` | +| `v03` | default legacy FRP ports `20666/20667` | -后续 lane 按同一公式递增,默认端口为 `19466 + minor * 100` 和后一位 API 端口;如端口已被占用,必须在 CLI 参数中显式给出 `--web-port` / `--api-port`,并把结果写回 `deploy/deploy.yaml`,不要在 render、Tekton 或 FRP 文件里手改。 +后续 lane 按同一公式递增,默认端口为 `17666 + minor * 1000` 和后一位 API 端口;如端口已被占用,必须在 CLI 参数中显式给出 `--web-port` / `--api-port`,并把结果写回 `deploy/deploy.yaml`,不要在 render、Tekton 或 FRP 文件里手改。 ## 单一配置点 diff --git a/scripts/hwlab-lane-expand.mjs b/scripts/hwlab-lane-expand.mjs index 326675ca..599595b2 100644 --- a/scripts/hwlab-lane-expand.mjs +++ b/scripts/hwlab-lane-expand.mjs @@ -165,7 +165,7 @@ function assertLane(value, label) { function laneInfo(lane, options = {}) { assertLane(lane, "lane"); const minor = Number.parseInt(lane.slice(1), 10); - const webPort = options.webPort ?? 19466 + minor * 100; + const webPort = options.webPort ?? 17666 + minor * 1000; const apiPort = options.apiPort ?? webPort + 1; const versionName = `v0.${minor}`; const host = options.host ?? defaultHost; diff --git a/scripts/src/runtime-lane.ts b/scripts/src/runtime-lane.ts index 79264f33..717b66db 100644 --- a/scripts/src/runtime-lane.ts +++ b/scripts/src/runtime-lane.ts @@ -110,7 +110,7 @@ export function runtimeGitopsPathForRuntimeLane(deploy: DeployConfig, lane: stri } export function defaultPortForRuntimeLane(lane: string): number { - return 19466 + runtimeLaneMinor(lane) * 100; + return 17666 + runtimeLaneMinor(lane) * 1000; } export function publicHostLabel(host = defaultPublicHost): string {