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 <