root/geo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat(workflows): update registry host to 192.168.100.49 across multiple CI/CD files"
Deployment Config CI / Deployment Config (push) Successful in 14s
Details
Frontend CI / Frontend (push) Successful in 1m57s
Details
Backend CI / Backend (push) Successful in 41m0s
Details

Browse Source 
This reverts commit 855e061244.
This commit is contained in:
liangxu
2026-06-02 23:25:19 +08:00
parent 855e061244
commit 316e2a34aa
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/backend-ci.yml
+1 -1
View File
@@ -86,7 +86,7 @@ jobs:
- name: Publish backend images - name: Publish backend images
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
env: env:
REGISTRY_HOST: 192.168.100.49:13000 REGISTRY_HOST: 192.168.100.19:13000
REGISTRY_OWNER: root REGISTRY_OWNER: root
REGISTRY_IMAGE_PREFIX: geo-rankly REGISTRY_IMAGE_PREFIX: geo-rankly
REGISTRY_USERNAME: root REGISTRY_USERNAME: root
.gitea/workflows/desktop-client-build.yml
+2 -2
View File
@@ -35,7 +35,7 @@ on:
host: host:
description: "NAS SSH host" description: "NAS SSH host"
required: true required: true
default: "192.168.100.49" default: "192.168.100.19"
port: port:
description: "NAS SSH port" description: "NAS SSH port"
required: true required: true
@@ -78,7 +78,7 @@ env:
DEFAULT_WIN_ARCHES: "x64" DEFAULT_WIN_ARCHES: "x64"
DEFAULT_VERSION_PREFIX: "0.1" DEFAULT_VERSION_PREFIX: "0.1"
DEFAULT_NAS_OUTPUT_DIR: "/vol1/1000/share/gl-test" DEFAULT_NAS_OUTPUT_DIR: "/vol1/1000/share/gl-test"
DEFAULT_NAS_HOST: "192.168.100.49" DEFAULT_NAS_HOST: "192.168.100.19"
DEFAULT_NAS_PORT: "22" DEFAULT_NAS_PORT: "22"
DEFAULT_NAS_USER: "admin" DEFAULT_NAS_USER: "admin"
DEFAULT_NAS_USE_SUDO: "true" DEFAULT_NAS_USE_SUDO: "true"
.gitea/workflows/frontend-ci.yml
+1 -1
View File
@@ -76,7 +76,7 @@ jobs:
- name: Publish frontend images - name: Publish frontend images
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
env: env:
REGISTRY_HOST: 192.168.100.49:13000 REGISTRY_HOST: 192.168.100.19:13000
REGISTRY_OWNER: root REGISTRY_OWNER: root
REGISTRY_IMAGE_PREFIX: geo-rankly REGISTRY_IMAGE_PREFIX: geo-rankly
REGISTRY_USERNAME: root REGISTRY_USERNAME: root
.gitea/workflows/nas-compose-service-deploy.yml
+2 -2
View File
@@ -40,7 +40,7 @@ on:
host: host:
description: "NAS SSH host" description: "NAS SSH host"
required: true required: true
default: "192.168.100.49" default: "192.168.100.19"
port: port:
description: "NAS SSH port" description: "NAS SSH port"
required: true required: true
@@ -68,7 +68,7 @@ on:
registry_host: registry_host:
description: "Gitea Registry host, without scheme" description: "Gitea Registry host, without scheme"
required: true required: true
default: "192.168.100.49:13000" default: "192.168.100.19:13000"
registry_owner: registry_owner:
description: "Gitea package owner" description: "Gitea package owner"
required: true required: true
.gitea/workflows/nas-k3s-deploy.yml
+2 -2
View File
@@ -47,7 +47,7 @@ name: Deploy NAS K3s
host: host:
description: "NAS SSH host" description: "NAS SSH host"
required: true required: true
default: "192.168.100.49" default: "192.168.100.19"
port: port:
description: "NAS SSH port" description: "NAS SSH port"
required: true required: true
@@ -79,7 +79,7 @@ name: Deploy NAS K3s
registry_host: registry_host:
description: "Gitea Registry host, without scheme" description: "Gitea Registry host, without scheme"
required: true required: true
default: "192.168.100.49:13000" default: "192.168.100.19:13000"
registry_owner: registry_owner:
description: "Gitea package owner" description: "Gitea package owner"
required: true required: true
.gitea/workflows/offline-package.yml
+2 -2
View File
@@ -14,7 +14,7 @@ on:
registry_host: registry_host:
description: "Gitea Registry host, without scheme" description: "Gitea Registry host, without scheme"
required: true required: true
default: "192.168.100.49:13000" default: "192.168.100.19:13000"
registry_owner: registry_owner:
description: "Gitea package owner" description: "Gitea package owner"
required: true required: true
@@ -89,7 +89,7 @@ jobs:
fi fi
platform="${REQUESTED_PLATFORM:-linux/amd64}" platform="${REQUESTED_PLATFORM:-linux/amd64}"
registry_host="${REGISTRY_HOST:-192.168.100.49:13000}" registry_host="${REGISTRY_HOST:-192.168.100.19:13000}"
registry_owner="${REGISTRY_OWNER:-root}" registry_owner="${REGISTRY_OWNER:-root}"
registry_image_prefix="${REGISTRY_IMAGE_PREFIX:-geo-rankly}" registry_image_prefix="${REGISTRY_IMAGE_PREFIX:-geo-rankly}"
registry_username="${REGISTRY_USERNAME:-root}" registry_username="${REGISTRY_USERNAME:-root}"
.gitea/workflows/prod-k3s-deploy.yml
+1 -1
View File
@@ -65,7 +65,7 @@ name: Deploy Production K3s
registry_host: registry_host:
description: "NAS Gitea Registry host, without scheme" description: "NAS Gitea Registry host, without scheme"
required: true required: true
default: "192.168.100.49:13000" default: "192.168.100.19:13000"
registry_owner: registry_owner:
description: "Gitea package owner" description: "Gitea package owner"
required: true required: true
deploy/k3s/README.md
+5 -5
View File
@@ -124,7 +124,7 @@ kubectl apply -f deploy/k3s/addons/kite.yaml
访问： 访问：
- Kite dashboard: `http://<node-ip>:30082` - Kite dashboard: `http://<node-ip>:30082`
- NAS 示例：`http://192.168.100.49:30082` - NAS 示例：`http://192.168.100.19:30082`
注意：Kite 官方清单绑定了 `cluster-admin` 权限，只建议在可信内网使用，不要直接暴露到公网。 注意：Kite 官方清单绑定了 `cluster-admin` 权限，只建议在可信内网使用，不要直接暴露到公网。
@@ -150,11 +150,11 @@ kubectl -n kube-system patch svc traefik -p '{"spec":{"externalTrafficPolicy":"L
临时用 frpc/frps 做 TCP 隧道时，用户源 IP 通常不会穿透到 k3s；这类链路需要 proxy protocol 或 HTTP 反代写入可信 `X-Forwarded-For`，否则日志只能记录隧道出口/NAS 本地转发地址。 临时用 frpc/frps 做 TCP 隧道时，用户源 IP 通常不会穿透到 k3s；这类链路需要 proxy protocol 或 HTTP 反代写入可信 `X-Forwarded-For`，否则日志只能记录隧道出口/NAS 本地转发地址。
例如 NAS IP 是 `192.168.100.49`： 例如 NAS IP 是 `192.168.100.19`：
- tenant admin: `http://192.168.100.49:30080` - tenant admin: `http://192.168.100.19:30080`
- ops admin: `http://192.168.100.49:30081` - ops admin: `http://192.168.100.19:30081`
- tenant api: `http://192.168.100.49:30083` - tenant api: `http://192.168.100.19:30083`
### 4.2 用域名 Ingress + HTTPS ### 4.2 用域名 Ingress + HTTPS
deploy/scripts/deploy-images-to-k3s.sh
+1 -1
View File
@@ -24,7 +24,7 @@ REMOTE_DIR="${REMOTE_DIR:-/opt/geo-rankly/releases}"
WAIT_TIMEOUT="${WAIT_TIMEOUT:-10m}" WAIT_TIMEOUT="${WAIT_TIMEOUT:-10m}"
DELETE_REMOTE_TAR="${DELETE_REMOTE_TAR:-true}" DELETE_REMOTE_TAR="${DELETE_REMOTE_TAR:-true}"
PULL_FROM_REGISTRY="${PULL_FROM_REGISTRY:-false}" PULL_FROM_REGISTRY="${PULL_FROM_REGISTRY:-false}"
REGISTRY_HOST="${REGISTRY_HOST:-192.168.100.49:13000}" REGISTRY_HOST="${REGISTRY_HOST:-192.168.100.19:13000}"
REGISTRY_HOST="${REGISTRY_HOST#http://}" REGISTRY_HOST="${REGISTRY_HOST#http://}"
REGISTRY_HOST="${REGISTRY_HOST#https://}" REGISTRY_HOST="${REGISTRY_HOST#https://}"
REGISTRY_HOST="${REGISTRY_HOST%/}" REGISTRY_HOST="${REGISTRY_HOST%/}"
deploy/scripts/gitea-registry-images.sh
+1 -1
View File
@@ -5,7 +5,7 @@ set -euo pipefail
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
MODE="${1:-ensure}" MODE="${1:-ensure}"
REGISTRY_HOST="${REGISTRY_HOST:-192.168.100.49:13000}" REGISTRY_HOST="${REGISTRY_HOST:-192.168.100.19:13000}"
REGISTRY_HOST="${REGISTRY_HOST#http://}" REGISTRY_HOST="${REGISTRY_HOST#http://}"
REGISTRY_HOST="${REGISTRY_HOST#https://}" REGISTRY_HOST="${REGISTRY_HOST#https://}"
REGISTRY_HOST="${REGISTRY_HOST%/}" REGISTRY_HOST="${REGISTRY_HOST%/}"