[zh] sync optional-kubectl-configs-bash-linux.md and mac.md (#40314)

Author: windsonsea

content/zh-cn/docs/tasks/tools/included/optional-kubectl-configs-bash-linux.md

@@ -6,12 +6,15 @@ _build:
   list: never
   render: never
   publishResources: false
-
 ---
 <!-- 
 title: "bash auto-completion on Linux"
 description: "Some optional configuration for bash auto-completion on Linux."
 headless: true
+_build:
+  list: never
+  render: never
+  publishResources: false
 -->
 
 <!-- 
@@ -20,9 +23,13 @@ headless: true
 ### 简介 {#introduction}
 
 <!-- 
-The kubectl completion script for Bash can be generated with the command `kubectl completion bash`. Sourcing the completion script in your shell enables kubectl autocompletion.
+The kubectl completion script for Bash can be generated with the command `kubectl completion bash`.
+Sourcing the completion script in your shell enables kubectl autocompletion.
 
-However, the completion script depends on [**bash-completion**](https://github.com/scop/bash-completion), which means that you have to install this software first (you can test if you have bash-completion already installed by running `type _init_completion`).
+However, the completion script depends on
+[**bash-completion**](https://github.com/scop/bash-completion),
+which means that you have to install this software first
+(you can test if you have bash-completion already installed by running `type _init_completion`).
 -->
 kubectl 的 Bash 补全脚本可以用命令 `kubectl completion bash` 生成。
 在 Shell 中导入（Sourcing）补全脚本，将启用 kubectl 自动补全功能。
@@ -36,11 +43,16 @@ kubectl 的 Bash 补全脚本可以用命令 `kubectl completion bash` 生成。
 ### 安装 bash-completion {#install-bash-comletion}
 
 <!-- 
-bash-completion is provided by many package managers (see [here](https://github.com/scop/bash-completion#installation)). You can install it with `apt-get install bash-completion` or `yum install bash-completion`, etc.
+bash-completion is provided by many package managers
+(see [here](https://github.com/scop/bash-completion#installation)).
+You can install it with `apt-get install bash-completion` or `yum install bash-completion`, etc.
 
-The above commands create `/usr/share/bash-completion/bash_completion`, which is the main script of bash-completion. Depending on your package manager, you have to manually source this file in your `~/.bashrc` file.
+The above commands create `/usr/share/bash-completion/bash_completion`,
+which is the main script of bash-completion. Depending on your package manager,
+you have to manually source this file in your `~/.bashrc` file.
 
-To find out, reload your shell and run `type _init_completion`. If the command succeeds, you're already set, otherwise add the following to your `~/.bashrc` file:
+To find out, reload your shell and run `type _init_completion`.
+If the command succeeds, you're already set, otherwise add the following to your `~/.bashrc` file:
 -->
 很多包管理工具均支持 bash-completion（参见[这里](https://github.com/scop/bash-completion#installation)）。
 可以通过 `apt-get install bash-completion` 或 `yum install bash-completion` 等命令来安装它。
@@ -68,7 +80,8 @@ Reload your shell and verify that bash-completion is correctly installed by typi
 #### Bash
 
 <!-- 
-You now need to ensure that the kubectl completion script gets sourced in all your shell sessions. There are two ways in which you can do this:
+You now need to ensure that the kubectl completion script gets sourced in all
+your shell sessions. There are two ways in which you can do this:
 -->
 你现在需要确保一点：kubectl 补全脚本已经导入（sourced）到 Shell 会话中。
 可以通过以下两种方法进行设置：
@@ -79,6 +92,7 @@ echo 'source <(kubectl completion bash)' >>~/.bashrc
 {{< /tab >}}
 {{< tab name="系统全局" codelang="bash" >}}
 kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl > /dev/null
+sudo chmod a+r /etc/bash_completion.d/kubectl
 {{< /tab >}}
 {{< /tabs >}}
 

content/zh-cn/docs/tasks/tools/included/optional-kubectl-configs-bash-mac.md

@@ -23,9 +23,11 @@ _build:
 ### 简介 {#introduction}
 
 <!-- 
-The kubectl completion script for Bash can be generated with `kubectl completion bash`. Sourcing this script in your shell enables kubectl completion.
+The kubectl completion script for Bash can be generated with `kubectl completion bash`.
+Sourcing this script in your shell enables kubectl completion.
 
-However, the kubectl completion script depends on [**bash-completion**](https://github.com/scop/bash-completion) which you thus have to previously install.
+However, the kubectl completion script depends on
+[**bash-completion**](https://github.com/scop/bash-completion) which you thus have to previously install.
 -->
 kubectl 的 Bash 补全脚本可以通过 `kubectl completion bash` 命令生成。
 在你的 Shell 中导入（Sourcing）这个脚本即可启用补全功能。
@@ -35,10 +37,17 @@ kubectl 的 Bash 补全脚本可以通过 `kubectl completion bash` 命令生成
 
 {{< warning>}}
 <!-- 
-There are two versions of bash-completion, v1 and v2. V1 is for Bash 3.2 (which is the default on macOS), and v2 is for Bash 4.1+. The kubectl completion script **doesn't work** correctly with bash-completion v1 and Bash 3.2. It requires **bash-completion v2** and **Bash 4.1+**. Thus, to be able to correctly use kubectl completion on macOS, you have to install and use Bash 4.1+ ([*instructions*](https://itnext.io/upgrading-bash-on-macos-7138bd1066ba)). The following instructions assume that you use Bash 4.1+ (that is, any Bash version of 4.1 or newer).
--->
-bash-completion 有两个版本：v1 和 v2。v1 对应 Bash 3.2（也是 macOS 的默认安装版本），v2 对应 Bash 4.1+。
-kubectl 的补全脚本**无法适配** bash-completion v1 和 Bash 3.2。
+There are two versions of bash-completion, v1 and v2. V1 is for Bash 3.2
+(which is the default on macOS), and v2 is for Bash 4.1+. The kubectl completion
+script **doesn't work** correctly with bash-completion v1 and Bash 3.2.
+It requires **bash-completion v2** and **Bash 4.1+**. Thus, to be able to
+correctly use kubectl completion on macOS, you have to install and use
+Bash 4.1+ ([*instructions*](https://itnext.io/upgrading-bash-on-macos-7138bd1066ba)).
+The following instructions assume that you use Bash 4.1+
+(that is, any Bash version of 4.1 or newer).
+-->
+bash-completion 有两个版本：v1 和 v2。v1 对应 Bash 3.2（也是 macOS 的默认安装版本），
+v2 对应 Bash 4.1+。kubectl 的补全脚本**无法适配** bash-completion v1 和 Bash 3.2。
 必须为它配备 **bash-completion v2** 和 **Bash 4.1+**。
 有鉴于此，为了在 macOS 上使用 kubectl 补全功能，你必须要安装和使用 Bash 4.1+
 （[**说明**](https://itnext.io/upgrading-bash-on-macos-7138bd1066ba)）。
@@ -89,14 +98,17 @@ Homebrew 通常把它安装为 `/usr/local/bin/bash`。
 
 {{< note >}}
 <!-- 
-As mentioned, these instructions assume you use Bash 4.1+, which means you will install bash-completion v2 (in contrast to Bash 3.2 and bash-completion v1, in which case kubectl completion won't work).
+As mentioned, these instructions assume you use Bash 4.1+, which means you will
+install bash-completion v2 (in contrast to Bash 3.2 and bash-completion v1,
+in which case kubectl completion won't work).
 -->
 如前所述，本说明假定你使用的 Bash 版本为 4.1+，这意味着你要安装 bash-completion v2
 （不同于 Bash 3.2 和 bash-completion v1，kubectl 的补全功能在该场景下无法工作）。
 {{< /note >}}
 
 <!-- 
-You can test if you have bash-completion v2 already installed with `type _init_completion`. If not, you can install it with Homebrew:
+You can test if you have bash-completion v2 already installed with `type _init_completion`.
+If not, you can install it with Homebrew:
 -->
 你可以用命令 `type _init_completion` 测试 bash-completion v2 是否已经安装。
 如未安装，用 Homebrew 来安装它：
@@ -125,7 +137,8 @@ Reload your shell and verify that bash-completion v2 is correctly installed with
 ### 启用 kubectl 自动补全功能 {#enable-kubectl-autocompletion}
 
 <!-- 
-You now have to ensure that the kubectl completion script gets sourced in all your shell sessions. There are multiple ways to achieve this:
+You now have to ensure that the kubectl completion script gets sourced in all
+your shell sessions. There are multiple ways to achieve this:
 
 - Source the completion script in your `~/.bash_profile` file:
 -->
@@ -158,7 +171,10 @@ You now have to ensure that the kubectl completion script gets sourced in all yo
   ```
 
 <!-- 
-- If you installed kubectl with Homebrew (as explained [here](/docs/tasks/tools/install-kubectl-macos/#install-with-homebrew-on-macos)), then the kubectl completion script should already be in `/usr/local/etc/bash_completion.d/kubectl`. In that case, you don't need to do anything.
+- If you installed kubectl with Homebrew (as explained
+  [here](/docs/tasks/tools/install-kubectl-macos/#install-with-homebrew-on-macos)),
+  then the kubectl completion script should already be in `/usr/local/etc/bash_completion.d/kubectl`.
+  In that case, you don't need to do anything.
 -->
 - 如果你是用 Homebrew 安装的 kubectl
   （如[此页面](/zh-cn/docs/tasks/tools/install-kubectl-macos/#install-with-homebrew-on-macos)所描述），
@@ -167,7 +183,8 @@ You now have to ensure that the kubectl completion script gets sourced in all yo
 
   {{< note >}}
   <!-- 
-  The Homebrew installation of bash-completion v2 sources all the files in the `BASH_COMPLETION_COMPAT_DIR` directory, that's why the latter two methods work.
+  The Homebrew installation of bash-completion v2 sources all the files in the
+  `BASH_COMPLETION_COMPAT_DIR` directory, that's why the latter two methods work.
   -->
   用 Hommbrew 安装的 bash-completion v2 会初始化目录 `BASH_COMPLETION_COMPAT_DIR`
   中的所有文件，这就是后两种方法能正常工作的原因。
@@ -177,4 +194,3 @@ You now have to ensure that the kubectl completion script gets sourced in all yo
 In any case, after reloading your shell, kubectl completion should be working.
 -->
 总之，重新加载 Shell 之后，kubectl 补全功能将立即生效。
-

content/zh-cn/docs/tasks/tools/install-kubectl-macos.md

@@ -22,7 +22,10 @@ card:
 ## {{% heading "prerequisites" %}}
 
 <!--
-You must use a kubectl version that is within one minor version difference of your cluster. For example, a v{{< skew currentVersion >}} client can communicate with v{{< skew currentVersionAddMinor -1 >}}, v{{< skew currentVersionAddMinor 0 >}}, and v{{< skew currentVersionAddMinor 1 >}} control planes.
+You must use a kubectl version that is within one minor version difference of
+your cluster. For example, a v{{< skew currentVersion >}} client can communicate
+with v{{< skew currentVersionAddMinor -1 >}}, v{{< skew currentVersionAddMinor 0 >}},
+and v{{< skew currentVersionAddMinor 1 >}} control planes.
 Using the latest compatible version of kubectl helps avoid unforeseen issues.
 -->
 kubectl 版本和集群之间的差异必须在一个小版本号之内。
@@ -80,7 +83,8 @@ The following methods exist for installing kubectl on macOS:
 
    {{< note >}}
    <!--
-   To download a specific version, replace the `$(curl -L -s https://dl.k8s.io/release/stable.txt)` portion of the command with the specific version.
+   To download a specific version, replace the `$(curl -L -s https://dl.k8s.io/release/stable.txt)`
+   portion of the command with the specific version.
 
    For example, to download version {{< param "fullversion" >}} on Intel macOS, type:
    -->
@@ -193,6 +197,7 @@ The following methods exist for installing kubectl on macOS:
    The above command will generate a warning:
    -->
    上面的命令会产生一个警告：
+
    ```
    WARNING: This version information is deprecated and will be replaced with the output from kubectl version --short.
    ```
@@ -226,7 +231,8 @@ The following methods exist for installing kubectl on macOS:
 ### 用 Homebrew 在 macOS 系统上安装 {#install-with-homebrew-on-macos}
 
 <!--
-If you are on macOS and using [Homebrew](https://brew.sh/) package manager, you can install kubectl with Homebrew.
+If you are on macOS and using [Homebrew](https://brew.sh/) package manager,
+you can install kubectl with Homebrew.
 -->
 如果你是 macOS 系统，且用的是 [Homebrew](https://brew.sh/) 包管理工具，
 则可以用 Homebrew 安装 kubectl。
@@ -262,7 +268,8 @@ If you are on macOS and using [Homebrew](https://brew.sh/) package manager, you
 ### 用 Macports 在 macOS 系统上安装 {#install-with-macports-on-macos}
 
 <!--
-If you are on macOS and using [Macports](https://macports.org/) package manager, you can install kubectl with Macports.
+If you are on macOS and using [Macports](https://macports.org/) package manager,
+you can install kubectl with Macports.
 -->
 如果你用的是 macOS，且用 [Macports](https://macports.org/) 包管理工具，则你可以用 Macports 安装 kubectl。
 
@@ -302,7 +309,8 @@ If you are on macOS and using [Macports](https://macports.org/) package manager,
 ### 启用 shell 自动补全功能 {#enable-shell-autocompletion}
 
 <!--
-kubectl provides autocompletion support for Bash, Zsh, Fish, and PowerShell which can save you a lot of typing.
+kubectl provides autocompletion support for Bash, Zsh, Fish, and PowerShell
+which can save you a lot of typing.
 
 Below are the procedures to set up autocompletion for Bash, Fish, and Zsh.
 -->
@@ -433,7 +441,7 @@ kubectl 为 Bash、Zsh、Fish 和 PowerShell 提供自动补全功能，可以
 <!--
 1. After installing the plugin, clean up the installation files:
 -->
-1. 安装插件后，清理安装文件：
+6. 安装插件后，清理安装文件：
 
    ```bash
    rm kubectl-convert kubectl-convert.sha256

content/zh-cn/docs/tasks/tools/install-kubectl-windows.md

@@ -22,7 +22,10 @@ card:
 ## {{% heading "prerequisites" %}}
 
 <!--
-You must use a kubectl version that is within one minor version difference of your cluster. For example, a v{{< skew currentVersion >}} client can communicate with v{{< skew currentVersionAddMinor -1 >}}, v{{< skew currentVersionAddMinor 0 >}}, and v{{< skew currentVersionAddMinor 1 >}} control planes.
+You must use a kubectl version that is within one minor version difference of
+your cluster. For example, a v{{< skew currentVersion >}} client can communicate
+with v{{< skew currentVersionAddMinor -1 >}}, v{{< skew currentVersionAddMinor 0 >}},
+and v{{< skew currentVersionAddMinor 1 >}} control planes.
 Using the latest compatible version of kubectl helps avoid unforeseen issues.
 -->
 kubectl 版本和集群版本之间的差异必须在一个小版本号内。
@@ -67,7 +70,8 @@ The following methods exist for installing kubectl on Windows:
 
    {{< note >}}
    <!--
-   To find out the latest stable version (for example, for scripting), take a look at [https://dl.k8s.io/release/stable.txt](https://dl.k8s.io/release/stable.txt).
+   To find out the latest stable version (for example, for scripting), take a look at
+   [https://dl.k8s.io/release/stable.txt](https://dl.k8s.io/release/stable.txt).
    -->
    要想找到最新稳定的版本（例如：为了编写脚本），可以看看这里 [https://dl.k8s.io/release/stable.txt](https://dl.k8s.io/release/stable.txt)。
    {{< /note >}}
@@ -101,7 +105,8 @@ The following methods exist for installing kubectl on Windows:
      ```
 
    <!--
-   - Using PowerShell to automate the verification using the `-eq` operator to get a `True` or `False` result:
+   - Using PowerShell to automate the verification using the `-eq` operator to
+     get a `True` or `False` result:
    -->
    - 用 PowerShell 自动验证，用运算符 `-eq` 来直接取得 `True` 或 `False` 的结果：
 
@@ -127,9 +132,11 @@ The following methods exist for installing kubectl on Windows:
    The above command will generate a warning:
    -->
    上面的命令会产生一个警告：
+
    ```
    WARNING: This version information is deprecated and will be replaced with the output from kubectl version --short.
    ```
+
    <!--
    You can ignore this warning. You are only checking the version of `kubectl` that you
    have installed.
@@ -157,8 +164,10 @@ The following methods exist for installing kubectl on Windows:
 
 {{< note >}}
 <!-- 
-[Docker Desktop for Windows](https://docs.docker.com/docker-for-windows/#kubernetes) adds its own version of `kubectl` to `PATH`.
-If you have installed Docker Desktop before, you may need to place your `PATH` entry before the one added by the Docker Desktop installer or remove the Docker Desktop's `kubectl`.
+[Docker Desktop for Windows](https://docs.docker.com/docker-for-windows/#kubernetes)
+adds its own version of `kubectl` to `PATH`. If you have installed Docker Desktop before,
+you may need to place your `PATH` entry before the one added by the Docker Desktop
+installer or remove the Docker Desktop's `kubectl`.
 -->
 [Windows 版的 Docker Desktop](https://docs.docker.com/docker-for-windows/#kubernetes)
 将其自带版本的 `kubectl` 添加到 `PATH`。
@@ -172,7 +181,9 @@ If you have installed Docker Desktop before, you may need to place your `PATH` e
 ### 在 Windows 上用 Chocolatey、Scoop 或 winget 安装 {#install-nonstandard-package-tools}
 
 <!--
-1. To install kubectl on Windows you can use either [Chocolatey](https://chocolatey.org) package manager, [Scoop](https://scoop.sh) command-line installer, or [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/) package manager.
+1. To install kubectl on Windows you can use either [Chocolatey](https://chocolatey.org)
+   package manager, [Scoop](https://scoop.sh) command-line installer, or
+   [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/) package manager.
 -->
 1. 要在 Windows 上安装 kubectl，你可以使用包管理器 [Chocolatey](https://chocolatey.org)、
    命令行安装器 [Scoop](https://scoop.sh) 或包管理器 [winget](https://learn.microsoft.com/zh-cn/windows/package-manager/winget/)。
@@ -265,7 +276,8 @@ Edit the config file with a text editor of your choice, such as Notepad.
 ### 启用 shell 自动补全功能 {#enable-shell-autocompletion}
 
 <!--
-kubectl provides autocompletion support for Bash, Zsh, Fish, and PowerShell, which can save you a lot of typing.
+kubectl provides autocompletion support for Bash, Zsh, Fish, and PowerShell,
+which can save you a lot of typing.
 
 Below are the procedures to set up autocompletion for PowerShell.
 -->