From f09e800020e0c573c9fcb71bfac9c6ee5130094e Mon Sep 17 00:00:00 2001 From: yeasy Date: Wed, 27 May 2026 18:17:24 -0700 Subject: [PATCH] fix(content): harden copy-paste safety examples --- 03_install/3.6_offline.md | 16 ++++++++++------ 07_dockerfile/7.1_run.md | 4 +++- 14_kubernetes_setup/14.1_kubeadm.md | 16 +++++++++------- 14_kubernetes_setup/14.2_kubeadm-docker.md | 14 ++++++++------ 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/03_install/3.6_offline.md b/03_install/3.6_offline.md index 53fc3bb..05cc180 100644 --- a/03_install/3.6_offline.md +++ b/03_install/3.6_offline.md @@ -90,9 +90,11 @@ $ sudo dnf versionlock clear ##### 挂载 ISO 镜像搭建本地 File 源 ```bash -## 删除其他网络源 +## 备份其他网络源 -$ sudo rm -f /etc/yum.repos.d/* +$ repo_backup="/etc/yum.repos.d/backup-$(date +%Y%m%d%H%M%S)" +$ sudo mkdir -p "$repo_backup" +$ sudo find /etc/yum.repos.d -maxdepth 1 -type f -name '*.repo' -exec mv {} "$repo_backup"/ \; ## 挂载光盘或者iso镜像 @@ -106,7 +108,7 @@ $ sudo tee /etc/yum.repos.d/local-base.repo <` 路径交给真正消费密钥的工具。 + #### 3. Heredoc 语法 BuildKit 支持使用 heredoc 语法编写多行脚本，无需行末反斜杠 `\` 连接： diff --git a/14_kubernetes_setup/14.1_kubeadm.md b/14_kubernetes_setup/14.1_kubeadm.md index a8414a3..b92d177 100644 --- a/14_kubernetes_setup/14.1_kubeadm.md +++ b/14_kubernetes_setup/14.1_kubeadm.md @@ -186,8 +186,8 @@ $ sudo kubeadm init \ ```bash ... [addons] Applied essential addon: CoreDNS -I1116 12:35:13.270407 86677 request.go:538] Throttling request took 181.409184ms, request: POST:https://192.168.199.100:6443/api/v1/namespaces/kube-system/serviceaccounts -I1116 12:35:13.470292 86677 request.go:538] Throttling request took 186.088112ms, request: POST:https://192.168.199.100:6443/api/v1/namespaces/kube-system/configmaps +I1116 12:35:13.270407 86677 request.go:538] Throttling request took 181.409184ms, request: POST:https://:6443/api/v1/namespaces/kube-system/serviceaccounts +I1116 12:35:13.470292 86677 request.go:538] Throttling request took 186.088112ms, request: POST:https://:6443/api/v1/namespaces/kube-system/configmaps [addons] Applied essential addon: kube-proxy Your Kubernetes control-plane has initialized successfully! @@ -204,8 +204,8 @@ Run "kubectl apply -f [podnetwork].yaml" with one of the options listed at: Then you can join any number of worker nodes by running the following on each as root: -kubeadm join 192.168.199.100:6443 --token cz81zt.orsy9gm9v649e5lf \ - --discovery-token-ca-cert-hash sha256:5edb316fd0d8ea2792cba15cdf1c899a366f147aa03cba52d4e5c5884ad836fe +kubeadm join :6443 --token \ + --discovery-token-ca-cert-hash sha256: ``` #### node 工作节点 @@ -217,12 +217,14 @@ $ systemctl enable containerd $ systemctl start containerd -$ kubeadm join 192.168.199.100:6443 \ - --token cz81zt.orsy9gm9v649e5lf \ - --discovery-token-ca-cert-hash sha256:5edb316fd0d8ea2792cba15cdf1c899a366f147aa03cba52d4e5c5884ad836fe \ +$ kubeadm join :6443 \ + --token \ + --discovery-token-ca-cert-hash sha256: \ --cri-socket unix:///run/containerd/containerd.sock ``` +其中 ``、`` 和 `` 应使用你自己的 `kubeadm init` 输出，不要复用示例值。 + ### 14.1.7 查看服务 所有服务启动后，通过 `crictl` 查看本地实际运行的容器。这些服务大概分为三类：主节点服务、工作节点服务和其它服务。 diff --git a/14_kubernetes_setup/14.2_kubeadm-docker.md b/14_kubernetes_setup/14.2_kubeadm-docker.md index dc1ae68..bd0b924 100644 --- a/14_kubernetes_setup/14.2_kubeadm-docker.md +++ b/14_kubernetes_setup/14.2_kubeadm-docker.md @@ -213,8 +213,8 @@ $ sudo kubeadm init --image-repository registry.cn-hangzhou.aliyuncs.com/google_ ```bash ... [addons] Applied essential addon: CoreDNS -I1116 12:35:13.270407 86677 request.go:538] Throttling request took 181.409184ms, request: POST:https://192.168.199.100:6443/api/v1/namespaces/kube-system/serviceaccounts -I1116 12:35:13.470292 86677 request.go:538] Throttling request took 186.088112ms, request: POST:https://192.168.199.100:6443/api/v1/namespaces/kube-system/configmaps +I1116 12:35:13.270407 86677 request.go:538] Throttling request took 181.409184ms, request: POST:https://:6443/api/v1/namespaces/kube-system/serviceaccounts +I1116 12:35:13.470292 86677 request.go:538] Throttling request took 186.088112ms, request: POST:https://:6443/api/v1/namespaces/kube-system/configmaps [addons] Applied essential addon: kube-proxy Your Kubernetes control-plane has initialized successfully! @@ -231,8 +231,8 @@ Run "kubectl apply -f [podnetwork].yaml" with one of the options listed at: Then you can join any number of worker nodes by running the following on each as root: -kubeadm join 192.168.199.100:6443 --token cz81zt.orsy9gm9v649e5lf \ - --discovery-token-ca-cert-hash sha256:5edb316fd0d8ea2792cba15cdf1c899a366f147aa03cba52d4e5c5884ad836fe +kubeadm join :6443 --token \ + --discovery-token-ca-cert-hash sha256: ``` #### node 工作节点 @@ -240,11 +240,13 @@ kubeadm join 192.168.199.100:6443 --token cz81zt.orsy9gm9v649e5lf \ 在 **另一主机** 重复 **部署** 小节以前的步骤，安装配置好 kubelet。根据提示，加入到集群。 ```bash -$ kubeadm join 192.168.199.100:6443 --token cz81zt.orsy9gm9v649e5lf \ - --discovery-token-ca-cert-hash sha256:5edb316fd0d8ea2792cba15cdf1c899a366f147aa03cba52d4e5c5884ad836fe \ +$ kubeadm join :6443 --token \ + --discovery-token-ca-cert-hash sha256: \ --cri-socket unix:///var/run/cri-dockerd.sock ``` +其中 ``、`` 和 `` 应使用你自己的 `kubeadm init` 输出，不要复用示例值。 + ### 14.2.7 查看服务 所有服务启动后，查看本地实际运行的 Docker 容器。这些服务大概分为三类：主节点服务、工作节点服务和其它服务。