Skip to content

Commit 9c0d453

Browse files
authored
Merge pull request #26220 from ydFu/update-storage
[zh] Sync concepts pages for config and storage
2 parents e5146e8 + f26b332 commit 9c0d453

File tree

5 files changed

+39
-9
lines changed

5 files changed

+39
-9
lines changed

content/zh/docs/concepts/configuration/overview.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,15 @@ A desired state of an object is described by a Deployment, and if changes to tha
183183
Deployment 描述了对象的期望状态,并且如果对该规范的更改被成功应用,
184184
则 Deployment 控制器以受控速率将实际状态改变为期望状态。
185185

186+
<!--
187+
- Use the [Kubernetes common labels](/docs/concepts/overview/working-with-objects/common-labels/) for common use cases. These standardized labels enrich the metadata in a way that allows tools, including `kubectl` and [dashboard](/docs/tasks/access-application-cluster/web-ui-dashboard), to work in an interoperable way.
188+
-->
189+
190+
- 对于常见场景,应使用 [Kubernetes 通用标签](/zh/docs/concepts/overview/working-with-objects/common-labels/)
191+
这些标准化的标签丰富了对象的元数据,使得包括 `kubectl`
192+
[仪表板(Dashboard)](/zh/docs/tasks/access-application-cluster/web-ui-dashboard)
193+
这些工具能够以可互操作的方式工作。
194+
186195
<!--
187196
- You can manipulate labels for debugging. Because Kubernetes controllers (such as ReplicaSet) and Services match to Pods using selector labels, removing the relevant labels from a Pod will stop it from being considered by a controller or from being served traffic by a Service. If you remove the labels of an existing Pod, its controller will create a new Pod to take its place. This is a useful way to debug a previously "live" Pod in a "quarantine" environment. To interactively remove or add labels, use [`kubectl label`](/docs/reference/generated/kubectl/kubectl-commands#label).
188197
-->

content/zh/docs/concepts/scheduling-eviction/assign-pod-node.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ as at least one already-running pod that has a label with key "security" and val
500500
on node N if node N has a label with key `topology.kubernetes.io/zone` and some value V
501501
such that there is at least one node in the cluster with key `topology.kubernetes.io/zone` and
502502
value V that is running a pod that has a label with key "security" and value "S1".) The pod anti-affinity
503-
rule says that the pod prefers not to be scheduled onto a node if that node is already running a pod with label
504-
having key "security" and value "S2". (If the `topologyKey` were `topology.kubernetes.io/zone` then
503+
rule says that the pod should not be scheduled onto a node if that node is in the same zone as a pod with
504+
label having key "security" and value "S2". (If the `topologyKey` were `topology.kubernetes.io/zone` then
505505
it would mean that the pod cannot be scheduled onto a node if that node is in the same zone as a pod with
506506
label having key "security" and value "S2".) See the
507507
[design doc](https://git.k8s.io/community/contributors/design-proposals/scheduling/podaffinity.md)
@@ -517,8 +517,8 @@ Pod 亲和性规则表示,仅当节点和至少一个已运行且有键为“s
517517
则 Pod 有资格在节点 N 上运行,以便集群中至少有一个节点具有键
518518
`topology.kubernetes.io/zone` 和值为 V 的节点正在运行具有键“security”和值
519519
“S1”的标签的 pod。)
520-
Pod 反亲和性规则表示,如果节点已经运行了一个具有键“security”和值“S2”的标签的 Pod
521-
则该 pod 不希望将其调度到该节点上
520+
Pod 反亲和性规则表示,如果节点处于 Pod 所在的同一可用区且具有键“security”和值“S2”的标签
521+
则该 pod 不应将其调度到该节点上
522522
(如果 `topologyKey` 为 `topology.kubernetes.io/zone`,则意味着当节点和具有键
523523
“security”和值“S2”的标签的 Pod 处于相同的区域,Pod 不能被调度到该节点上。)
524524
查阅[设计文档](https://git.k8s.io/community/contributors/design-proposals/scheduling/podaffinity.md)

content/zh/docs/concepts/scheduling-eviction/pod-overhead.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ time according to the overhead associated with the Pod's
3838

3939
<!--
4040
When Pod Overhead is enabled, the overhead is considered in addition to the sum of container
41-
resource requests when scheduling a Pod. Similarly, Kubelet will include the Pod overhead when sizing
41+
resource requests when scheduling a Pod. Similarly,the kubelet will include the Pod overhead when sizing
4242
the Pod cgroup, and when carrying out Pod eviction ranking.
4343
-->
44-
当启用 Pod 开销时,在调度 Pod 时,除了考虑容器资源请求的总和外,还要考虑 Pod 开销。类似地,Kubelet 将在确定 Pod cgroup 的大小和执行 Pod 驱逐排序时包含 Pod 开销。
44+
45+
如果启用了 Pod Overhead,在调度 Pod 时,除了考虑容器资源请求的总和外,还要考虑 Pod 开销。
46+
类似地,kubelet 将在确定 Pod cgroups 的大小和执行 Pod 驱逐排序时也会考虑 Pod 开销。
4547

4648
<!--
4749
## Enabling Pod Overhead {#set-up}
@@ -301,6 +303,11 @@ from source in the meantime.
301303

302304
## {{% heading "whatsnext" %}}
303305

306+
<!--
307+
* [RuntimeClass](/docs/concepts/containers/runtime-class/)
308+
* [PodOverhead Design](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/688-pod-overhead)
309+
-->
310+
304311
* [RuntimeClass](/zh/docs/concepts/containers/runtime-class/)
305-
* [PodOverhead 设计](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/20190226-pod-overhead.md)
312+
* [PodOverhead 设计](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/688-pod-overhead)
306313

content/zh/docs/concepts/storage/volume-snapshot-classes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ used for provisioning VolumeSnapshots. This field must be specified.
9595
<!--
9696
### DeletionPolicy
9797
98-
Volume snapshot classes have a deletionPolicy. It enables you to configure what happens to a VolumeSnapshotContent when the VolumeSnapshot object it is bound to is to be deleted. The deletionPolicy of a volume snapshot can either be `Retain` or `Delete`. This field must be specified.
98+
Volume snapshot classes have a deletionPolicy. It enables you to configure what happens to a VolumeSnapshotContent when the VolumeSnapshot object it is bound to is to be deleted. The deletionPolicy of a volume snapshot class can either be `Retain` or `Delete`. This field must be specified.
9999

100100
If the deletionPolicy is `Delete`, then the underlying storage snapshot will be deleted along with the VolumeSnapshotContent object. If the deletionPolicy is `Retain`, then both the underlying snapshot and VolumeSnapshotContent remain.
101101
-->
102102
### 删除策略 {#deletion-policy}
103103

104104
卷快照类具有 `deletionPolicy` 属性。用户可以配置当所绑定的 VolumeSnapshot
105105
对象将被删除时,如何处理 VolumeSnapshotContent 对象。
106-
卷快照的这个策略可以是 `Retain` 或者 `Delete`。这个策略字段必须指定。
106+
卷快照类的这个策略可以是 `Retain` 或者 `Delete`。这个策略字段必须指定。
107107

108108
如果删除策略是 `Delete`,那么底层的存储快照会和 VolumeSnapshotContent 对象
109109
一起删除。如果删除策略是 `Retain`,那么底层快照和 VolumeSnapshotContent

content/zh/docs/concepts/storage/volumes.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,20 @@ memory limit.
509509
虽然 tmpfs 速度非常快,但是要注意它与磁盘不同。
510510
tmpfs 在节点重启时会被清除,并且你所写入的所有文件都会计入容器的内存消耗,受容器内存限制约束。
511511

512+
<!--
513+
{{< note >}}
514+
If the `SizeMemoryBackedVolumes` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) is enabled,
515+
you can specify a size for memory backed volumes. If no size is specified, memory
516+
backed volumes are sized to 50% of the memory on a Linux host.
517+
{{< /note>}}
518+
-->
519+
520+
{{< note >}}
521+
当启用 `SizeMemoryBackedVolumes` [特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)时,
522+
你可以为基于内存提供的卷指定大小。
523+
如果未指定大小,则基于内存的卷的大小为 Linux 主机上内存的 50%。
524+
{{< /note>}}
525+
512526
<!--
513527
#### emptyDir configuration example
514528
-->

0 commit comments

Comments
 (0)