adjust to remove docker support

example/hosts.allinone

@@ -30,6 +30,7 @@
 SECURE_PORT="6443"
 
 # Cluster container-runtime supported: docker, containerd
+# if k8s version >= 1.24, docker is not supported
 CONTAINER_RUNTIME="containerd"
 
 # Network plugins supported: calico, flannel, kube-router, cilium, kube-ovn

example/hosts.multi-node

@@ -34,6 +34,7 @@
 SECURE_PORT="6443"
 
 # Cluster container-runtime supported: docker, containerd
+# if k8s version >= 1.24, docker is not supported
 CONTAINER_RUNTIME="containerd"
 
 # Network plugins supported: calico, flannel, kube-router, cilium, kube-ovn

ezdown

@@ -382,6 +382,7 @@ function start_kubeasz_docker() {
       --volume "$BASE":"$BASE" \
       --volume /root/.kube:/root/.kube \
       --volume /root/.ssh:/root/.ssh \
+      --volume /etc/docker:/etc/docker \
       easzlab/kubeasz:${KUBEASZ_VER} sleep 36000
 }
 

roles/kube-node/templates/kubelet.service.j2

@@ -29,17 +29,9 @@ ExecStartPre=/bin/mkdir -p /sys/fs/cgroup/hugetlb/system.slice
 {% endif %}
 ExecStart={{ bin_dir }}/kubelet \
   --config=/var/lib/kubelet/config.yaml \
-  --cni-bin-dir={{ bin_dir }} \
-  --cni-conf-dir=/etc/cni/net.d \
-{% if CONTAINER_RUNTIME == "containerd" %}
-  --container-runtime=remote \
   --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
-{% endif %}
   --hostname-override={{ inventory_hostname }} \
-  --image-pull-progress-deadline=5m \
   --kubeconfig=/etc/kubernetes/kubelet.kubeconfig \
-  --network-plugin=cni \
-  --pod-infra-container-image={{ SANDBOX_IMAGE }} \
   --root-dir={{ KUBELET_ROOT_DIR }} \
   --v=2
 Restart=always