support k8s to 1.28

README.md

@@ -7,19 +7,19 @@ KubeCube installer is here for install kubecube by "all-in-one" way. More detail
 set version
 
 ```bash
-export KUBECUBE_VERSION=v1.8
+export KUBECUBE_VERSION=v1.9-rc
 ```
 
 ### All in one install
 
 ```bash
-curl -fsSL https://kubecube.nos-eastchina1.126.net/kubecube-installer/release/v1.3/entry.sh | bash
+curl -fsSL https://kubecube.nos-eastchina1.126.net/kubecube-installer/release/v1.4-rc/entry.sh | bash
 ```
 
 ### Custom install
 
 ```bash
-export CUSTOMIZE="true";curl -fsSL https://kubecube.nos-eastchina1.126.net/kubecube-installer/release/v1.3/entry.sh | bash
+export CUSTOMIZE="true";curl -fsSL https://kubecube.nos-eastchina1.126.net/kubecube-installer/release/v1.4-rc/entry.sh | bash
 ```
 
 ## Clean UP

entry.sh

@@ -66,7 +66,7 @@ if [ -e "./manifests" ]; then
   echo -e "$(date +'%Y-%m-%d %H:%M:%S') \033[32mINFO\033[0m manifests and kubecube-chart already exist"
 else
   echo -e "$(date +'%Y-%m-%d %H:%M:%S') \033[32mINFO\033[0m downloading manifests for kubecube"
-  wget https://kubecube.nos-eastchina1.126.net/kubecube-installer/release/v1.3/manifests.tar.gz -O manifests.tar.gz
+  wget https://kubecube.nos-eastchina1.126.net/kubecube-installer/release/v1.4-rc/manifests.tar.gz -O manifests.tar.gz
   tar -xzvf manifests.tar.gz > /dev/null
 
   echo -e "$(date +'%Y-%m-%d %H:%M:%S') \033[32mINFO\033[0m downloading kubecube-chart ${KUBECUBE_VERSION}"

images/k8s/v1.27.8/images.list

@@ -0,0 +1,10 @@
+hub.c.163.com/kubecube/calico/node:v3.26.1-m
+hub.c.163.com/kubecube/calico/cni:v3.26.1-m
+hub.c.163.com/kubecube/calico/kube-controllers:v3.26.1-m
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.27.8
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.27.8
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.27.8
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.27.8
+registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.9
+registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.9-0
+registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.10.1

images/k8s/v1.28.4/images.list

@@ -0,0 +1,10 @@
+hub.c.163.com/kubecube/calico/node:v3.26.1-m
+hub.c.163.com/kubecube/calico/cni:v3.26.1-m
+hub.c.163.com/kubecube/calico/kube-controllers:v3.26.1-m
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.28.4
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.28.4
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.28.4
+registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.28.4
+registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.9
+registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.10-0
+registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.11.1

install.conf

@@ -22,7 +22,7 @@ NODE_MODE="master"
 ZONE="cn"
 
 # k8s version you want to install
-# support now is: 1.19.13, 1.20.9, 1.21.2, 1.22.2, 1.23.5, 1.24.7, 1.25.3, 1.26.0
+# support now is: 1.19.13, 1.20.9, 1.21.2, 1.22.2, 1.23.5, 1.24.7, 1.25.3, 1.26.0, 1.27.8, 1.28.4
 KUBERNETES_VERSION="1.23.5"
 
 # namespace that all kubecube components will deploy

install_k8s.sh

@@ -489,6 +489,19 @@ function make_cluster_configuration (){
     IPADDR=${KUBERNETES_BIND_ADDRESS}
   fi
 
+  cri_socket=unix:///var/run/cri-dockerd.sock
+
+  if [[ ${CONTAINER_RUNTIME} = "containerd" ]]; then
+    cri_socket=unix:///var/run/containerd/containerd.sock
+  fi
+
+INIT_CONF=$(cat <<- EOF
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+nodeRegistration:
+  criSocket: ${cri_socket}
+EOF
+)
 API_SERVER_CONF=$(cat <<- EOF
 # set control plane components listen on IPADDR
 controllerManager:
@@ -513,14 +526,22 @@ if [ -z ${CONTROL_PLANE_ENDPOINT} ]; then
   CONTROL_PLANE_ENDPOINT=${IPADDR}
 fi
 
+apiversion=kubeadm.k8s.io/v1beta2
+
+if [ $(echo "$KUBERNETES_VERSION 1.26" | awk '{ if ($1 > $2) print 1; else print 0 }') -eq 1 ]; then
+  apiversion=kubeadm.k8s.io/v1beta3
+fi
+
 cat >/etc/cube/kubeadm/init.config <<EOF
-apiVersion: kubeadm.k8s.io/v1beta2
+apiVersion: ${apiversion}
 kind: ClusterConfiguration
 kubernetesVersion: ${KUBERNETES_VERSION}
 controlPlaneEndpoint: ${CONTROL_PLANE_ENDPOINT}
 ${API_SERVER_CONF}
 ---
 ${KUBE_PROXY_CONF}
+---
+${INIT_CONF}
 EOF
 }