diff --git a/12_implementation/12.1_arch.md b/12_implementation/12.1_arch.md index f166a11..c549fd1 100644 --- a/12_implementation/12.1_arch.md +++ b/12_implementation/12.1_arch.md @@ -8,10 +8,10 @@ Docker 采用了 **C/S (客户端/服务端)** 架构。Client 向 Daemon 发送 ```mermaid graph LR - C1["客户端"] -->|docker run| D["dockerd\n守护进程"] + C1["客户端"] -->|docker run| D["dockerd
守护进程"] C1 -->|docker pull| D - D -->|管理| C2["Containers\n容器"] - D -->|管理| C3["Images\n镜像"] + D -->|管理| C2["Containers
容器"] + D -->|管理| C3["Images
镜像"] ``` --- @@ -71,7 +71,7 @@ flowchart TD B["OCI Bundle"] S["Containerd-shim"] R["Runc"] - P["容器进程\nnginx"] + P["容器进程
nginx"] E["退出"] U -->|1. REST API| D diff --git a/14_kubernetes_setup/14.1_kubeadm.md b/14_kubernetes_setup/14.1_kubeadm.md index b8b447a..f082d12 100644 --- a/14_kubernetes_setup/14.1_kubeadm.md +++ b/14_kubernetes_setup/14.1_kubeadm.md @@ -261,15 +261,15 @@ $ kubectl apply -f https://raw.githubusercontent.com/flannel-io/flannel/v0.28.2/ 如果用 `kubeadm` 部署一个单节点集群,默认情况下无法使用,请执行以下命令解除限制 ```bash -$ kubectl taint nodes --all node-role.kubernetes.io/master- +$ kubectl taint nodes --all node-role.kubernetes.io/control-plane- -# 部分较新版本使用 control-plane taint +# 较旧版本使用 master taint -# $ kubectl taint nodes --all node-role.kubernetes.io/control-plane- +# $ kubectl taint nodes --all node-role.kubernetes.io/master- # 恢复默认值 -# $ kubectl taint nodes NODE_NAME node-role.kubernetes.io/master=true:NoSchedule +# $ kubectl taint nodes NODE_NAME node-role.kubernetes.io/control-plane=true:NoSchedule ... ``` diff --git a/14_kubernetes_setup/14.2_kubeadm-docker.md b/14_kubernetes_setup/14.2_kubeadm-docker.md index 5b86a40..da5a9fb 100644 --- a/14_kubernetes_setup/14.2_kubeadm-docker.md +++ b/14_kubernetes_setup/14.2_kubeadm-docker.md @@ -278,15 +278,15 @@ $ kubectl apply -f https://raw.githubusercontent.com/flannel-io/flannel/v0.28.2/ 如果用 `kubeadm` 部署一个单节点集群,默认情况下无法使用,请执行以下命令解除限制 ```bash -$ kubectl taint nodes --all node-role.kubernetes.io/master- +$ kubectl taint nodes --all node-role.kubernetes.io/control-plane- -# 部分较新版本使用 control-plane taint +# 较旧版本使用 master taint -# $ kubectl taint nodes --all node-role.kubernetes.io/control-plane- +# $ kubectl taint nodes --all node-role.kubernetes.io/master- # 恢复默认值 -# $ kubectl taint nodes NODE_NAME node-role.kubernetes.io/master=true:NoSchedule +# $ kubectl taint nodes NODE_NAME node-role.kubernetes.io/control-plane=true:NoSchedule ... ```