From 3698dd025ffa6fcd7e8146efd7678967d051cc15 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 21 Nov 2025 16:46:57 +0800 Subject: [PATCH] bugfix --- control-plane-install.sh.j2 | 9 +++++++++ download_offline_packages.sh.j2 | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/control-plane-install.sh.j2 b/control-plane-install.sh.j2 index 2de7242..978ae57 100644 --- a/control-plane-install.sh.j2 +++ b/control-plane-install.sh.j2 @@ -6,11 +6,20 @@ OFFLINE=/opt/k8s-offline echo "[1] 解压离线包" mkdir -p $OFFLINE tar xf k8s-offline.tgz -C $OFFLINE +tar zxvf $OFFLINE/offlien-cache/deps/crictl-v1.29.0-linux-amd64.tar.gz -C /usr/local/bin dpkg -i $OFFLINE/offlien-cache/deps/*.deb +mkdir -p /etc/containerd +containerd config default > /etc/containerd/config.toml +sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml +systemctl enable --now containerd +systemctl status containerd + echo "[2] 安装 kubeadm/kubelet/kubectl" install -m755 $OFFLINE/offline-cache/bin/* /usr/local/bin/ + + echo "[3] 初始化控制平面" kubeadm init \ --kubernetes-version={{ kubernetes.version }} \ diff --git a/download_offline_packages.sh.j2 b/download_offline_packages.sh.j2 index 6853aa1..051331a 100644 --- a/download_offline_packages.sh.j2 +++ b/download_offline_packages.sh.j2 @@ -12,12 +12,13 @@ mkdir -p $TMP/bin $TMP/manifests $TMP/images $TMP/deps echo "[1] 下载 依赖包" cd $TMP/deps -apt install --download-only nfs-common rpcbind +apt install --download-only nfs-common rpcbind socat containerd cp /var/cache/apt/archives/*.deb . - +curl -LO https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz echo "[2] 下载 Kubernetes 二进制 {{ kubernetes.version }}" cd $TMP/bin +curl -LO https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ kubernetes.version }}/crictl-{{ kubernetes.version }}-linux-amd64.tar.gz curl -LO https://dl.k8s.io/release/v{{ kubernetes.version }}/bin/linux/amd64/kubeadm curl -LO https://dl.k8s.io/release/v{{ kubernetes.version }}/bin/linux/amd64/kubelet curl -LO https://dl.k8s.io/release/v{{ kubernetes.version }}/bin/linux/amd64/kubectl