From e67bce5121c46740083c81e72f27d4022b939338 Mon Sep 17 00:00:00 2001 From: panxiao81 Date: Thu, 17 Sep 2026 18:20:33 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BB=B6=E9=95=BF=20sandbox=20Flux=20?= =?UTF-8?q?=E6=A0=B9=E5=90=8C=E6=AD=A5=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infrastructure/sandbox-cluster/README.md | 4 +++- .../ansible/roles/sandbox_flux/templates/flux-sync.yaml.j2 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/infrastructure/sandbox-cluster/README.md b/infrastructure/sandbox-cluster/README.md index 75111ee..640eddc 100644 --- a/infrastructure/sandbox-cluster/README.md +++ b/infrastructure/sandbox-cluster/README.md @@ -106,7 +106,9 @@ ansible-playbook verify.yml 当前已经声明 LXC 生命周期、最小 OS baseline、PostgreSQL 和 K3s，包括系统级 homelab CA trust。Flux `v2.9.5` controllers 与 root sync 也由 Ansible 通过 K3s server manifests 管理；root 使用 homelab CA 访问公开 Gitea 仓库，不保存 Git token。 -集群内 workload 由 `clusters/sandbox/` 分阶段纳入 Flux。 +集群内 workload 由 `clusters/sandbox/` 分阶段纳入 Flux。root Kustomization 的健康检查 +timeout 为 40 分钟，用于覆盖 Kata 等首次安装时会逐节点重启 K3s 的子 +Kustomization；各子项仍保留自己的更短 timeout，故障会在对应子项先行暴露。 ## SPIRE 跨集群 bootstrap diff --git a/infrastructure/sandbox-cluster/ansible/roles/sandbox_flux/templates/flux-sync.yaml.j2 b/infrastructure/sandbox-cluster/ansible/roles/sandbox_flux/templates/flux-sync.yaml.j2 index 3fd79c7..3787438 100644 --- a/infrastructure/sandbox-cluster/ansible/roles/sandbox_flux/templates/flux-sync.yaml.j2 +++ b/infrastructure/sandbox-cluster/ansible/roles/sandbox_flux/templates/flux-sync.yaml.j2 @@ -35,5 +35,5 @@ spec: sourceRef: kind: GitRepository name: flux-system - timeout: 3m + timeout: 40m wait: true