From f9b6b93064a663c899f7ef4e3009a2662a8a5161 Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Mon, 21 Sep 2026 16:57:32 +0800 Subject: [PATCH] 2 --- .gitea/workflows/sync-consul.yml | 8 ++++++-- README.md | 6 +++--- scripts/sync-to-consul.sh | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/sync-consul.yml b/.gitea/workflows/sync-consul.yml index 7df673d..0eca258 100644 --- a/.gitea/workflows/sync-consul.yml +++ b/.gitea/workflows/sync-consul.yml @@ -22,7 +22,7 @@ jobs: case "$TARGET" in test) - export KUBECONFIG=/root/.kube/k3s-test.yaml + export KUBECONFIG=/etc/rancher/k3s/k3s-test.yaml export NAMESPACE=test ;; *) @@ -30,7 +30,11 @@ jobs: export NAMESPACE=prod ;; esac - test -f "$KUBECONFIG" + if [[ ! -f "$KUBECONFIG" ]]; then + echo "FAIL: missing KUBECONFIG=$KUBECONFIG host=$(hostname) uid=$(id -u)" + ls -la /etc/rancher/k3s/ /root/.kube/ 2>/dev/null || true + exit 1 + fi export RESTART_APIS=1 REPO="${{ gitea.repository }}" diff --git a/README.md b/README.md index 95c8989..3b1bb97 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ kubectl -n prod create secret generic jwt-secret \ --dry-run=client -o yaml | kubectl apply -f - # test(也可用 secrets.yaml 里 prod-credentials 的 JWT_SECRET_KEY) -kubectl --kubeconfig=/root/.kube/k3s-test.yaml -n test \ +kubectl --kubeconfig=/etc/rancher/k3s/k3s-test.yaml -n test \ create secret generic jwt-secret \ --from-literal=JWT_SECRET_KEY='ideship-jwt-secret-test-change-me' \ --dry-run=client -o yaml | kubectl apply -f - @@ -57,7 +57,7 @@ git push -u origin master # → prod Consul git push -u origin test # → test Consul ``` -Runner 标签需含 `k3s-host`;134 上需有 `/root/.kube/k3s-test.yaml`。 +Runner 标签需含 `k3s-host`;134 上需有 `/etc/rancher/k3s/k3s-test.yaml`。 ### 4. 与线上对账(推荐先做) @@ -80,7 +80,7 @@ export KUBECONFIG=/etc/rancher/k3s/k3s.yaml NAMESPACE=prod ./scripts/sync-to-consul.sh # test -export KUBECONFIG=/root/.kube/k3s-test.yaml NAMESPACE=test +export KUBECONFIG=/etc/rancher/k3s/k3s-test.yaml NAMESPACE=test ./scripts/sync-to-consul.sh ``` diff --git a/scripts/sync-to-consul.sh b/scripts/sync-to-consul.sh index 5fa9bdd..841f27b 100644 --- a/scripts/sync-to-consul.sh +++ b/scripts/sync-to-consul.sh @@ -129,7 +129,7 @@ echo "==> 加载密钥(K8s Secret / env) ns=${NS} kubeconfig=${KUBECONFIG}" if ! kubectl -n "$NS" get secret prod-credentials >/dev/null 2>&1; then echo "FAIL: 找不到 secret/${NS}/prod-credentials" echo " 当前: KUBECONFIG=${KUBECONFIG}" - echo " test 集群请先: kubectl --kubeconfig=/root/.kube/k3s-test.yaml apply -f /data/k3s-test/manifests/secrets.yaml" + echo " test 集群请先: kubectl --kubeconfig=/etc/rancher/k3s/k3s-test.yaml apply -f /data/k3s-test/manifests/secrets.yaml" echo " 或: kubectl -n ${NS} get secret" exit 1 fi