Merge pull request #46842 from asa3311/sync-zh-126

[zh] sync assign-pod-node pod-overhead kubeadm-upgrade
kubernetes · Jun 17, 2024 · e1669dd · e1669dd
2 parents 3358247 + ee89049
commit e1669dd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/content/zh-cn/docs/concepts/scheduling-eviction/assign-pod-node.md b/content/zh-cn/docs/concepts/scheduling-eviction/assign-pod-node.md
@@ -1113,13 +1113,13 @@ The following operators can only be used with `nodeAffinity`.
 <!--
 |    Operator    |    Behaviour    |
 | :------------: | :-------------: |
-| `Gt` | The field value will be parsed as an integer, and that integer is less than or equal to the integer that results from parsing the value of a label named by this selector |
-| `Lt` | The field value will be parsed as an integer, and that integer is greater than or equal to the integer that results from parsing the value of a label named by this selector |
+| `Gt` | The field value will be parsed as an integer, and that integer is less than the integer that results from parsing the value of a label named by this selector |
+| `Lt` | The field value will be parsed as an integer, and that integer is greater than the integer that results from parsing the value of a label named by this selector |
 -->
 | 操作符 | 行为 |
 | :------------: | :-------------: |
-| `Gt` | 字段值将被解析为整数，并且该整数小于或等于通过解析此选择算符命名的标签的值所得到的整数  | 
-| `Lt` | 字段值将被解析为整数，并且该整数大于或等于通过解析此选择算符命名的标签的值所得到的整数 | 
+| `Gt` | 字段值将被解析为整数，并且该整数小于通过解析此选择算符命名的标签的值所得到的整数  | 
+| `Lt` | 字段值将被解析为整数，并且该整数大于通过解析此选择算符命名的标签的值所得到的整数 | 
 
 {{<note>}}
 <!--

diff --git a/content/zh-cn/docs/concepts/scheduling-eviction/pod-overhead.md b/content/zh-cn/docs/concepts/scheduling-eviction/pod-overhead.md
@@ -142,6 +142,13 @@ spec:
         memory: 100Mi
 ```
 
+{{< note >}}
+<!--
+If only `limits` are specified in the pod definition, kubelet will deduce `requests` from those limits and set them to be the same as the defined `limits`.
+-->
+如果在 Pod 定义中只设置了 `limits`，kubelet 将根据 limits 推断 `requests`，并将其设置与 limits 相同的值。
+{{< /note >}}
+
 <!--
 At admission time the RuntimeClass [admission controller](/docs/reference/access-authn-authz/admission-controllers/)
 updates the workload's PodSpec to include the `overhead` as described in the RuntimeClass. If the PodSpec already has this field defined,

diff --git a/content/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md
@@ -606,6 +606,14 @@ and post-upgrade manifest file for a certain component, a backup file for it wil
 `/etc/kubernetes/manifests` 目录实现手工恢复。
 如果由于某些原因，在升级前后某个组件的清单未发生变化，则 kubeadm 也不会为之生成备份版本。
 
+{{< note >}}
+<!--
+After the cluster upgrade using kubeadm, the backup directory `/etc/kubernetes/tmp` will remain and
+these backup files will need to be cleared manually.
+-->
+集群通过 kubeadm 升级后，备份目录 `/etc/kubernetes/tmp` 将保留，这些备份文件需要手动清理。
+{{</ note >}}
+
 <!--
 ## How it works
 -->