Merge branch 'hotfix/1.1.4' into main

k8s-cluster-bootstrap.sh

@@ -464,6 +464,14 @@ fi
 
 VERSION_SPLIT=($(echo $K8S_VERSION | tr "." "\n"))
 K8S_MAJOR_VERSION="${VERSION_SPLIT[0]}.${VERSION_SPLIT[1]}"
+# check z version in x.y.z
+K8S_PACKAGE_VERSION=""
+if [[ "${VERSION_SPLIT[2]}" == "0" ]]; then
+    K8S_PACKAGE_VERSION="${K8S_VERSION}-2.1"
+else
+    K8S_PACKAGE_VERSION="${K8S_VERSION}-1.1"
+fi
+
 mkdir -m 755 /etc/apt/keyrings
 # temp: curl -fsLo /usr/share/keyrings/kubernetes-archive-keyring.gpg http://printstyle-bio.cn:8888/kubernetes-archive-keyring.gpg
 curl -fsSL https://pkgs.k8s.io/core:/stable:/v$K8S_MAJOR_VERSION/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
@@ -510,7 +518,7 @@ fi
 lineprint
 printstyle "Installing kubernetes components ... \n" 'info'
 lineprint
-apt-get install -y kubelet=$K8S_VERSION-1.1 kubeadm=$K8S_VERSION-1.1 kubectl=$K8S_VERSION-1.1
+apt-get install -y kubelet=$K8S_PACKAGE_VERSION kubeadm=$K8S_PACKAGE_VERSION kubectl=$K8S_PACKAGE_VERSION
 ## The exit status of the last command run is 
 ## saved automatically in the special variable $?.
 ## Therefore, testing if its value is 0, is testing
@@ -520,10 +528,10 @@ if [[ $? > 0 ]]; then
   rm /var/lib/apt/lists/lock
   rm /var/cache/apt/archives/lock
   rm /var/lib/dpkg/lock*
-  apt-get install -y kubelet=$K8S_VERSION-1.1 kubeadm=$K8S_VERSION-1.1 kubectl=$K8S_VERSION-1.1
+  apt-get install -y kubelet=$K8S_PACKAGE_VERSION kubeadm=$K8S_PACKAGE_VERSION kubectl=$K8S_PACKAGE_VERSION
   if [[ $? > 0 ]]; then
     outputerr = 
-    printstyle "apt-get install -y kubelet=$K8S_VERSION-1.1 kubeadm=$K8S_VERSION-1.1 kubectl=$K8S_VERSION-1.1 Fail... \n Please fixed apt-get" 'warning'
+    printstyle "apt-get install -y kubelet=$K8S_PACKAGE_VERSION kubeadm=$K8S_PACKAGE_VERSION kubectl=$K8S_PACKAGE_VERSION \n Fail... \n Please fixed apt-get\n" 'warning'
     exit
   fi