Merge pull request #41832 from asa3311/sync-zh-21

[zh-cn] sync taint-and-toleration images

Author: k8s-ci-robot

content/zh-cn/docs/concepts/containers/images.md

@@ -162,11 +162,11 @@ You should avoid using the `:latest` tag when deploying containers in production
 it is harder to track which version of the image is running and more difficult to
 roll back properly.
 
-Instead, specify a meaningful tag such as `v1.42.0`.
+Instead, specify a meaningful tag such as `v1.42.0` and/or a digest.
 -->
 在生产环境中部署容器时，你应该避免使用 `:latest` 标签，因为这使得正在运行的镜像的版本难以追踪，并且难以正确地回滚。
 
-相反，应指定一个有意义的标签，如 `v1.42.0`。
+相反，应指定一个有意义的标签，如 `v1.42.0`，和/或者一个摘要。
 {{< /note >}}
 
 <!--
@@ -204,11 +204,17 @@ running the same code no matter what tag changes happen at the registry.
 
 When you (or a controller) submit a new Pod to the API server, your cluster sets the
 `imagePullPolicy` field when specific conditions are met:
+
+- if you omit the `imagePullPolicy` field, and you specify the digest for the
+  container image, the `imagePullPolicy` is automatically set to `IfNotPresent`.
 -->
 #### 默认镜像拉取策略    {#imagepullpolicy-defaulting}
 
 当你（或控制器）向 API 服务器提交一个新的 Pod 时，你的集群会在满足特定条件时设置 `imagePullPolicy` 字段：
 
+- 如果你省略了 `imagePullPolicy` 字段，并且你为容器镜像指定了摘要，
+  那么 `imagePullPolicy` 会自动设置为 `IfNotPresent`。
+
 <!--
 - if you omit the `imagePullPolicy` field, and the tag for the container image is
   `:latest`, `imagePullPolicy` is automatically set to `Always`;
@@ -228,14 +234,15 @@ When you (or a controller) submit a new Pod to the API server, your cluster sets
 {{< note >}}
 <!--
 The value of `imagePullPolicy` of the container is always set when the object is
-first _created_, and is not updated if the image's tag later changes.
+first _created_, and is not updated if the image's tag or digest later changes.
 
 For example, if you create a Deployment with an image whose tag is _not_
 `:latest`, and later update that Deployment's image to a `:latest` tag, the
 `imagePullPolicy` field will _not_ change to `Always`. You must manually change
 the pull policy of any object after its initial creation.
 -->
-容器的 `imagePullPolicy` 的值总是在对象初次 _创建_ 时设置的，如果后来镜像的标签发生变化，则不会更新。
+容器的 `imagePullPolicy` 的值总是在对象初次 _创建_ 时设置的，
+如果后来镜像的标签或摘要发生变化，则不会更新。
 
 例如，如果你用一个 **非** `:latest` 的镜像标签创建一个 Deployment，
 并在随后更新该 Deployment 的镜像标签为 `:latest`，则 `imagePullPolicy` 字段 **不会** 变成 `Always`。

content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md

@@ -388,11 +388,11 @@ are true. The following taints are built in:
   的一个控制器初始化这个节点后，kubelet 将删除这个污点。
 
 <!--
-In case a node is to be evicted, the node controller or the kubelet adds relevant taints
+In case a node is to be drained, the node controller or the kubelet adds relevant taints
 with `NoExecute` effect. If the fault condition returns to normal the kubelet or node
 controller can remove the relevant taint(s).
 -->
-在节点被驱逐时，节点控制器或者 kubelet 会添加带有 `NoExecute` 效果的相关污点。
+在节点被排空时，节点控制器或者 kubelet 会添加带有 `NoExecute` 效果的相关污点。
 如果异常状态恢复正常，kubelet 或节点控制器能够移除相关的污点。
 
 <!--
@@ -407,7 +407,7 @@ the pods that are scheduled for deletion may continue to run on the partitioned
 
 {{< note >}}
 <!--
-The control plane limits the rate of adding node new taints to nodes. This rate limiting
+The control plane limits the rate of adding new taints to nodes. This rate limiting
 manages the number of evictions that are triggered when many nodes become unreachable at
 once (for example: if there is a network disruption).
 -->