From 26b2ec4868cb24a393460e6bd017edb48a29b87a Mon Sep 17 00:00:00 2001
From: Martin <1403951401@qq.com>
Date: Thu, 20 Mar 2025 15:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20master=20=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init-k8s.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/init-k8s.sh b/init-k8s.sh
index f79e4a3..45b7577 100644
--- a/init-k8s.sh
+++ b/init-k8s.sh
@@ -6,8 +6,8 @@ release=$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) #  ubuntu(jam
 K8S_RELEASE=${K8S_VERSION:-1.32.3}  # 如果未设置，使用默认值 1.32.3
 K8S_VERSION=${K8S_RELEASE%.*}
 
-CONTAINERD_VERSION=${CONTAINERD_VERSION:-2.0.2}  # 如果未设置，使用默认值 2.0.2
-CALICO_VERSION=${CALICO_VERSION:-3.29.1}  # 如果未设置，使用默认值 2.0.2
+CONTAINERD_VERSION=${CONTAINERD_VERSION:-2.0.2}
+CALICO_VERSION=${CALICO_VERSION:-3.29.1}
 MIRRORS=${MIRRORS:-docker.martin98.com/k8s}  # 如果未设置，默认使用集群镜像
 
 # 更新 apt
@@ -113,7 +113,6 @@ EOF
 
 sudo systemctl restart containerd && sudo systemctl enable --now containerd
 
-# crictl --debug pull quay.io/k8scsi/csi-resizer:v0.5.0
 # 安装 kubeadm kubelet kubectl
 apt install -y kubeadm kubelet kubectl && apt-mark hold kubeadm kubelet kubectl
 
@@ -249,21 +248,25 @@ OUTPUT=$(kubeadm token create --print-join-command)
 # 提取 token 和 discovery-token-ca-cert-hash
 TOKEN=$(echo "$OUTPUT" | grep -oP 'token \K[\w.]+')
 TOKEN_HASH=$(echo "$OUTPUT" | grep -oP 'discovery-token-ca-cert-hash \K.*')
+CERTS=$(kubeadm init phase upload-certs --upload-certs | sed -n '$p')
 
 cat <<EOF
 ------------------------------------------------------------------------------------
 初始化 master $current_ip 成功
 $OUTPUT
 
+# master 加入
+kubeadm join $vip_ip:6443 \\
+  --token $TOKEN \\
+  --discovery-token-ca-cert-hash $TOKEN_HASH \\
+  --control-plane --certificate-key $CERTS
+
 # worker 加入
-kubeadm join 10.1.2.200:6443 \\
+kubeadm join $vip_ip:6443 \\
   --token $TOKEN \\
   --discovery-token-ca-cert-hash $TOKEN_HASH
 
-# admin 加入
-kubeadm join 10.1.2.200:6443 \\
-  --token $TOKEN \\
-  --discovery-token-ca-cert-hash $TOKEN_HASH \\
-  --control-plane
 ------------------------------------------------------------------------------------
-EOF
\ No newline at end of file
+EOF
+
+kubectl get nodes
\ No newline at end of file