diff --git a/content/zh/docs/concepts/configuration/overview.md b/content/zh/docs/concepts/configuration/overview.md index 6c75e90bd1..7f6cf8826a 100644 --- a/content/zh/docs/concepts/configuration/overview.md +++ b/content/zh/docs/concepts/configuration/overview.md @@ -183,6 +183,15 @@ A desired state of an object is described by a Deployment, and if changes to tha Deployment 描述了对象的期望状态,并且如果对该规范的更改被成功应用, 则 Deployment 控制器以受控速率将实际状态改变为期望状态。 + + +- 对于常见场景,应使用 [Kubernetes 通用标签](/zh/docs/concepts/overview/working-with-objects/common-labels/)。 + 这些标准化的标签丰富了对象的元数据,使得包括 `kubectl` 和 + [仪表板(Dashboard)](/zh/docs/tasks/access-application-cluster/web-ui-dashboard) + 这些工具能够以可互操作的方式工作。 + diff --git a/content/zh/docs/concepts/scheduling-eviction/assign-pod-node.md b/content/zh/docs/concepts/scheduling-eviction/assign-pod-node.md index 807e674e20..5bc4152f35 100644 --- a/content/zh/docs/concepts/scheduling-eviction/assign-pod-node.md +++ b/content/zh/docs/concepts/scheduling-eviction/assign-pod-node.md @@ -500,8 +500,8 @@ as at least one already-running pod that has a label with key "security" and val on node N if node N has a label with key `topology.kubernetes.io/zone` and some value V such that there is at least one node in the cluster with key `topology.kubernetes.io/zone` and value V that is running a pod that has a label with key "security" and value "S1".) The pod anti-affinity -rule says that the pod prefers not to be scheduled onto a node if that node is already running a pod with label -having key "security" and value "S2". (If the `topologyKey` were `topology.kubernetes.io/zone` then +rule says that the pod should not be scheduled onto a node if that node is in the same zone as a pod with +label having key "security" and value "S2". (If the `topologyKey` were `topology.kubernetes.io/zone` then it would mean that the pod cannot be scheduled onto a node if that node is in the same zone as a pod with label having key "security" and value "S2".) See the [design doc](https://git.k8s.io/community/contributors/design-proposals/scheduling/podaffinity.md) @@ -517,8 +517,8 @@ Pod 亲和性规则表示,仅当节点和至少一个已运行且有键为“s 则 Pod 有资格在节点 N 上运行,以便集群中至少有一个节点具有键 `topology.kubernetes.io/zone` 和值为 V 的节点正在运行具有键“security”和值 “S1”的标签的 pod。) -Pod 反亲和性规则表示,如果节点已经运行了一个具有键“security”和值“S2”的标签的 Pod, -则该 pod 不希望将其调度到该节点上。 +Pod 反亲和性规则表示,如果节点处于 Pod 所在的同一可用区且具有键“security”和值“S2”的标签, +则该 pod 不应将其调度到该节点上。 (如果 `topologyKey` 为 `topology.kubernetes.io/zone`,则意味着当节点和具有键 “security”和值“S2”的标签的 Pod 处于相同的区域,Pod 不能被调度到该节点上。) 查阅[设计文档](https://git.k8s.io/community/contributors/design-proposals/scheduling/podaffinity.md) diff --git a/content/zh/docs/concepts/scheduling-eviction/pod-overhead.md b/content/zh/docs/concepts/scheduling-eviction/pod-overhead.md index 825e59d9dd..40684ff11c 100644 --- a/content/zh/docs/concepts/scheduling-eviction/pod-overhead.md +++ b/content/zh/docs/concepts/scheduling-eviction/pod-overhead.md @@ -38,10 +38,12 @@ time according to the overhead associated with the Pod's -当启用 Pod 开销时,在调度 Pod 时,除了考虑容器资源请求的总和外,还要考虑 Pod 开销。类似地,Kubelet 将在确定 Pod cgroup 的大小和执行 Pod 驱逐排序时包含 Pod 开销。 + +如果启用了 Pod Overhead,在调度 Pod 时,除了考虑容器资源请求的总和外,还要考虑 Pod 开销。 +类似地,kubelet 将在确定 Pod cgroups 的大小和执行 Pod 驱逐排序时也会考虑 Pod 开销。 + +* [RuntimeClass](/zh/docs/concepts/containers/runtime-class/) +* [PodOverhead 设计](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/688-pod-overhead) diff --git a/content/zh/docs/concepts/storage/volume-snapshot-classes.md b/content/zh/docs/concepts/storage/volume-snapshot-classes.md index 8ec0473a08..24a9356149 100644 --- a/content/zh/docs/concepts/storage/volume-snapshot-classes.md +++ b/content/zh/docs/concepts/storage/volume-snapshot-classes.md @@ -95,7 +95,7 @@ used for provisioning VolumeSnapshots. This field must be specified. @@ -103,7 +103,7 @@ If the deletionPolicy is `Delete`, then the underlying storage snapshot will be 卷快照类具有 `deletionPolicy` 属性。用户可以配置当所绑定的 VolumeSnapshot 对象将被删除时,如何处理 VolumeSnapshotContent 对象。 -卷快照的这个策略可以是 `Retain` 或者 `Delete`。这个策略字段必须指定。 +卷快照类的这个策略可以是 `Retain` 或者 `Delete`。这个策略字段必须指定。 如果删除策略是 `Delete`,那么底层的存储快照会和 VolumeSnapshotContent 对象 一起删除。如果删除策略是 `Retain`,那么底层快照和 VolumeSnapshotContent diff --git a/content/zh/docs/concepts/storage/volumes.md b/content/zh/docs/concepts/storage/volumes.md index 71139871bc..4c49adb4b2 100644 --- a/content/zh/docs/concepts/storage/volumes.md +++ b/content/zh/docs/concepts/storage/volumes.md @@ -509,6 +509,20 @@ memory limit. 虽然 tmpfs 速度非常快,但是要注意它与磁盘不同。 tmpfs 在节点重启时会被清除,并且你所写入的所有文件都会计入容器的内存消耗,受容器内存限制约束。 + + +{{< note >}} +当启用 `SizeMemoryBackedVolumes` [特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)时, +你可以为基于内存提供的卷指定大小。 +如果未指定大小,则基于内存的卷的大小为 Linux 主机上内存的 50%。 +{{< /note>}} +