fix(deploy): 为 K3s 配置容器镜像端点
三节点 containerd 增加 Docker Hub、GHCR 与 Quay 的 DaoCloud 镜像端点,解决生产节点直连公共 Registry 超时导致 Pod sandbox 无法创建的问题。 新增逐节点滚动刷新脚本,每次等待节点重新 Ready 并实际拉取 pause 镜像后才继续,避免同时重启 etcd 成员。初始 K3s 安装也会预置同一 registries.yaml。 验证:三节点镜像端点均返回 Registry 认证响应,bash -n、ShellCheck。
This commit is contained in:
@@ -0,0 +1,10 @@
|
|||||||
|
mirrors:
|
||||||
|
docker.io:
|
||||||
|
endpoint:
|
||||||
|
- https://docker.m.daocloud.io
|
||||||
|
ghcr.io:
|
||||||
|
endpoint:
|
||||||
|
- https://ghcr.m.daocloud.io
|
||||||
|
quay.io:
|
||||||
|
endpoint:
|
||||||
|
- https://quay.m.daocloud.io
|
||||||
@@ -51,6 +51,11 @@ node scripts/ci-validate-migrations.mjs <当前线上完整GitSHA>
|
|||||||
`backup` 会在卸载旧 K3s 前,将 SQLite、manifests 和 staging 资源归档并校验后上传
|
`backup` 会在卸载旧 K3s 前,将 SQLite、manifests 和 staging 资源归档并校验后上传
|
||||||
OSS `easyai-ai-gateway/production/pre-ha/`。`install` 固定
|
OSS `easyai-ai-gateway/production/pre-ha/`。`install` 固定
|
||||||
`v1.36.2+k3s1`,使用 embedded etcd、静态 Secret 加密、500ms heartbeat 和 5s election timeout。
|
`v1.36.2+k3s1`,使用 embedded etcd、静态 Secret 加密、500ms heartbeat 和 5s election timeout。
|
||||||
|
K3s containerd 同时配置 Docker Hub、GHCR 与 Quay 的镜像端点;已有集群需要滚动刷新时执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./scripts/cluster/configure-k3s-registries.sh
|
||||||
|
```
|
||||||
|
|
||||||
### 3. 平台和入口预置
|
### 3. 平台和入口预置
|
||||||
|
|
||||||
|
|||||||
@@ -155,6 +155,8 @@ install_cluster() {
|
|||||||
write_node_config "$configuration_directory/hongkong.yaml" easyai-hongkong 10.77.0.2 join
|
write_node_config "$configuration_directory/hongkong.yaml" easyai-hongkong 10.77.0.2 join
|
||||||
write_node_config "$configuration_directory/los-angeles.yaml" easyai-los-angeles 10.77.0.3 join \
|
write_node_config "$configuration_directory/los-angeles.yaml" easyai-los-angeles 10.77.0.3 join \
|
||||||
'easyai.io/witness=true:NoSchedule'
|
'easyai.io/witness=true:NoSchedule'
|
||||||
|
cp "$cluster_root/deploy/kubernetes/registries.yaml" \
|
||||||
|
"$configuration_directory/registries.yaml"
|
||||||
umask 077
|
umask 077
|
||||||
cat >"$configuration_directory/etcd-s3-secret.yaml" <<EOF
|
cat >"$configuration_directory/etcd-s3-secret.yaml" <<EOF
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
@@ -202,7 +204,10 @@ REMOTE
|
|||||||
printf '%s\n' "$K3S_TOKEN" | cluster_ssh "$host" \
|
printf '%s\n' "$K3S_TOKEN" | cluster_ssh "$host" \
|
||||||
'umask 077; cat >/etc/rancher/k3s/cluster-token; chmod 0600 /etc/rancher/k3s/cluster-token'
|
'umask 077; cat >/etc/rancher/k3s/cluster-token; chmod 0600 /etc/rancher/k3s/cluster-token'
|
||||||
cluster_scp "$configuration_directory/$node_name.yaml" "$host:/etc/rancher/k3s/config.yaml"
|
cluster_scp "$configuration_directory/$node_name.yaml" "$host:/etc/rancher/k3s/config.yaml"
|
||||||
cluster_ssh "$host" 'chmod 0600 /etc/rancher/k3s/config.yaml'
|
cluster_scp "$configuration_directory/registries.yaml" \
|
||||||
|
"$host:/etc/rancher/k3s/registries.yaml"
|
||||||
|
cluster_ssh "$host" \
|
||||||
|
'chmod 0600 /etc/rancher/k3s/config.yaml /etc/rancher/k3s/registries.yaml'
|
||||||
done
|
done
|
||||||
|
|
||||||
for index in 0 1 2; do
|
for index in 0 1 2; do
|
||||||
|
|||||||
Executable
+45
@@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
||||||
|
# shellcheck source=scripts/cluster/common.sh
|
||||||
|
source "$script_dir/common.sh"
|
||||||
|
load_cluster_env
|
||||||
|
|
||||||
|
registry_config="$cluster_root/deploy/kubernetes/registries.yaml"
|
||||||
|
[[ -f $registry_config && ! -L $registry_config ]] || {
|
||||||
|
echo 'K3s registry mirror configuration is unavailable' >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
restart_node() {
|
||||||
|
local host=$1
|
||||||
|
local node=$2
|
||||||
|
local observer=$3
|
||||||
|
local ready=false
|
||||||
|
cluster_scp "$registry_config" "$host:/etc/rancher/k3s/registries.yaml"
|
||||||
|
cluster_ssh "$host" \
|
||||||
|
'chmod 0600 /etc/rancher/k3s/registries.yaml && systemctl restart k3s'
|
||||||
|
for _ in $(seq 1 60); do
|
||||||
|
if cluster_ssh "$observer" \
|
||||||
|
"k3s kubectl wait --for=condition=Ready node/$node --timeout=5s >/dev/null 2>&1"; then
|
||||||
|
ready=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
[[ $ready == true ]] || {
|
||||||
|
echo "K3s node did not return Ready after registry mirror update: $node" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
cluster_ssh "$host" \
|
||||||
|
"grep -Fq 'https://docker.m.daocloud.io' /var/lib/rancher/k3s/agent/etc/containerd/config.toml && k3s crictl pull docker.io/rancher/mirrored-pause:3.6 >/dev/null"
|
||||||
|
echo "[registry] $node ready"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Restart one etcd member at a time and observe it from a different server.
|
||||||
|
restart_node "$CLUSTER_LOS_ANGELES_HOST" easyai-los-angeles "$CLUSTER_NINGBO_HOST"
|
||||||
|
restart_node "$CLUSTER_HONGKONG_HOST" easyai-hongkong "$CLUSTER_NINGBO_HOST"
|
||||||
|
restart_node "$CLUSTER_NINGBO_HOST" easyai-ningbo "$CLUSTER_HONGKONG_HOST"
|
||||||
|
|
||||||
|
echo 'k3s_registry_mirrors=PASS nodes=3 quorum_preserved=true'
|
||||||
Reference in New Issue
Block a user