Merge master into dev-1.21 to keep in sync, plus latest API reference

This sync merge includes API reference updates.
2021-04-06 20:53:30 +01:00
parent 8dbf6671db d2bf43be4d 41f8e9da78
commit 965aa51daf
266 changed files with 72690 additions and 4933 deletions
@@ -153,7 +153,7 @@ data:
           ttl 30
        }
        prometheus :9153
-        forward ./etc/resolv.conf
+        forward . /etc/resolv.conf
        cache 30
        loop
        reload
@@ -79,7 +79,7 @@ Refer to your cloud provider for instructions on enabling the cloud provider-spe
 -->
 ### 启用由云服务驱动支持的 KMS

-有关启用云服务驱动特定的 KMS 插件的说明，请咨询你的云服务驱动。
+有关启用云服务驱动特定的 KMS 插件的说明，请咨询你的云服务驱动商。

 <!--
 ### Developing a KMS plugin gRPC server
@@ -269,7 +269,7 @@ to do so are available at [Install Docker Engine - Enterprise on Windows Servers
 All code snippets in Windows sections are to be run in a PowerShell environment
 with elevated permissions (Administrator) on the Windows worker node.
 -->
-### 加入 Windows 工作节点   {joining-a-windows-worker-node}
+### 加入 Windows 工作节点   {#joining-a-windows-worker-node}

 你必须安装 `Containers` 功能特性并安装 Docker 工具。相关的指令可以在
 [Install Docker Engine - Enterprise on Windows Servers](https://hub.docker.com/editions/enterprise/docker-ee-server-windows)
@@ -160,20 +160,21 @@ kubernetes 系统守护进程记述其资源预留值。
 kubernetes 系统守护进程预留指定数量的进程 ID。

 <!--
-To optionally enforce `kube-reserved` on system daemons, specify the parent
+To optionally enforce `kube-reserved` on kubernetes system daemons, specify the parent
 control group for kube daemons as the value for `--kube-reserved-cgroup` kubelet
 flag.

 It is recommended that the kubernetes system daemons are placed under a top
 level control group (`runtime.slice` on systemd machines for example). Each
 system daemon should ideally run within its own child control group. Refer to
-[this doc](https://git.k8s.io/community/contributors/design-proposals/node/node-allocatable.md#recommended-cgroups-setup)
+[this
+doc](https://git.k8s.io/community/contributors/design-proposals/node/node-allocatable.md#recommended-cgroups-setup)
 for more details on recommended control group hierarchy.

 Note that Kubelet **does not** create `--kube-reserved-cgroup` if it doesn't
 exist. Kubelet will fail if an invalid cgroup is specified.
 -->
-要选择性地对系统守护进程上执行 `kube-reserved` 保护，需要把 kubelet 的
+要选择性地对 kubernetes 系统守护进程上执行 `kube-reserved` 保护，需要把 kubelet 的
 `--kube-reserved-cgroup` 标志的值设置为 kube 守护进程的父控制组。

 推荐将 kubernetes 系统守护进程放置于顶级控制组之下（例如 systemd 机器上的
@@ -360,7 +360,7 @@ By default, they are set to 3 and 1 respectively.  Setting a limit to `0` corres
 ### 任务历史限制

 `.spec.successfulJobsHistoryLimit` 和 `.spec.failedJobsHistoryLimit`是可选的。
-这两个域声明了有多少执行完成和失败的任务会被保留。
+这两个字段指定应保留多少已完成和失败的任务。
 默认设置为3和1。限制设置为0代表相应类型的任务完成后不会保留。


@@ -98,12 +98,12 @@ Configurations with a single API server will experience unavailability while the
   也会获得此更新并且同时信任老的和新的 CA 证书。
   <!--
   ```shell
-   base64_encoded_ca="$(base64 <path to file containing both old and new CAs>)"
+   base64_encoded_ca="$(base64 -w0 <path to file containing both old and new CAs>)"

   for namespace in $(kubectl get ns --no-headers | awk '{print $1}'); do
       for token in $(kubectl get secrets --namespace "$namespace" --field-selector type=kubernetes.io/service-account-token -o name); do
           kubectl get $token --namespace "$namespace" -o yaml | \
-             /bin/sed "s/\(ca.crt:\).*/\1 ${base64_encoded_ca}" | \
+             /bin/sed "s/\(ca.crt:\).*/\1 ${base64_encoded_ca}/" | \
             kubectl apply -f -
       done
   done
@@ -111,12 +111,12 @@ Configurations with a single API server will experience unavailability while the
   -->

   ```shell
-   base64_encoded_ca="$(base64 <path to file containing both old and new CAs>)"
+   base64_encoded_ca="$(base64 -w0 <path to file containing both old and new CAs>)"

   for namespace in $(kubectl get ns --no-headers | awk '{print $1}'); do
       for token in $(kubectl get secrets --namespace "$namespace" --field-selector type=kubernetes.io/service-account-token -o name); do
           kubectl get $token --namespace "$namespace" -o yaml | \
-             /bin/sed "s/\(ca.crt:\).*/\1 ${base64_encoded_ca}" | \
+             /bin/sed "s/\(ca.crt:\).*/\1 ${base64_encoded_ca}/" | \
             kubectl apply -f -
       done
   done
@@ -205,13 +205,13 @@ Configurations with a single API server will experience unavailability while the

      <!--
      To generate certificates and private keys for your cluster using the `openssl`
-      command line tool, see [Certificates (`openssl`)](/docs/concepts/cluster-administration/certificates/#openssl).
-      You can also use [`cfssl`](/docs/concepts/cluster-administration/certificates/#cfssl).
+      command line tool, see [Certificates (`openssl`)](/docs/tasks/administer-cluster/certificates/#openssl).
+      You can also use [`cfssl`](/docs/tasks/administer-cluster/certificates/#cfssl).
      -->
      {{< note >}}
      要使用 `openssl` 命令行为集群生成新的证书和私钥，可参阅
-      [证书（`openssl`）](/zh/docs/concepts/cluster-administration/certificates/#openssl)。
-      你也可以使用[`cfssl`](/zh/docs/concepts/cluster-administration/certificates/#cfssl).
+      [证书（`openssl`）](/zh/docs/tasks/administer-cluster/certificates/#openssl)。
+      你也可以使用[`cfssl`](/zh/docs/tasks/administer-cluster/certificates/#cfssl).
      {{< /note >}}

   <!--
@@ -249,10 +249,10 @@ Configurations with a single API server will experience unavailability while the
   ConfigMap `cluster-info`，使之包含新的 CA 证书。

   ```shell
-   base64_encoded_ca="$(base64 /etc/kubernetes/pki/ca.crt)"
+   base64_encoded_ca="$(base64 -w0 /etc/kubernetes/pki/ca.crt)"

   kubectl get cm/cluster-info --namespace kube-public -o yaml | \
-       /bin/sed "s/\(certificate-authority-data:\).*/\1 ${base64_encoded_ca}" | \
+       /bin/sed "s/\(certificate-authority-data:\).*/\1 ${base64_encoded_ca}/" | \
       kubectl apply -f -
   ```
 <!--
@@ -0,0 +1,37 @@
+---
+title: "通过 gcloud 安装 kubectl"
+description: "用各个特定操作系统标签页中包含的 gcloud 指令片段安装 kubectl。"
+headless: true
+---
+<!-- 
+---
+title: "gcloud kubectl install"
+description: "How to install kubectl with gcloud snippet for inclusion in each OS-specific tab."
+headless: true
+---
+-->
+
+<!-- 
+You can install kubectl as part of the Google Cloud SDK.
+-->
+kubectl 可以作为 Google Cloud SDK 的一部分被安装。
+
+<!-- 
+1. Install the [Google Cloud SDK](https://cloud.google.com/sdk/).
+1. Run the `kubectl` installation command:
+-->
+1. 安装 [Google Cloud SDK](https://cloud.google.com/sdk/)。
+1. 运行安装 `kubectl` 的命令：
+
+   ```shell
+   gcloud components install kubectl
+   ```
+
+   <!-- 
+   1. Test to ensure the version you installed is up-to-date:
+   -->
+1. 验证一下，确保安装的是最新的版本：
+
+   ```shell
+   kubectl version --client
+   ```
@@ -0,0 +1,27 @@
+---
+title: "后续内容"
+description: "安装 kubectl 之后，还可以做些什么？"
+headless: true
+---
+<!-- 
+---
+title: "What's next?"
+description: "What's next after installing kubectl."
+headless: true
+---
+-->
+
+<!-- 
+* [Install Minikube](https://minikube.sigs.k8s.io/docs/start/)
+* See the [getting started guides](/docs/setup/) for more about creating clusters.
+* [Learn how to launch and expose your application.](/docs/tasks/access-application-cluster/service-access-application-cluster/)
+* If you need access to a cluster you didn't create, see the
+  [Sharing Cluster Access document](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/).
+* Read the [kubectl reference docs](/docs/reference/kubectl/kubectl/)
+-->
+* [安装 Minikube](https://minikube.sigs.k8s.io/docs/start/)
+* 有关创建集群的更多信息，请参阅[入门指南](/zh/docs/setup/).
+* [学习如何启动并对外公开你的应用程序。](/zh/docs/tasks/access-application-cluster/service-access-application-cluster/)
+* 如果你需要访问其他人创建的集群，请参阅
+  [共享集群接入文档](/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters/).
+* 阅读 [kubectl 参考文档](/zh/docs/reference/kubectl/kubectl/)
@@ -0,0 +1,109 @@
+---
+title: "Linux 系统中的 bash 自动补全功能"
+description: "Linux 系统中 bash 自动补全功能的一些可选配置。"
+headless: true
+---
+<!-- 
+---
+title: "bash auto-completion on Linux"
+description: "Some optional configuration for bash auto-completion on Linux."
+headless: true
+---
+-->
+
+<!-- 
+### Introduction
+-->
+### 简介 {#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.
+
+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 自动补全功能。
+
+然而，补全脚本依赖于工具 [**bash-completion**](https://github.com/scop/bash-completion)，
+所以要先安装它（可以用命令 `type _init_completion` 检查 bash-completion 是否已安装）。
+
+<!-- 
+### Install bash-completion
+-->
+### 安装 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.
+
+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:
+-->
+很多包管理工具均支持 bash-completion（参见[这里](https://github.com/scop/bash-completion#installation)）。
+可以通过 `apt-get install bash-completion` 或 `yum install bash-completion` 等命令来安装它。
+
+上述命令将创建文件 `/usr/share/bash-completion/bash_completion`，它是 bash-completion 的主脚本。
+依据包管理工具的实际情况，你需要在 `~/.bashrc` 文件中手工导入此文件。
+
+要查看结果，请重新加载你的 shell，并运行命令 `type _init_completion`。
+如果命令执行成功，则设置完成，否则将下面内容添加到文件 `~/.bashrc` 中：
+
+```bash
+source /usr/share/bash-completion/bash_completion
+```
+
+<!-- 
+Reload your shell and verify that bash-completion is correctly installed by typing `type _init_completion`.
+-->
+重新加载 shell，再输入命令 `type _init_completion` 来验证 bash-completion 的安装状态。
+
+<!-- 
+### Enable kubectl autocompletion
+-->
+### 启动 kubectl 自动补全功能 {#enable-kubectl-autocompletion}
+
+<!-- 
+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 会话中。
+这里有两种验证方法：
+
+<!-- 
+- Source the completion script in your `~/.bashrc` file:
+-->
+- 在文件 `~/.bashrc` 中导入（source）补全脚本：
+
+  ```bash
+  echo 'source <(kubectl completion bash)' >>~/.bashrc
+  ```
+
+<!-- 
+- Add the completion script to the `/etc/bash_completion.d` directory:
+-->
+- 将补全脚本添加到目录 `/etc/bash_completion.d` 中：
+
+  ```bash
+  kubectl completion bash >/etc/bash_completion.d/kubectl
+  ```
+
+<!-- 
+If you have an alias for kubectl, you can extend shell completion to work with that alias:
+-->
+如果 kubectl 有关联的别名，你可以扩展 shell 补全来适配此别名：
+
+```bash
+echo 'alias k=kubectl' >>~/.bashrc
+echo 'complete -F __start_kubectl k' >>~/.bashrc
+```
+
+{{< note >}}
+<!-- 
+bash-completion sources all completion scripts in `/etc/bash_completion.d`.
+-->
+bash-completion 负责导入 `/etc/bash_completion.d` 目录中的所有补全脚本。
+{{< /note >}}
+
+<!-- 
+Both approaches are equivalent. After reloading your shell, kubectl autocompletion should be working.
+-->
+两种方式的效果相同。重新加载 shell 后，kubectl 自动补全功能即可生效。
@@ -0,0 +1,173 @@
+---
+title: "macOS 系统上的 bash 自动补全"
+description: "在 macOS 上实现 Bash 自动补全的一些可选配置。"
+headless: true
+---
+<!-- 
+---
+title: "bash auto-completion on macOS"
+description: "Some optional configuration for bash auto-completion on macOS."
+headless: true
+---
+ -->
+
+<!-- 
+### Introduction
+-->
+### 简介 
+
+<!-- 
+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.
+-->
+kubectl 的 Bash 补全脚本可以通过 `kubectl completion bash` 命令生成。
+在你的 shell 中导入（Sourcing）这个脚本即可启用补全功能。
+
+此外，kubectl 补全脚本依赖于工具 [**bash-completion**](https://github.com/scop/bash-completion)，
+所以你必须先安装它。
+
+{{< 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 对应 Bash3.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))。
+后续说明假定你用的是 Bash 4.1+（也就是 Bash 4.1 或更新的版本）
+{{< /warning >}}
+
+<!-- 
+### Upgrade Bash
+-->
+### 升级 Bash
+
+<!-- 
+The instructions here assume you use Bash 4.1+. You can check your Bash's version by running:
+-->
+后续说明假定你已使用 Bash 4.1+。你可以运行以下命令检查 Bash 版本：
+
+```bash
+echo $BASH_VERSION
+```
+
+<!-- 
+If it is too old, you can install/upgrade it using Homebrew:
+-->
+如果版本太旧，可以用 Homebrew 安装/升级：
+
+```bash
+brew install bash
+```
+
+<!-- 
+Reload your shell and verify that the desired version is being used:
+-->
+重新加载 shell，并验证所需的版本已经生效：
+
+```bash
+echo $BASH_VERSION $SHELL
+```
+
+<!-- 
+Homebrew usually installs it at `/usr/local/bin/bash`.
+-->
+Homebrew 通常把它安装为 `/usr/local/bin/bash`。
+
+<!-- 
+### Install bash-completion
+-->
+### 安装 bash-completion
+
+
+{{< 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).
+-->
+如前所述，本说明假定你使用的 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:
+-->
+你可以用命令 `type _init_completion` 测试 bash-completion v2 是否已经安装。
+如未安装，用 Homebrew 来安装它：
+
+```bash
+brew install bash-completion@2
+```
+
+<!-- 
+As stated in the output of this command, add the following to your `~/.bash_profile` file:
+-->
+如命令的输出信息所显示的，将如下内容添加到文件 `~/.bash_profile` 中：
+
+```bash
+export BASH_COMPLETION_COMPAT_DIR="/usr/local/etc/bash_completion.d"
+[[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh"
+```
+
+<!-- 
+Reload your shell and verify that bash-completion v2 is correctly installed with `type _init_completion`.
+-->
+重新加载 shell，并用命令 `type _init_completion` 验证 bash-completion v2 已经恰当的安装。
+
+<!-- 
+### Enable kubectl autocompletion
+-->
+### 启用 kubectl 自动补全功能
+
+<!-- 
+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:
+-->
+你现在需要确保在所有的 shell 环境中均已导入（sourced） kubectl 的补全脚本，
+有若干种方法可以实现这一点：
+
+- 在文件 `~/.bash_profile` 中导入（Source）补全脚本：
+
+    ```bash
+    echo 'source <(kubectl completion bash)' >>~/.bash_profile
+    ```
+
+<!-- 
+- Add the completion script to the `/usr/local/etc/bash_completion.d` directory:
+-->
+- 将补全脚本添加到目录 `/usr/local/etc/bash_completion.d` 中：
+
+    ```bash
+    kubectl completion bash >/usr/local/etc/bash_completion.d/kubectl
+    ```
+
+<!-- 
+- If you have an alias for kubectl, you can extend shell completion to work with that alias:
+-->
+- 如果你为 kubectl 定义了别名，则可以扩展 shell 补全来兼容该别名：
+
+    ```bash
+    echo 'alias k=kubectl' >>~/.bash_profile
+    echo 'complete -F __start_kubectl k' >>~/.bash_profile
+    ```
+
+<!-- 
+- If you installed kubectl with Homebrew (as explained [above](#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（[如上所述](#install-with-homebrew-on-macos)），
+  那么 kubectl 补全脚本应该已经安装到目录 `/usr/local/etc/bash_completion.d/kubectl` 中了。
+  这种情况下，你什么都不需要做。
+
+   {{< 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.
+   -->
+   用 Hommbrew 安装的 bash-completion v2 会初始化 目录 `BASH_COMPLETION_COMPAT_DIR` 中的所有文件，这就是后两种方法能正常工作的原因。
+   {{< /note >}}
+
+<!-- 
+In any case, after reloading your shell, kubectl completion should be working.
+-->
+总之，重新加载 shell 之后，kubectl 补全功能将立即生效。
@@ -0,0 +1,50 @@
+---
+title: "zsh 自动补全"
+description: "zsh 自动补全的一些可选配置"
+headless: true
+---
+<!-- 
+---
+title: "zsh auto-completion"
+description: "Some optional configuration for zsh auto-completion."
+headless: true
+---
+-->
+
+<!-- 
+The kubectl completion script for Zsh can be generated with the command `kubectl completion zsh`. Sourcing the completion script in your shell enables kubectl autocompletion.
+
+To do so in all your shell sessions, add the following to your `~/.zshrc` file:
+-->
+kubectl 通过命令 `kubectl completion zsh` 生成 Zsh 自动补全脚本。
+在 shell 中导入（Sourcing）该自动补全脚本，将启动 kubectl 自动补全功能。
+
+为了在所有的 shell 会话中实现此功能，请将下面内容加入到文件 `~/.zshrc` 中。
+
+```zsh
+source <(kubectl completion zsh)
+```
+
+<!-- 
+If you have an alias for kubectl, you can extend shell completion to work with that alias:
+-->
+如果你为 kubectl 定义了别名，可以扩展脚本补全，以兼容该别名。
+
+```zsh
+echo 'alias k=kubectl' >>~/.zshrc
+echo 'complete -F __start_kubectl k' >>~/.zshrc
+```
+
+<!-- 
+After reloading your shell, kubectl autocompletion should be working.
+
+If you get an error like `complete:13: command not found: compdef`, then add the following to the beginning of your `~/.zshrc` file:
+-->
+重新加载 shell 后，kubectl 自动补全功能将立即生效。
+
+如果你收到 `complete:13: command not found: compdef` 这样的错误提示，那请将下面内容添加到 `~/.zshrc` 文件的开头：
+
+```zsh
+autoload -Uz compinit
+compinit
+```
@@ -0,0 +1,62 @@
+---
+title: "验证 kubectl 的安装效果"
+description: "如何验证 kubectl。"
+headless: true
+---
+<!-- 
+---
+title: "verify kubectl install"
+description: "How to verify kubectl."
+headless: true
+---
+ -->
+
+<!-- 
+In order for kubectl to find and access a Kubernetes cluster, it needs a
+[kubeconfig file](/docs/concepts/configuration/organize-cluster-access-kubeconfig/),
+which is created automatically when you create a cluster using
+[kube-up.sh](https://github.com/kubernetes/kubernetes/blob/master/cluster/kube-up.sh)
+or successfully deploy a Minikube cluster.
+By default, kubectl configuration is located at `~/.kube/config`.
+
+Check that kubectl is properly configured by getting the cluster state:
+ -->
+为了让 kubectl 能发现并访问 Kubernetes 集群，你需要一个
+[kubeconfig 文件](/docs/zh/concepts/configuration/organize-cluster-access-kubeconfig/)，
+该文件在
+[kube-up.sh](https://github.com/kubernetes/kubernetes/blob/master/cluster/kube-up.sh)
+创建集群时，或成功部署一个 Miniube 集群时，均会自动生成。
+通常，kubectl 的配置信息存放于文件 `~/.kube/config` 中。
+
+通过获取集群状态的方法，检查是否已恰当的配置了 kubectl：
+
+```shell
+kubectl cluster-info
+```
+
+<!-- 
+If you see a URL response, kubectl is correctly configured to access your cluster.
+
+If you see a message similar to the following, kubectl is not configured correctly or is not able to connect to a Kubernetes cluster.
+ -->
+如果返回一个 URL，则意味着 kubectl 成功的访问到了你的集群。
+
+如果你看到如下所示的消息，则代表 kubectl 配置出了问题，或无法连接到 Kubernetes 集群。
+
+```
+The connection to the server <server-name:port> was refused - did you specify the right host or port?
+（访问 <server-name:port> 被拒绝 - 你指定的主机和端口是否有误？）
+```
+
+<!-- 
+For example, if you are intending to run a Kubernetes cluster on your laptop (locally), you will need a tool like Minikube to be installed first and then re-run the commands stated above.
+
+If kubectl cluster-info returns the url response but you can't access your cluster, to check whether it is configured properly, use:
+ -->
+例如，如果你想在自己的笔记本上（本地）运行 Kubernetes 集群，你需要先安装一个 Minikube 这样的工具，然后再重新运行上面的命令。
+
+如果命令 `kubectl cluster-info` 返回了 url，但你还不能访问集群，那可以用以下命令来检查配置是否妥当：
+
+```shell
+kubectl cluster-info dump
+```
@@ -0,0 +1,262 @@
+---
+title: 在 Linux 系统中安装并设置 kubectl
+content_type: task
+weight: 10
+card:
+  name: tasks
+  weight: 20
+  title: 在 Linux 系统中安装 kubectl
+---
+<!-- 
+---
+reviewers:
+- mikedanese
+title: Install and Set Up kubectl on Linux
+content_type: task
+weight: 10
+card:
+  name: tasks
+  weight: 20
+  title: Install kubectl on Linux
+---
+-->
+
+## {{% heading "prerequisites" %}}
+
+<!-- 
+You must use a kubectl version that is within one minor version difference of your cluster.
+For example, a v1.2 client should work with v1.1, v1.2, and v1.3 master.
+Using the latest version of kubectl helps avoid unforeseen issues.
+-->
+kubectl 版本和集群版本之间的差异必须在一个小版本号内。
+例如：v1.2 版本的客户端只能与 v1.1、v1.2 和 v1.3 版本的集群一起工作。
+用最新版的 kubectl 有助于避免不可预见的问题。
+
+<!-- 
+## Install kubectl on Linux
+-->
+## 在 Linux 系统中安装 kubectl {#install-kubectl-on-linux}
+
+<!-- 
+The following methods exist for installing kubectl on Linux:
+-->
+在 Linux 系统中安装 kubectl 有如下几种方法：
+
+- [{{% heading "prerequisites" %}}](#{{% heading "prerequisites" %}})
+- [在 Linux 系统中安装 kubectl](#install-kubectl-on-linux)
+  - [用 curl 在 Linux 系统中安装 kubectl](#install-kubectl-binary-with-curl-on-linux)
+  - [用原生包管理工具安装](#install-using-native-package-management)
+  - [用其他包管理工具安装](#install-using-other-package-management)
+  - [作为谷歌云 SDK 的一部分，在 Linux 中安装](#install-on-linux-as-part-of-the-google-cloud-sdk)
+- [验证 kubectl 配置](#verify-kubectl-configration)
+- [可选的 kubectl 配置](#optional-kubectl-configurations)
+  - [启用 shell 自动补全功能](#enable-shell-autocompletion)
+- [{{% heading "whatsnext" %}}](#{{% heading "whatsnext" %}})
+
+<!-- 
+### Install kubectl binary with curl on Linux
+-->
+### 用 curl 在 Linux 系统中安装 kubectl {#install-kubectl-binary-with-curl-on-linux}
+
+<!-- 
+1. Download the latest release with the command:
+-->
+1. 用以下命令下载最新发行版：
+
+   ```bash
+   curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+   ```
+
+   {{< 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.
+
+For example, to download version {{< param "fullversion" >}} on Linux, type:
+-->
+如需下载某个指定的版本，请用指定版本号替换该命令的这一部分： `$(curl -L -s https://dl.k8s.io/release/stable.txt)`。
+
+例如，要在 Linux 中下载 {{< param "fullversion" >}} 版本，请输入：
+
+   ```bash
+   curl -LO https://dl.k8s.io/release/{{< param "fullversion" >}}/bin/linux/amd64/kubectl
+   ```
+   {{< /note >}}
+
+   <!-- 
+   1. Validate the binary (optional)
+
+      Download the kubectl checksum file:
+   -->
+1. 验证该可执行文件（可选步骤）
+
+   下载 kubectl 校验和文件：
+
+   ```bash
+   curl -LO "https://dl.k8s.io/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl.sha256"
+   ```
+
+   <!-- 
+   Validate the kubectl binary against the checksum file:
+   -->
+   基于校验和文件，验证 kubectl 的可执行文件：
+
+   ```bash
+   echo "$(<kubectl.sha256) kubectl" | sha256sum --check
+   ```
+
+   <!-- 
+   If valid, the output is:
+   -->
+   验证通过时，输出为：
+
+   ```console
+   kubectl: OK
+   ```
+
+   <!-- 
+   If the check fails, `sha256` exits with nonzero status and prints output similar to:
+   -->
+   验证失败时，`sha256` 将以非零值退出，并打印如下输出：
+
+   ```bash
+   kubectl: FAILED
+   sha256sum: WARNING: 1 computed checksum did NOT match
+   ```
+
+   {{< note >}}
+   <!-- 
+   Download the same version of the binary and checksum.
+   -->
+   下载的 kubectl 与校验和文件版本必须相同。
+   {{< /note >}}
+
+   <!-- 
+   1. Install kubectl
+   -->
+1. 安装 kubectl
+
+   ```bash
+   sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+   ```
+
+   {{< note >}}
+   <!-- 
+   If you do not have root access on the target system, you can still install kubectl to the `~/.local/bin` directory:
+   -->
+   即使你没有目标系统的 root 权限，仍然可以将 kubectl 安装到目录 `~/.local/bin` 中：
+
+   ```bash
+   mkdir -p ~/.local/bin/kubectl
+   mv ./kubectl ~/.local/bin/kubectl
+   # and then add ~/.local/bin/kubectl to $PATH
+   ```
+
+   {{< /note >}}
+
+   <!-- 
+   1. Test to ensure the version you installed is up-to-date:
+   -->
+1. 执行测试，以保障你安装的版本是最新的：
+
+   ```bash
+   kubectl version --client
+   ```
+
+<!-- 
+### Install using native package management
+-->
+### 用原生包管理工具安装 {#install-using-native-package-management}
+
+{{< tabs name="kubectl_install" >}}
+{{< tab name="Ubuntu、Debian 或 HypriotOS" codelang="bash" >}}
+sudo apt-get update && sudo apt-get install -y apt-transport-https gnupg2 curl
+curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
+echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list
+sudo apt-get update
+sudo apt-get install -y kubectl
+{{< /tab >}}
+
+{{< tab name="CentOS、RHEL 或 Fedora" codelang="bash" >}}cat <<EOF > /etc/yum.repos.d/kubernetes.repo
+[kubernetes]
+name=Kubernetes
+baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+EOF
+yum install -y kubectl
+{{< /tab >}}
+{{< /tabs >}}
+
+<!-- 
+### Install using other package management
+-->
+### 用其他包管理工具安装 {#install-using-other-package-management}
+
+{{< tabs name="other_kubectl_install" >}}
+{{% tab name="Snap" %}}
+<!-- 
+If you are on Ubuntu or another Linux distribution that support [snap](https://snapcraft.io/docs/core/install) package manager, kubectl is available as a [snap](https://snapcraft.io/) application.
+-->
+如果你使用的 Ubuntu 或其他 Linux 发行版，内建支持 [snap](https://snapcraft.io/docs/core/install) 包管理工具，
+则可用 [snap](https://snapcraft.io/) 命令安装 kubectl。
+
+```shell
+snap install kubectl --classic
+kubectl version --client
+```
+
+{{% /tab %}}
+
+{{% tab name="Homebrew" %}}
+<!-- 
+If you are on Linux and using [Homebrew](https://docs.brew.sh/Homebrew-on-Linux) package manager, kubectl is available for [installation](https://docs.brew.sh/Homebrew-on-Linux#install).
+-->
+如果你使用 Linux 系统，并且装了 [Homebrew](https://docs.brew.sh/Homebrew-on-Linux) 包管理工具，
+则可以使用这种方式[安装](https://docs.brew.sh/Homebrew-on-Linux#install) kubectl。
+
+```shell
+brew install kubectl
+kubectl version --client
+```
+
+{{% /tab %}}
+
+{{< /tabs >}}
+
+<!-- 
+### Install on Linux as part of the Google Cloud SDK
+-->
+### 作为谷歌云 SDK 的一部分，在 Linux 上安装 {#install-on-linux-as-part-of-the-google-cloud-sdk}
+
+{{< include "included/install-kubectl-gcloud.md" >}}
+
+<!-- 
+## Verify kubectl configuration
+-->
+## 验证 kubectl 配置 {#verify-kubectl-configration}
+
+{{< include "included/verify-kubectl.md" >}}
+
+## kubectl 的可选配置 {#optional-kubectl-configurations}
+
+### 启用 shell 自动补全功能 {#enable-shell-autocompletion}
+
+<!-- 
+kubectl provides autocompletion support for Bash and Zsh, which can save you a lot of typing.
+
+Below are the procedures to set up autocompletion for Bash and Zsh.
+-->
+kubectl 为 Bash 和 Zsh 提供自动补全功能，可以减轻许多输入的负担。
+
+下面是为 Bash 和 Zsh 设置自动补全功能的操作步骤。
+
+{{< tabs name="kubectl_autocompletion" >}}
+{{< tab name="Bash" include="included/optional-kubectl-configs-bash-linux.md" />}}
+{{< tab name="Zsh" include="included/optional-kubectl-configs-zsh.md" />}}
+{{< /tabs >}}
+
+## {{% heading "whatsnext" %}}
+
+{{< include "included/kubectl-whats-next.md" >}}
@@ -0,0 +1,263 @@
+---
+title: 在 macOS 系统上安装和设置 kubectl
+content_type: task
+weight: 10
+card:
+  name: tasks
+  weight: 20
+  title: 在 macOS 系统上安装 kubectl 
+---
+<!-- 
+---
+reviewers:
+- mikedanese
+title: Install and Set Up kubectl on macOS
+content_type: task
+weight: 10
+card:
+  name: tasks
+  weight: 20
+  title: Install kubectl on macOS
+---
+-->
+
+## {{% heading "prerequisites" %}}
+
+<!-- 
+You must use a kubectl version that is within one minor version difference of your cluster.
+For example, a v1.2 client should work with v1.1, v1.2, and v1.3 master.
+Using the latest version of kubectl helps avoid unforeseen issues.
+-->
+kubectl 版本和集群之间的差异必须在一个小版本号之内。
+例如：v1.2 版本的客户端只能与 v1.1、v1.2 和 v1.3 版本的集群一起工作。
+用最新版本的 kubectl 有助于避免不可预见的问题。
+
+<!-- 
+## Install kubectl on macOS
+-->
+## 在 macOS 系统上安装 kubectl {#install-kubectl-on-macos}
+
+<!-- 
+The following methods exist for installing kubectl on macOS:
+-->
+在 macOS 系统上安装 kubectl 有如下方法：
+
+- [{{% heading "prerequisites" %}}](#{{% heading "prerequisites" %}})
+- [在 macOS 系统上安装 kubectl](#install-kubectl-on-macos)
+  - [用 curl 在 macOS 系统上安装 kubectl](#install-kubectl-binary-with-curl-on-macos)
+  - [用 Homebrew 在 macOS 系统上安装](#install-with-homebrew-on-macos)
+  - [用 Macports 在 macOS 上安装](#install-with-macports-on-macos)
+  - [作为谷歌云 SDK 的一部分，在 macOS 上安装](#install-on-macos-as-part-of-the-google-cloud-sdk)
+- [验证 kubectl 配置](#verify-kubectl-configuration)
+- [可选的 kubectl 配置](#optional-kubectl-configurations)
+  - [启用 shell 自动补全功能](#enable-shell-autocompletion)
+- [{{% heading "whatsnext" %}}](#{{% heading "whatsnext" %}})
+
+<!-- 
+### Install kubectl binary with curl on macOS {#install-kubectl-binary-with-curl-on-macos}
+-->
+### 用 curl 在 macOS 系统上安装 kubectl {#install-kubectl-binary-with-curl-on-macos}
+
+<!-- 
+1. Download the latest release:
+-->
+1. 下载最新的发行版：
+
+   ```bash
+   curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl"
+   ```
+
+   {{< 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.
+
+   For example, to download version {{< param "fullversion" >}} on macOS, type:
+   -->
+   如果需要下载某个指定的版本，用该指定版本号替换掉命令的这个部分：`$(curl -L -s https://dl.k8s.io/release/stable.txt)`。
+   例如：要在 macOS 系统中下载 {{< param "fullversion" >}} 版本，则输入：
+
+   ```bash
+   curl -LO https://dl.k8s.io/release/{{< param "fullversion" >}}/bin/darwin/amd64/kubectl
+   ```
+
+   {{< /note >}}
+
+   <!-- 
+   1. Validate the binary (optional)
+
+   Download the kubectl checksum file:
+   -->
+1. 验证可执行文件（可选操作）
+
+   下载 kubectl 的校验和文件：
+
+   ```bash
+   curl -LO "https://dl.k8s.io/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl.sha256"
+   ```
+
+   <!-- 
+      Validate the kubectl binary against the checksum file:
+   -->
+   根据校验和文件，验证 kubectl：
+
+   ```bash
+   echo "$(<kubectl.sha256)  kubectl" | shasum -a 256 --check
+   ```
+   <!-- 
+   If valid, the output is:
+   -->
+   验证通过时，输出如下：
+
+   ```console
+   kubectl: OK
+   ```
+
+   <!-- 
+   If the check fails, `shasum` exits with nonzero status and prints output similar to:
+   -->
+   验证失败时，`shasum` 将以非零值退出，并打印如下输出：
+
+   ```
+   kubectl: FAILED
+   shasum: WARNING: 1 computed checksum did NOT match
+   ```
+
+   {{< note >}}
+   <!-- 
+   Download the same version of the binary and checksum.
+   -->
+   下载的 kubectl 与校验和文件版本要相同。
+   {{< /note >}}
+
+   <!-- 
+   1. Make the kubectl binary executable.
+   -->
+1. 将 kubectl 置为可执行文件：
+
+   ```bash
+   chmod +x ./kubectl
+   ```
+
+   <!-- 
+   1. Move the kubectl binary to a file location on your system `PATH`.
+   -->
+1. 将可执行文件 kubectl 移动到系统可寻址路径 `PATH` 内的一个位置：
+
+   ```bash
+   sudo mv ./kubectl /usr/local/bin/kubectl
+   sudo chown root: /usr/local/bin/kubectl
+   ```
+
+   <!-- 
+   1. Test to ensure the version you installed is up-to-date:
+   -->
+1. 测试一下，确保你安装的是最新的版本：
+
+   ```bash
+   kubectl version --client
+   ```
+
+<!-- 
+### Install with Homebrew on macOS {#install-with-homebrew-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.
+-->
+如果你是 macOS 系统，且用的是 [Homebrew](https://brew.sh/) 包管理工具，
+则可以用 Homebrew 安装 kubectl。
+
+<!-- 
+1. Run the installation command:
+-->
+1. 运行安装命令：
+
+   ```bash
+   brew install kubectl 
+   ```
+
+   或
+
+   ```bash
+   brew install kubernetes-cli
+   ```
+
+   <!-- 
+   1. Test to ensure the version you installed is up-to-date:
+   -->
+1. 测试一下，确保你安装的是最新的版本：
+
+   ```bash
+   kubectl version --client
+   ```
+
+<!-- 
+### Install with Macports on macOS {#install-with-macports-on-macos}
+-->
+### 用 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.
+-->
+如果你用的是 macOS，且用 [Macports](https://macports.org/) 包管理工具，则你可以用 Macports 安装kubectl。
+
+<!-- 
+1. Run the installation command:
+-->
+1. 运行安装命令：
+
+   ```bash
+   sudo port selfupdate
+   sudo port install kubectl
+   ```
+
+   <!-- 
+   1. Test to ensure the version you installed is up-to-date:
+   -->
+1. 测试一下，确保你安装的是最新的版本：
+
+   ```bash
+   kubectl version --client
+   ```
+
+<!-- 
+### Install on macOS as part of the Google Cloud SDK {#install-on-macos-as-part-of-the-google-cloud-sdk}
+-->
+### 作为谷歌云 SDK 的一部分，在 macOS 上安装 {#install-on-macos-as-part-of-the-google-cloud-sdk}
+
+{{< include "included/install-kubectl-gcloud.md" >}}
+
+<!-- 
+## Verify kubectl configuration {#verify-kubectl-configuration}
+-->
+## 验证 kubectl 配置 {#verify-kubectl-configuration}
+
+{{< include "included/verify-kubectl.md" >}}
+
+<!-- 
+## Optional kubectl configurations {#optional-kubectl-configurations}
+
+### Enable shell autocompletion {#enable-shell-autocompletion}
+-->
+## 可选的 kubectl 配置 {#optional-kubectl-configurations}
+
+### 启用 shell 自动补全功能 {#enable-shell-autocompletion}
+
+<!-- 
+kubectl provides autocompletion support for Bash and Zsh, which can save you a lot of typing.
+
+Below are the procedures to set up autocompletion for Bash and Zsh.
+-->
+kubectl 为 Bash 和 Zsh 提供自动补全功能，这可以节省许多输入的麻烦。
+
+下面是为 Bash 和 Zsh 设置自动补全功能的操作步骤。
+
+{{< tabs name="kubectl_autocompletion" >}}
+{{< tab name="Bash" include="included/optional-kubectl-configs-bash-mac.md" />}}
+{{< tab name="Zsh" include="included/optional-kubectl-configs-zsh.md" />}}
+{{< /tabs >}}
+
+## {{% heading "whatsnext" %}}
+
+{{< include "included/kubectl-whats-next.md" >}}