From 44915c1343c4c5154712f07ba08018354ca7d598 Mon Sep 17 00:00:00 2001 From: wangbo Date: Tue, 28 Jul 2026 05:00:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=E4=BD=BF=E7=94=A8=20Server-Side?= =?UTF-8?q?=20Apply=20=E5=AE=89=E8=A3=85=E5=A4=A7=E5=9E=8B=20CRD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cert-manager、CloudNativePG 与 Barman 清单改用 server-side apply，避免 CNPG CRD 的 last-applied annotation 超过 Kubernetes 256KiB 限制；force-conflicts 仅用于已固定 checksum 的 operator 清单。 验证：cert-manager 组件已实际滚动成功，CNPG 客户端 apply 在 annotation 门禁处复现。 --- scripts/cluster/bootstrap-platform.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cluster/bootstrap-platform.sh b/scripts/cluster/bootstrap-platform.sh index 337df2a..ab8be58 100755 --- a/scripts/cluster/bootstrap-platform.sh +++ b/scripts/cluster/bootstrap-platform.sh @@ -136,13 +136,13 @@ source_sha=$1 mode=$2 kubectl='k3s kubectl' -$kubectl apply -f /root/cert-manager.yaml >/dev/null +$kubectl apply --server-side --force-conflicts -f /root/cert-manager.yaml >/dev/null $kubectl rollout status deployment/cert-manager -n cert-manager --timeout=180s $kubectl rollout status deployment/cert-manager-webhook -n cert-manager --timeout=180s $kubectl rollout status deployment/cert-manager-cainjector -n cert-manager --timeout=180s -$kubectl apply -f /root/cnpg.yaml >/dev/null +$kubectl apply --server-side --force-conflicts -f /root/cnpg.yaml >/dev/null $kubectl rollout status deployment/cnpg-controller-manager -n cnpg-system --timeout=180s -$kubectl apply -f /root/barman.yaml >/dev/null +$kubectl apply --server-side --force-conflicts -f /root/barman.yaml >/dev/null $kubectl rollout status deployment/barman-cloud -n cnpg-system --timeout=180s $kubectl create namespace easyai --dry-run=client -o yaml | $kubectl apply -f - >/dev/null