diff --git a/.gitea/workflows/backend-ci.yml b/.gitea/workflows/backend-ci.yml index a7465d9..6b1b28a 100644 --- a/.gitea/workflows/backend-ci.yml +++ b/.gitea/workflows/backend-ci.yml @@ -86,7 +86,7 @@ jobs: - name: Publish backend images if: github.event_name != 'pull_request' env: - REGISTRY_HOST: 192.168.100.49:13000 + REGISTRY_HOST: 192.168.100.19:13000 REGISTRY_OWNER: root REGISTRY_IMAGE_PREFIX: geo-rankly REGISTRY_USERNAME: root diff --git a/.gitea/workflows/desktop-client-build.yml b/.gitea/workflows/desktop-client-build.yml index 93d05c3..c48aee9 100644 --- a/.gitea/workflows/desktop-client-build.yml +++ b/.gitea/workflows/desktop-client-build.yml @@ -35,7 +35,7 @@ on: host: description: "NAS SSH host" required: true - default: "192.168.100.49" + default: "192.168.100.19" port: description: "NAS SSH port" required: true @@ -78,7 +78,7 @@ env: DEFAULT_WIN_ARCHES: "x64" DEFAULT_VERSION_PREFIX: "0.1" 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_USER: "admin" DEFAULT_NAS_USE_SUDO: "true" diff --git a/.gitea/workflows/frontend-ci.yml b/.gitea/workflows/frontend-ci.yml index ce4ed06..83ddca1 100644 --- a/.gitea/workflows/frontend-ci.yml +++ b/.gitea/workflows/frontend-ci.yml @@ -76,7 +76,7 @@ jobs: - name: Publish frontend images if: github.event_name != 'pull_request' env: - REGISTRY_HOST: 192.168.100.49:13000 + REGISTRY_HOST: 192.168.100.19:13000 REGISTRY_OWNER: root REGISTRY_IMAGE_PREFIX: geo-rankly REGISTRY_USERNAME: root diff --git a/.gitea/workflows/nas-compose-service-deploy.yml b/.gitea/workflows/nas-compose-service-deploy.yml index 3a7ce2c..9bb70a7 100644 --- a/.gitea/workflows/nas-compose-service-deploy.yml +++ b/.gitea/workflows/nas-compose-service-deploy.yml @@ -40,7 +40,7 @@ on: host: description: "NAS SSH host" required: true - default: "192.168.100.49" + default: "192.168.100.19" port: description: "NAS SSH port" required: true @@ -68,7 +68,7 @@ on: registry_host: description: "Gitea Registry host, without scheme" required: true - default: "192.168.100.49:13000" + default: "192.168.100.19:13000" registry_owner: description: "Gitea package owner" required: true diff --git a/.gitea/workflows/nas-k3s-deploy.yml b/.gitea/workflows/nas-k3s-deploy.yml index 1d8d0d9..484326f 100644 --- a/.gitea/workflows/nas-k3s-deploy.yml +++ b/.gitea/workflows/nas-k3s-deploy.yml @@ -47,7 +47,7 @@ name: Deploy NAS K3s host: description: "NAS SSH host" required: true - default: "192.168.100.49" + default: "192.168.100.19" port: description: "NAS SSH port" required: true @@ -79,7 +79,7 @@ name: Deploy NAS K3s registry_host: description: "Gitea Registry host, without scheme" required: true - default: "192.168.100.49:13000" + default: "192.168.100.19:13000" registry_owner: description: "Gitea package owner" required: true diff --git a/.gitea/workflows/offline-package.yml b/.gitea/workflows/offline-package.yml index bd75418..6d6ed9b 100644 --- a/.gitea/workflows/offline-package.yml +++ b/.gitea/workflows/offline-package.yml @@ -14,7 +14,7 @@ on: registry_host: description: "Gitea Registry host, without scheme" required: true - default: "192.168.100.49:13000" + default: "192.168.100.19:13000" registry_owner: description: "Gitea package owner" required: true @@ -89,7 +89,7 @@ jobs: fi 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_image_prefix="${REGISTRY_IMAGE_PREFIX:-geo-rankly}" registry_username="${REGISTRY_USERNAME:-root}" diff --git a/.gitea/workflows/prod-k3s-deploy.yml b/.gitea/workflows/prod-k3s-deploy.yml index ed076a9..6c23737 100644 --- a/.gitea/workflows/prod-k3s-deploy.yml +++ b/.gitea/workflows/prod-k3s-deploy.yml @@ -65,7 +65,7 @@ name: Deploy Production K3s registry_host: description: "NAS Gitea Registry host, without scheme" required: true - default: "192.168.100.49:13000" + default: "192.168.100.19:13000" registry_owner: description: "Gitea package owner" required: true diff --git a/deploy/k3s/README.md b/deploy/k3s/README.md index 5420d1d..7ec19a9 100644 --- a/deploy/k3s/README.md +++ b/deploy/k3s/README.md @@ -124,7 +124,7 @@ kubectl apply -f deploy/k3s/addons/kite.yaml 访问: - Kite dashboard: `http://:30082` -- NAS 示例:`http://192.168.100.49:30082` +- NAS 示例:`http://192.168.100.19:30082` 注意: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 本地转发地址。 -例如 NAS IP 是 `192.168.100.49`: +例如 NAS IP 是 `192.168.100.19`: -- tenant admin: `http://192.168.100.49:30080` -- ops admin: `http://192.168.100.49:30081` -- tenant api: `http://192.168.100.49:30083` +- tenant admin: `http://192.168.100.19:30080` +- ops admin: `http://192.168.100.19:30081` +- tenant api: `http://192.168.100.19:30083` ### 4.2 用域名 Ingress + HTTPS diff --git a/deploy/scripts/deploy-images-to-k3s.sh b/deploy/scripts/deploy-images-to-k3s.sh index 49ac849..e7b711d 100755 --- a/deploy/scripts/deploy-images-to-k3s.sh +++ b/deploy/scripts/deploy-images-to-k3s.sh @@ -24,7 +24,7 @@ REMOTE_DIR="${REMOTE_DIR:-/opt/geo-rankly/releases}" WAIT_TIMEOUT="${WAIT_TIMEOUT:-10m}" DELETE_REMOTE_TAR="${DELETE_REMOTE_TAR:-true}" 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#https://}" REGISTRY_HOST="${REGISTRY_HOST%/}" diff --git a/deploy/scripts/gitea-registry-images.sh b/deploy/scripts/gitea-registry-images.sh index dccafed..64bc866 100644 --- a/deploy/scripts/gitea-registry-images.sh +++ b/deploy/scripts/gitea-registry-images.sh @@ -5,7 +5,7 @@ set -euo pipefail REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" 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#https://}" REGISTRY_HOST="${REGISTRY_HOST%/}"