add k8s version release

README.md

@@ -1,16 +1,16 @@
 # Kubernetes 学习笔记
 
 > 本系列是 [Kubernetes 学习笔记](https://www.huweihuang.com/kubernetes-notes/)
->
+> 
 > 更多的学习笔记请参考：
->
+> 
 > - [Kubernetes 学习笔记](https://www.huweihuang.com/kubernetes-notes/)
 > - [Kubernetes 源码分析笔记](https://www.huweihuang.com/k8s-source-code-analysis/)
 > - [Docker 学习笔记](https://www.huweihuang.com/docker-notes/)
 > - [Golang 学习笔记](https://www.huweihuang.com/golang-notes/)
 > - [Linux 学习笔记](https://www.huweihuang.com/linux-notes/)
 > - [数据结构学习笔记](https://www.huweihuang.com/data-structure-notes/)
->
+> 
 > 个人博客：[www.huweihuang.com](https://www.huweihuang.com/)
 
 ---
@@ -19,14 +19,16 @@
 
 - [12-Factor](paas/12-factor.md)
 - [K8S知识体系](paas/k8s.md)
-  
+
 ## 安装与配置
 
-- [使用kubeadm安装生产环境kubernetes](setup/install-k8s-by-kubeadm.md)
-- [使用kubespray安装kubernetes](setup/install-k8s-by-kubespray.md)
-- [使用minikube安装kubernetes](setup/install-k8s-by-minikube.md)
-- [使用kind安装kubernetes](setup/install-k8s-by-kind.md)
+- [部署k8s集群]()
+  - [使用kubeadm安装生产环境kubernetes](setup/install-k8s-by-kubeadm.md)
+  - [使用kubespray安装kubernetes](setup/install-k8s-by-kubespray.md)
+  - [使用minikube安装kubernetes](setup/install-k8s-by-minikube.md)
+  - [使用kind安装kubernetes](setup/install-k8s-by-kind.md)
 - [k8s证书及秘钥](setup/k8s-cert.md)
+- [k8s版本说明](setup/k8s-version-release.md)
 
 ## 基本概念
 
@@ -130,23 +132,30 @@
 - [Kubernetes源码分析笔记](code-analysis/code-analysis-notes.md)
 
 - [kubelet]()
+
   - [NewKubeletCommand](code-analysis/kubelet/NewKubeletCommand.md)
   - [NewMainKubelet](code-analysis/kubelet/NewMainKubelet.md)
   - [startKubelet](code-analysis/kubelet/startKubelet.md)
   - [syncLoopIteration](code-analysis/kubelet/syncLoopIteration.md)
   - [syncPod](code-analysis/kubelet/syncPod.md)
+
 - [kube-controller-manager]()
+
   - [NewControllerManagerCommand](code-analysis/kube-controller-manager/NewControllerManagerCommand.md)
   - [DeploymentController](code-analysis/kube-controller-manager/deployment-controller.md)
   - [Informer机制](code-analysis/kube-controller-manager/sharedIndexInformer.md)
+
 - [kube-scheduler]()
+
   - [NewSchedulerCommand](code-analysis/kube-scheduler/NewSchedulerCommand.md)
   - [registerAlgorithmProvider](code-analysis/kube-scheduler/registerAlgorithmProvider.md)
   - [scheduleOne](code-analysis/kube-scheduler/scheduleOne.md)
   - [findNodesThatFit](code-analysis/kube-scheduler/findNodesThatFit.md)
   - [PrioritizeNodes](code-analysis/kube-scheduler/PrioritizeNodes.md)
   - [preempt](code-analysis/kube-scheduler/preempt.md)
+
 - [kube-apiserver]()
+
   - [NewAPIServerCommand](code-analysis/kube-apiserver/NewAPIServerCommand.md)
 
 ----
@@ -182,9 +191,12 @@
 - [k8s多集群管理的思考](multi-cluster/k8s-multi-cluster-thinking.md)
 
 - [Virtual Kubelet]()
+
   - [Virtual Kubelet介绍](virtual-kubelet/virtual-kubelet.md)
   - [Virtual Kubelet 命令](virtual-kubelet/virtual-kubelet-cmd.md)
+
 - [Karmada]()
+
   - [Karmada介绍](multi-cluster/karmada.md)
 
 ## 边缘容器

SUMMARY.md

@@ -8,14 +8,16 @@
 
 - [12-Factor](paas/12-factor.md)
 - [K8S知识体系](paas/k8s.md)
-  
+
 ## 安装与配置
 
-- [使用kubeadm安装生产环境kubernetes](setup/install-k8s-by-kubeadm.md)
-- [使用kubespray安装kubernetes](setup/install-k8s-by-kubespray.md)
-- [使用minikube安装kubernetes](setup/install-k8s-by-minikube.md)
-- [使用kind安装kubernetes](setup/install-k8s-by-kind.md)
+- [部署k8s集群]()
+  - [使用kubeadm安装生产环境kubernetes](setup/install-k8s-by-kubeadm.md)
+  - [使用kubespray安装kubernetes](setup/install-k8s-by-kubespray.md)
+  - [使用minikube安装kubernetes](setup/install-k8s-by-minikube.md)
+  - [使用kind安装kubernetes](setup/install-k8s-by-kind.md)
 - [k8s证书及秘钥](setup/k8s-cert.md)
+- [k8s版本说明](setup/k8s-version-release.md)
 
 ## 基本概念
 

runtime/containerd/remove-dockershim.md

@@ -0,0 +1,13 @@
+参考：
+
+- [更新：移除 Dockershim 的常见问题 | Kubernetes](https://kubernetes.io/zh-cn/blog/2022/02/17/dockershim-faq/)
+
+- [别慌: Kubernetes 和 Docker | Kubernetes](https://kubernetes.io/zh-cn/blog/2020/12/02/dont-panic-kubernetes-and-docker/)
+
+- [关于 dockershim 移除和使用兼容 CRI 运行时的文章 | Kubernetes](https://kubernetes.io/zh-cn/docs/reference/node/topics-on-dockershim-and-cri-compatible-runtimes/)
+
+- [KEP-2221: Removing dockershim from kubelete-dockershim](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2221-remove-dockershim)
+
+- [Dockershim removal feedback & issues ](https://github.com/kubernetes/kubernetes/issues/106917)
+
+- [将 Docker Engine 节点从 dockershim 迁移到 cri-dockerd | Kubernetes](https://kubernetes.io/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrate-dockershim-dockerd/)

setup/install-k8s-by-kubeadm.md

@@ -237,17 +237,23 @@ apiServer:
 ```
 
 - networking:
+
   - podSubnet：Pod CIDR范围
   - serviceSubnet： service CIDR范围
   - dnsDomain
+
 - etcd:
+
   - dataDir：Etcd的数据存储目录
 
 - apiserver
+
   - certSANs：设置额外的apiserver的域名签名证书
 
 - imageRepository：镜像仓库
+
 - controlPlaneEndpoint：控制面LB的域名
+
 - kubernetesVersion：k8s版本
 
 ## 4.2. Init配置示例
@@ -368,6 +374,7 @@ Then you can join any number of worker nodes by running the following on each as
 kubeadm join <control-plane-endpoint>:6443 --token <token> \
 --discovery-token-ca-cert-hash sha256:<hash> \
 --control-plane --certificate-key <certificate-key> \
+--cri-socket /run/containerd/containerd.sock \
 --node-name <nodename>
 ```
 
@@ -449,10 +456,12 @@ rm -f /etc/cni/net.d/*
 
 ```bash
 # 重新生成token
+kubeadm token create --print-join-command
+kubeadm token list
+
 # kubeadm token create
 oumnnc.aqlxuvdbntlvzoiv
 
-
 # 重新生成hash
 openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //'
 ```
@@ -471,5 +480,6 @@ openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outfor
 - [容器运行时 | Kubernetes](https://kubernetes.io/zh-cn/docs/setup/production-environment/container-runtimes/)
 - https://github.com/Mirantis/cri-dockerd
 - [配置 cgroup 驱动|Kubernetes](https://kubernetes.io/zh-cn/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver/)
-- [GitHub - flannel-io/flannel: flannel is a network fabric for containers, designed for Kubernetes](https://github.com/flannel-io/flannel)
+- [GitHub: flannel is a network fabric for containers](https://github.com/flannel-io/flannel)
+