diff --git a/init-apt.sh b/init-apt.sh index 31217af..0556f83 100644 --- a/init-apt.sh +++ b/init-apt.sh @@ -10,10 +10,13 @@ if [ -f /etc/apt/sources.list.d/${lsb_dist}.sources ]; then rm /etc/apt/sources.list.d/${lsb_dist}.sources fi # 配置镜像源 -echo "deb https://mirrors.martin98.com/repository/$lsb_dist $release $components" > /etc/apt/sources.list -echo "deb https://mirrors.martin98.com/repository/$lsb_dist $release-updates $components" >> /etc/apt/sources.list -echo "deb https://mirrors.martin98.com/repository/$lsb_dist $release-backports $components" >> /etc/apt/sources.list -echo "deb https://mirrors.martin98.com/repository/$lsb_dist $release-security $components" >> /etc/apt/sources.list +cat < /etc/apt/sources.list +deb https://mirrors.martin98.com/repository/$lsb_dist $release $components +deb https://mirrors.martin98.com/repository/$lsb_dist $release-updates $components +deb https://mirrors.martin98.com/repository/$lsb_dist $release-backports $components +deb https://mirrors.martin98.com/repository/$lsb_dist $release-security $components +EOF + for RELEASE in "$@"; do echo "deb https://mirrors.martin98.com/repository/$lsb_dist $RELEASE $components" >> /etc/apt/sources.list done diff --git a/init-k8s.sh b/init-k8s.sh index 45b7577..bd19026 100644 --- a/init-k8s.sh +++ b/init-k8s.sh @@ -84,6 +84,15 @@ server = "https://k8s.gcr.io" override_path = true EOF +mkdir -pv "$CONFIG_DIR/gcr.io" +cat < "$CONFIG_DIR/gcr.io/hosts.toml" +server = "https://gcr.io" + +[host."https://docker.martin98.com/v2/gcr"] + capabilities = ["pull", "resolve"] + override_path = true +EOF + mkdir -pv "$CONFIG_DIR/ghcr.io" cat < "$CONFIG_DIR/ghcr.io/hosts.toml" server = "https://ghcr.io" @@ -111,6 +120,7 @@ server = "https://registry.k8s.io" override_path = true EOF +# crictl --debug pull quay.io/k8scsi/csi-resizer:v0.5.0 sudo systemctl restart containerd && sudo systemctl enable --now containerd # 安装 kubeadm kubelet kubectl