Skip to content

Commit e46ea44

Browse files
authored
Merge pull request #41920 from asa3311/sync-zh-25
[zh-cn] sync ephemeral-volumes storage-classes connect-applications-service
2 parents 340c5e8 + f81e564 commit e46ea44

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ different purposes:
7575
- [CSI ephemeral volumes](#csi-ephemeral-volumes):
7676
similar to the previous volume kinds, but provided by special
7777
[CSI drivers](https://github.com/container-storage-interface/spec/blob/master/spec.md)
78-
which specifically [support this feature](https://kubernetes-csi.github.io/docs/drivers.html)
78+
which specifically [support this feature](https://kubernetes-csi.github.io/docs/ephemeral-local-volumes.html)
7979
- [generic ephemeral volumes](#generic-ephemeral-volumes), which
8080
can be provided by all storage drivers that also support persistent volumes
8181
-->
@@ -87,7 +87,7 @@ Kubernetes 为了不同的用途,支持几种不同类型的临时卷:
8787
[secret](/zh-cn/docs/concepts/storage/volumes/#secret)
8888
将不同类型的 Kubernetes 数据注入到 Pod 中
8989
- [CSI 临时卷](/zh-cn/docs/concepts/storage/volumes/#csi-ephemeral-volumes)
90-
类似于前面的卷类型,但由专门[支持此特性](https://kubernetes-csi.github.io/docs/drivers.html)
90+
类似于前面的卷类型,但由专门[支持此特性](https://kubernetes-csi.github.io/docs/ephemeral-local-volumes.html)
9191
的指定
9292
[CSI 驱动程序](https://github.com/container-storage-interface/spec/blob/master/spec.md)提供
9393
- [通用临时卷](#generic-ephemeral-volumes)

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,28 @@ mountOptions:
8888
volumeBindingMode: Immediate
8989
```
9090
91+
<!--
92+
### Default StorageClass
93+
94+
When a PVC does not specify a `storageClassName`, the default StorageClass is
95+
used. The cluster can only have one default StorageClass. If more than one
96+
default StorageClass is accidentally set, the newest default is used when the
97+
PVC is dynamically provisioned.
98+
99+
For instructions on setting the default StorageClass, see
100+
[Change the default StorageClass](/docs/tasks/administer-cluster/change-default-storage-class/).
101+
Note that certain cloud providers may already define a default StorageClass.
102+
-->
103+
### 默认 StorageClass {#default-storageclass}
104+
105+
当一个 PVC 没有指定 `storageClassName` 时,会使用默认的 StorageClass。
106+
集群中只能有一个默认的 StorageClass。如果不小心设置了多个默认的 StorageClass,
107+
当 PVC 动态配置时,将使用最新设置的默认 StorageClass。
108+
109+
关于如何设置默认的 StorageClass,
110+
请参见[更改默认 StorageClass](/zh-cn/docs/tasks/administer-cluster/change-default-storage-class/)。
111+
请注意,某些云服务提供商可能已经定义了一个默认的 StorageClass。
112+
91113
<!--
92114
### Provisioner
93115

content/zh-cn/docs/tutorials/services/connect-applications-service.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ my-nginx-7vzhx IPv4 80 10.244.2.5,10.244.3.4 21s
229229
You should now be able to curl the nginx Service on `<CLUSTER-IP>:<PORT>` from
230230
any node in your cluster. Note that the Service IP is completely virtual, it
231231
never hits the wire. If you're curious about how this works you can read more
232-
about the [service proxy](/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies).
232+
about the [service proxy](/docs/reference/networking/virtual-ips/).
233233
-->
234234
现在,你应该能够从集群中任意节点上使用 curl 命令向 `<CLUSTER-IP>:<PORT>` 发送请求以访问 Nginx Service。
235235
注意 Service IP 完全是虚拟的,它从来没有走过网络,如果对它如何工作的原理感到好奇,
236-
可以进一步阅读[服务代理](/zh-cn/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies)的内容。
236+
可以进一步阅读[服务代理](/zh-cn/docs/reference/networking/virtual-ips/)的内容。
237237
238238
<!--
239239
## Accessing the Service
@@ -360,7 +360,7 @@ IP 分配名称的 DNS 服务器。 这里我们使用 CoreDNS 集群插件(
360360
让我们运行另一个 curl 应用来进行测试:
361361
362362
```shell
363-
kubectl run curl --image=radial/busyboxplus:curl -i --tty
363+
kubectl run curl --image=radial/busyboxplus:curl -i --tty --rm
364364
```
365365
```
366366
Waiting for pod default/curl-131556218-9fnch to be running, status is Pending, pod ready: false

0 commit comments

Comments
 (0)