From 2f9c5b5fafdab14437a5040eae0713e0f60080fd Mon Sep 17 00:00:00 2001
From: Martin <1403951401@qq.com>
Date: Sun, 26 Jan 2025 09:45:11 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E6=9B=B4=E6=96=B0=20k8s=20=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init-docker.sh |  4 +++-
 init-k8s.sh    | 18 ++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/init-docker.sh b/init-docker.sh
index d61c37b..5e2c206 100644
--- a/init-docker.sh
+++ b/init-docker.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+lsb_dist=$(cat /etc/*release | grep ^ID= | cut -d= -f2) # ubuntu or debian?
+
 command_exists() {
 	command -v "$@" > /dev/null 2>&1
 }
@@ -21,7 +23,7 @@ else
   if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ]; then
       curl -fsSL https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
   fi
-  echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $lsb_dist stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+  echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $release stable" > /etc/apt/sources.list.d/docker.list
 
   curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/docker-install.sh | sh
   cat > /etc/docker/daemon.json <<EOF
diff --git a/init-k8s.sh b/init-k8s.sh
index 77dfdc0..9785e9e 100644
--- a/init-k8s.sh
+++ b/init-k8s.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+lsb_dist=$(cat /etc/*release | grep ^ID= | cut -d= -f2) # ubuntu or debian?
+release=$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) #  ubuntu(jammy oracular) debian(bookworm)....
 #
 K8S_VERSION=1.32
 CONTAINERD_VERSION=2.0.2
@@ -8,9 +10,11 @@ CONTAINERD_VERSION=2.0.2
 # 更新 apt
 curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/init-apt.sh | bash
 
-# 添加 docker 相关
+curl -fsSL https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $release stable" > /etc/apt/sources.list.d/docker.list
+
 curl -fsSL https://mirrors.martin98.com/repository/kubernetes/core/stable/v$K8S_VERSION/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://mirrors.martin98.com/repository/kubernetes/core/stable/v$K8S_VERSION/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list
+echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://mirrors.martin98.com/repository/kubernetes/core/stable/v$K8S_VERSION/deb/ /" > /etc/apt/sources.list.d/kubernetes.list
 
 # k8s 相关环境
 apt update && apt install -y curl apt-transport-https ca-certificates gnupg
@@ -43,7 +47,6 @@ containerd config default | sudo tee /etc/containerd/config.toml > /dev/null
 sed -ri '0,/(config_path).*/s@(config_path).*@\1 = "/etc/containerd/certs.d"@' /etc/containerd/config.toml
 sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
 
-
 # 定义配置目录
 CONFIG_DIR="/etc/containerd/certs.d"
 mkdir -pv "$CONFIG_DIR/docker.io"
@@ -92,17 +95,12 @@ server = "https://registry.k8s.io"
 EOF
 
 sudo systemctl restart containerd && sudo systemctl enable containerd
-ctr image pull registry.k8s.io/pause:3.10
-
-
-
 
+# ctr image pull registry.k8s.io/pause:3.10
+# ctr image pull --hosts-dir /etc/containerd/certs.d registry.k8s.io/pause:3.10
 
 
 # 安装 kubeadm kubelet kubectl
-curl -fsSL https://mirrors.tuna.tsinghua.edu.cn/kubernetes/core:/stable:/v1.32/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://mirrors.martin98.com/repository/kubernetes-1.32/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
-chmod 644 /etc/apt/sources.list.d/kubernetes.list /etc/apt/keyrings/kubernetes-apt-keyring.gpg
 apt update && apt install -y kubeadm kubelet kubectl && apt-mark hold kubeadm kubelet kubectl
 
 echo "k8s 运行环境安装成功"
\ No newline at end of file