Skip to content

Commit e27d886

Browse files
authored
Merge pull request #43527 from asa3311/sync-zh-72
[zh] sync ephemeral-volumes volumes windows-storage
2 parents 14fe28f + a46f569 commit e27d886

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

content/zh-cn/docs/concepts/storage/ephemeral-volumes.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ different purposes:
7373
[secret](/docs/concepts/storage/volumes/#secret): inject different
7474
kinds of Kubernetes data into a Pod
7575
- [CSI ephemeral volumes](#csi-ephemeral-volumes):
76-
similar to the previous volume kinds, but provided by special
77-
[CSI drivers](https://github.com/container-storage-interface/spec/blob/master/spec.md)
76+
similar to the previous volume kinds, but provided by special {{< glossary_tooltip text="CSI" term_id="csi" >}} drivers
7877
which specifically [support this feature](https://kubernetes-csi.github.io/docs/ephemeral-local-volumes.html)
7978
- [generic ephemeral volumes](#generic-ephemeral-volumes), which
8079
can be provided by all storage drivers that also support persistent volumes
@@ -86,10 +85,9 @@ Kubernetes 为了不同的用途,支持几种不同类型的临时卷:
8685
[downwardAPI](/zh-cn/docs/concepts/storage/volumes/#downwardapi)
8786
[secret](/zh-cn/docs/concepts/storage/volumes/#secret)
8887
将不同类型的 Kubernetes 数据注入到 Pod 中
89-
- [CSI 临时卷](/zh-cn/docs/concepts/storage/volumes/#csi-ephemeral-volumes)
88+
- [CSI 临时卷](#csi-ephemeral-volumes)
9089
类似于前面的卷类型,但由专门[支持此特性](https://kubernetes-csi.github.io/docs/ephemeral-local-volumes.html)
91-
的指定
92-
[CSI 驱动程序](https://github.com/container-storage-interface/spec/blob/master/spec.md)提供
90+
的指定 {{< glossary_tooltip text="CSI" term_id="csi" >}} 驱动程序提供
9391
- [通用临时卷](#generic-ephemeral-volumes)
9492
它可以由所有支持持久卷的存储驱动程序提供
9593

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,16 +431,15 @@ The `emptyDir.medium` field controls where `emptyDir` volumes are stored. By
431431
default `emptyDir` volumes are stored on whatever medium that backs the node
432432
such as disk, SSD, or network storage, depending on your environment. If you set
433433
the `emptyDir.medium` field to `"Memory"`, Kubernetes mounts a tmpfs (RAM-backed
434-
filesystem) for you instead. While tmpfs is very fast, be aware that unlike
435-
disks, tmpfs is cleared on node reboot and any files you write count against
436-
your container's memory limit.
434+
filesystem) for you instead. While tmpfs is very fast be aware that, unlike
435+
disks, files you write count against the memory limit of the container that wrote them.
437436
-->
438437
`emptyDir.medium` 字段用来控制 `emptyDir` 卷的存储位置。
439438
默认情况下,`emptyDir` 卷存储在该节点所使用的介质上;
440439
此处的介质可以是磁盘、SSD 或网络存储,这取决于你的环境。
441440
你可以将 `emptyDir.medium` 字段设置为 `"Memory"`,
442441
以告诉 Kubernetes 为你挂载 tmpfs(基于 RAM 的文件系统)。
443-
虽然 tmpfs 速度非常快,但是要注意它与磁盘不同:tmpfs 在节点重启时会被清除
442+
虽然 tmpfs 速度非常快,但是要注意它与磁盘不同,
444443
并且你所写入的所有文件都会计入容器的内存消耗,受容器内存限制约束。
445444

446445
<!--

content/zh-cn/docs/concepts/storage/windows-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ As a result, the following storage functionality is not supported on Windows nod
6262
* Block device mapping
6363
* Memory as the storage medium (for example, `emptyDir.medium` set to `Memory`)
6464
* File system features like uid/gid; per-user Linux filesystem permissions
65-
* Setting [secret permissions with DefaultMode](/docs/concepts/configuration/secret/#secret-files-permissions) (due to UID/GID dependency)
65+
* Setting [secret permissions with DefaultMode](/docs/tasks/inject-data-application/distribute-credentials-secure/#set-posix-permissions-for-secret-keys) (due to UID/GID dependency)
6666
* NFS based storage/volume support
6767
* Expanding the mounted volume (resizefs)
6868
-->
@@ -73,7 +73,7 @@ As a result, the following storage functionality is not supported on Windows nod
7373
* 块设备映射
7474
* 内存作为存储介质(例如 `emptyDir.medium` 设置为 `Memory`
7575
* 类似 UID/GID、各用户不同的 Linux 文件系统访问许可等文件系统特性
76-
* 使用 [DefaultMode 设置 Secret 权限](/zh-cn/docs/concepts/configuration/secret/#secret-files-permissions)
76+
* 使用 [DefaultMode 设置 Secret 权限](/zh-cn/docs/tasks/inject-data-application/distribute-credentials-secure/#set-posix-permissions-for-secret-keys)
7777
(因为该特性依赖 UID/GID)
7878
* 基于 NFS 的存储和卷支持
7979
* 扩展已挂载卷(resizefs)

0 commit comments

Comments
 (0)