Merge pull request #44835 from my-git9/patch-12940

[zh-cn] sync install-kubeadm windows
kubernetes · Jan 22, 2024 · 09256b5 · 09256b5
2 parents d340fa2 + 477b5e1
commit 09256b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/content/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md
@@ -330,17 +330,22 @@ These instructions are for Kubernetes {{< skew currentVersion >}}.
 -->
 2. 下载用于 Kubernetes 软件包仓库的公共签名密钥。所有仓库都使用相同的签名密钥，因此你可以忽略URL中的版本：
 
+   <!--
+   # If the folder `/etc/apt/keyrings` does not exist, it should be created before the curl command, read the note below.
+   # sudo mkdir -p -m 755 /etc/apt/keyrings 
+   -->
    ```shell
+   # 如果 `/etc/apt/keyrings` 目录不存在，则应在 curl 命令之前创建它，请阅读下面的注释。
+   # sudo mkdir -p -m 755 /etc/apt/keyrings
    curl -fsSL https://pkgs.k8s.io/core:/stable:/{{< param "version" >}}/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
    ```
 
    {{< note >}}
    <!--
-   In releases older than Debian 12 and Ubuntu 22.04, `/etc/apt/keyrings` does not exist by default;
-   you can create it by running `sudo mkdir -m 755 /etc/apt/keyrings`
+   In releases older than Debian 12 and Ubuntu 22.04, folder `/etc/apt/keyrings` does not exist by default, and it should be created before the curl command.
    -->
-   在 Debian 12 和 Ubuntu 22.04 之前的早期版本中，默认情况下不存在 `/etc/apt/keyrings` 目录；
-   你可以通过运行 `sudo mkdir -m 755 /etc/apt/keyrings` 来创建此目录。
+   在低于 Debian 12 和 Ubuntu 22.04 的发行版本中，`/etc/apt/keyrings` 默认不存在。
+   应在 curl 命令之前创建它。
    {{< /note >}}
 
 <!--

diff --git a/content/zh-cn/docs/tasks/debug/debug-cluster/windows.md b/content/zh-cn/docs/tasks/debug/debug-cluster/windows.md
@@ -37,7 +37,7 @@ content_type: concept
    {{< note >}}
    <!--
    If using containerd as your container runtime the pause image is specified in the
-   `plugins.plugins.cri.sandbox_image` field of the of config.toml configration file.
+   `plugins.plugins.cri.sandbox_image` field of the of config.toml configuration file.
    -->
    如果你在使用 containerd 作为你的容器运行时，那么 pause 镜像在 config.toml 配置文件的
    `plugins.plugins.cri.sandbox_image` 中指定。