Skip to content

Commit 1cc98df

Browse files
committed
[zh-cn] sync persistent-volumes configure-liveness-readiness-startup-probes patch-releases
Signed-off-by: xin.li <[email protected]>
1 parent efe2fc9 commit 1cc98df

File tree

3 files changed

+58
-63
lines changed

3 files changed

+58
-63
lines changed

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

Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -338,15 +338,15 @@ An administrator can manually reclaim the volume with the following steps.
338338

339339
<!--
340340
1. Delete the PersistentVolume. The associated storage asset in external infrastructure
341-
(such as an AWS EBS or GCE PD volume) still exists after the PV is deleted.
341+
still exists after the PV is deleted.
342342
1. Manually clean up the data on the associated storage asset accordingly.
343343
1. Manually delete the associated storage asset.
344344
345345
If you want to reuse the same storage asset, create a new PersistentVolume with
346346
the same storage asset definition.
347347
-->
348-
1. 删除 PersistentVolume 对象。与之相关的、位于外部基础设施中的存储资产
349-
(例如 AWS EBS 或 GCE PD 卷)在 PV 删除之后仍然存在。
348+
1. 删除 PersistentVolume 对象。与之相关的、位于外部基础设施中的存储资产在
349+
PV 删除之后仍然存在。
350350
1. 根据情况,手动清除所关联的存储资产上的数据。
351351
1. 手动删除所关联的存储资产。
352352

@@ -357,8 +357,7 @@ the same storage asset definition.
357357
358358
For volume plugins that support the `Delete` reclaim policy, deletion removes
359359
both the PersistentVolume object from Kubernetes, as well as the associated
360-
storage asset in the external infrastructure, such as an AWS EBS or GCE PD volume.
361-
Volumes that were dynamically provisioned
360+
storage asset in the external infrastructure. Volumes that were dynamically provisioned
362361
inherit the [reclaim policy of their StorageClass](#reclaim-policy), which
363362
defaults to `Delete`. The administrator should configure the StorageClass
364363
according to users' expectations; otherwise, the PV must be edited or
@@ -368,7 +367,7 @@ patched after it is created. See
368367
#### 删除(Delete) {#delete}
369368

370369
对于支持 `Delete` 回收策略的卷插件,删除动作会将 PersistentVolume 对象从
371-
Kubernetes 中移除,同时也会从外部基础设施(如 AWS EBS 或 GCE PD 卷)中移除所关联的存储资产
370+
Kubernetes 中移除,同时也会从外部基础设施中移除所关联的存储资产
372371
动态制备的卷会继承[其 StorageClass 中设置的回收策略](#reclaim-policy)
373372
该策略默认为 `Delete`。管理员需要根据用户的期望来配置 StorageClass;
374373
否则 PV 卷被创建之后必须要被编辑或者修补。
@@ -478,7 +477,7 @@ Access Modes: RWO
478477
VolumeMode: Filesystem
479478
Capacity: 1Gi
480479
Node Affinity: <none>
481-
Message:
480+
Message:
482481
Source:
483482
Type: vSphereVolume (a Persistent Disk resource in vSphere)
484483
VolumePath: [vsanDatastore] d49c4a62-166f-ce12-c464-020077ba5d46/kubernetes-dynamic-pvc-74a498d6-3929-47e8-8c02-078c1ece4d78.vmdk
@@ -506,7 +505,7 @@ Access Modes: RWO
506505
VolumeMode: Filesystem
507506
Capacity: 200Mi
508507
Node Affinity: <none>
509-
Message:
508+
Message:
510509
Source:
511510
Type: CSI (a Container Storage Interface (CSI) volume source)
512511
Driver: csi.vsphere.vmware.com
@@ -617,14 +616,12 @@ the following types of volumes:
617616
* azureFile (deprecated)
618617
* {{< glossary_tooltip text="csi" term_id="csi" >}}
619618
* flexVolume (deprecated)
620-
* gcePersistentDisk (deprecated)
621619
* rbd
622620
* portworxVolume (deprecated)
623621
-->
624622
* azureFile(已弃用)
625623
* {{< glossary_tooltip text="csi" term_id="csi" >}}
626624
* flexVolume(已弃用)
627-
* gcePersistentDisk(已弃用)
628625
* rbd
629626
* portworxVolume(已弃用)
630627

@@ -744,15 +741,6 @@ FlexVolume resize is possible only when the underlying driver supports resize.
744741
FlexVolume 卷的重设大小只能在下层驱动支持重设大小的时候才可进行。
745742
{{< /note >}}
746743

747-
{{< note >}}
748-
<!--
749-
Expanding EBS volumes is a time-consuming operation.
750-
Also, there is a per-volume quota of one modification every 6 hours.
751-
-->
752-
扩充 EBS 卷的操作非常耗时。同时还存在另一个配额限制:
753-
每 6 小时只能执行一次(尺寸)修改操作。
754-
{{< /note >}}
755-
756744
<!--
757745
#### Recovering from Failure when Expanding Volumes
758746

@@ -887,8 +875,6 @@ This means that support is still available but will be removed in a future Kuber
887875
(**deprecated** in v1.21)
888876
* [`flexVolume`](/docs/concepts/storage/volumes/#flexvolume) - FlexVolume
889877
(**deprecated** in v1.23)
890-
* [`gcePersistentDisk`](/docs/concepts/storage/volumes/#gcepersistentdisk) - GCE Persistent Disk
891-
(**deprecated** in v1.17)
892878
* [`portworxVolume`](/docs/concepts/storage/volumes/#portworxvolume) - Portworx volume
893879
(**deprecated** in v1.25)
894880
* [`vsphereVolume`](/docs/concepts/storage/volumes/#vspherevolume) - vSphere VMDK volume
@@ -903,8 +889,6 @@ This means that support is still available but will be removed in a future Kuber
903889
* [`azureFile`](/zh-cn/docs/concepts/storage/volumes/#azurefile) - Azure File
904890
(于 v1.21 **弃用**)
905891
* [`flexVolume`](/zh-cn/docs/concepts/storage/volumes/#flexVolume) - FlexVolume (于 v1.23 **弃用**)
906-
* [`gcePersistentDisk`](/zh-cn/docs/concepts/storage/volumes/#gcepersistentdisk) - GCE Persistent Disk
907-
(于 v1.17 **弃用**)
908892
* [`portworxVolume`](/zh-cn/docs/concepts/storage/volumes/#portworxvolume) - Portworx 卷
909893
(于 v1.25 **弃用**)
910894
* [`vsphereVolume`](/zh-cn/docs/concepts/storage/volumes/#vspherevolume) - vSphere VMDK 卷
@@ -1153,12 +1137,9 @@ Kubernetes 使用卷访问模式来匹配 PersistentVolumeClaim 和 PersistentVo
11531137

11541138
<!--
11551139
> __Important!__ A volume can only be mounted using one access mode at a time,
1156-
> even if it supports many. For example, a GCEPersistentDisk can be mounted as
1157-
> ReadWriteOnce by a single node or ReadOnlyMany by many nodes, but not at the same time.
1140+
> even if it supports many.
11581141
-->
11591142
> **重要提醒!** 每个卷同一时刻只能以一种访问模式挂载,即使该卷能够支持多种访问模式。
1160-
> 例如,一个 GCEPersistentDisk 卷可以被某节点以 ReadWriteOnce
1161-
> 模式挂载,或者被多个节点以 ReadOnlyMany 模式挂载,但不可以同时以两种模式挂载。
11621143

11631144
<!--
11641145
| Volume Plugin | ReadWriteOnce | ReadOnlyMany | ReadWriteMany | ReadWriteOncePod |
@@ -1168,8 +1149,6 @@ Kubernetes 使用卷访问模式来匹配 PersistentVolumeClaim 和 PersistentVo
11681149
| CSI | depends on the driver | depends on the driver | depends on the driver | depends on the driver |
11691150
| FC | &#x2713; | &#x2713; | - | - |
11701151
| FlexVolume | &#x2713; | &#x2713; | depends on the driver | - |
1171-
| GCEPersistentDisk | &#x2713; | &#x2713; | - | - |
1172-
| Glusterfs | &#x2713; | &#x2713; | &#x2713; | - |
11731152
| HostPath | &#x2713; | - | - | - |
11741153
| iSCSI | &#x2713; | &#x2713; | - | - |
11751154
| NFS | &#x2713; | &#x2713; | &#x2713; | - |
@@ -1226,20 +1205,20 @@ Current reclaim policies are:
12261205

12271206
* Retain -- manual reclamation
12281207
* Recycle -- basic scrub (`rm -rf /thevolume/*`)
1229-
* Delete -- associated storage asset such as AWS EBS or GCE PD volume is deleted
1208+
* Delete -- associated storage asset
12301209

1231-
Currently, only NFS and HostPath support recycling. AWS EBS and GCE PD volumes support deletion.
1210+
For Kubernetes {{< skew currentVersion >}}, only `nfs` and `hostPath` volume types support recycling.
12321211
-->
12331212
### 回收策略 {#reclaim-policy}
12341213

12351214
目前的回收策略有:
12361215

12371216
* Retain -- 手动回收
1238-
* Recycle -- 基本擦除 (`rm -rf /thevolume/*`)
1239-
* Delete -- 诸如 AWS EBS 或 GCE PD 卷这类关联存储资产也被删除
1217+
* Recycle -- 简单擦除 (`rm -rf /thevolume/*`)
1218+
* Delete -- 删除关联存储资产
12401219

1241-
目前,仅 NFS 和 HostPath 支持回收(Recycle)。
1242-
AWS EBS 和 GCE PD 卷支持删除(Delete)。
1220+
对于 Kubernetes {{< skew currentVersion >}} 来说,只有
1221+
`nfs` 和 `hostPath` 卷类型支持回收(Recycle)。
12431222

12441223
<!--
12451224
### Mount Options
@@ -1264,7 +1243,6 @@ The following volume types support mount options:
12641243
* `azureFile`
12651244
* `cephfs` (**deprecated** in v1.28)
12661245
* `cinder` (**deprecated** in v1.18)
1267-
* `gcePersistentDisk` (**deprecated** in v1.28)
12681246
* `iscsi`
12691247
* `nfs`
12701248
* `rbd` (**deprecated** in v1.28)
@@ -1275,7 +1253,6 @@ The following volume types support mount options:
12751253
* `azureFile`
12761254
* `cephfs`(于 v1.28 中**弃用**)
12771255
* `cinder`(于 v1.18 中**弃用**)
1278-
* `gcePersistentDisk`(于 v1.28 中**弃用**)
12791256
* `iscsi`
12801257
* `nfs`
12811258
* `rbd`(于 v1.28 中**弃用**)
@@ -1302,13 +1279,12 @@ it will become fully deprecated in a future Kubernetes release.
13021279

13031280
{{< note >}}
13041281
<!--
1305-
For most volume types, you do not need to set this field. It is automatically
1306-
populated for [GCE PD](/docs/concepts/storage/volumes/#gcepersistentdisk) volume block types.
1282+
For most volume types, you do not need to set this field.
13071283
You need to explicitly set this for [local](/docs/concepts/storage/volumes/#local) volumes.
13081284
-->
1309-
对大多数类型的卷而言,你不需要设置节点亲和性字段。
1310-
[GCE PD](/zh-cn/docs/concepts/storage/volumes/#gcepersistentdisk) 卷类型能自动设置相关字段。
1311-
你需要为 [local](/zh-cn/docs/concepts/storage/volumes/#local) 卷显式地设置此属性。
1285+
对大多数卷类型而言,你不需要设置节点亲和性字段。
1286+
你需要为 [local](/zh-cn/docs/concepts/storage/volumes/#local)
1287+
卷显式地设置此属性。
13121288
{{< /note >}}
13131289

13141290
<!--
@@ -1702,7 +1678,6 @@ applicable:
17021678
<!--
17031679
* CSI
17041680
* FC (Fibre Channel)
1705-
* GCEPersistentDisk (deprecated)
17061681
* iSCSI
17071682
* Local volume
17081683
* OpenStack Cinder
@@ -1712,7 +1687,6 @@ applicable:
17121687
-->
17131688
* CSI
17141689
* FC(光纤通道)
1715-
* GCEPersistentDisk(已弃用)
17161690
* iSCSI
17171691
* Local 卷
17181692
* OpenStack Cinder
@@ -2232,4 +2206,3 @@ Read about the APIs described in this page:
22322206

22332207
* [`PersistentVolume`](/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-v1/)
22342208
* [`PersistentVolumeClaim`](/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/)
2235-

content/zh-cn/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,36 @@ startupProbe:
790790
value: ""
791791
```
792792

793+
{{< note >}}
794+
<!--
795+
When the kubelet probes a Pod using HTTP, it only follows redirects if the redirect
796+
is to the same host. If the kubelet receives 11 or more redirects during probing, the probe is considered successful
797+
and a related Event is created:
798+
-->
799+
当 kubelet 使用 HTTP 探测 Pod 时,仅当重定向到同一主机时,它才会遵循重定向。
800+
如果 kubelet 在探测期间收到 11 个或更多重定向,则认为探测成功并创建相关事件:
801+
802+
```none
803+
Events:
804+
Type Reason Age From Message
805+
---- ------ ---- ---- -------
806+
Normal Scheduled 29m default-scheduler Successfully assigned default/httpbin-7b8bc9cb85-bjzwn to daocloud
807+
Normal Pulling 29m kubelet Pulling image "docker.io/kennethreitz/httpbin"
808+
Normal Pulled 24m kubelet Successfully pulled image "docker.io/kennethreitz/httpbin" in 5m12.402735213s
809+
Normal Created 24m kubelet Created container httpbin
810+
Normal Started 24m kubelet Started container httpbin
811+
Warning ProbeWarning 4m11s (x1197 over 24m) kubelet Readiness probe warning: Probe terminated redirects
812+
```
813+
814+
<!--
815+
If the kubelet receives a redirect where the hostname is different from the request,
816+
the outcome of the probe is treated as successful and kubelet creates an event
817+
to report the redirect failure.
818+
-->
819+
如果 kubelet 收到主机名与请求不同的重定向,则探测结果将被视为成功,并且
820+
kubelet 将创建一个事件来报告重定向失败。
821+
{{< /note >}}
822+
793823
<!--
794824
### TCP probes
795825

content/zh-cn/releases/patch-releases.md

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,25 +149,17 @@ releases may also occur in between these.
149149
<!--
150150
| Monthly Patch Release | Cherry Pick Deadline | Target date |
151151
| --------------------- | -------------------- | ----------- |
152-
| September 2023 | 2023-09-08 | 2023-09-13 |
153-
| October 2023 | 2023-10-13 | 2023-10-18 |
154-
| November 2023 | N/A | N/A |
155-
| December 2023 | 2023-12-01 | 2023-12-06 |
152+
| December 2023 | 2023-12-08 | 2023-12-13 |
153+
| January 2024 | 2024-01-12 | 2024-01-17 |
154+
| February 2024 | 2024-02-09 | 2024-02-14 |
155+
| March 2024 | 2024-03-08 | 2024-03-13 |
156156
-->
157-
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
158-
|--------------|---------------------|------------|
159-
| 2023 年 9 月 | 2023-09-08 | 2023-09-13 |
160-
| 2023 年 10 月 | 2023-10-13 | 2023-10-18 |
161-
| 2023 年 11 月 | N/A | N/A |
162-
| 2023 年 12 月 | 2023-12-01 | 2023-12-06 |
163-
164-
<!--
165-
**Note:** Due to overlap with KubeCon NA 2023 and the resulting lack of
166-
availability of Release Managers, it has been decided to skip patch releases
167-
in November. Instead, we'll have patch releases early in December.
168-
-->
169-
**注意:**由于与 KubeCon NA 2023 时间冲突以及由此导致的缺少 Release Manager,
170-
我们决定在 11 月跳过补丁版本发布。而是在 12 月初发布补丁版本。
157+
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
158+
|--------------|---------------------|-------------|
159+
| 2023 年 11 月 | 2023-12-08 | 2023-12-13 |
160+
| 2024 年 1 月 | 2024-01-12 | 2024-01-17 |
161+
| 2024 年 2 月 | 2024-02-09 | 2024-02-14 |
162+
| 2024 年 3 月 | 2024-03-08 | 2024-03-13 |
171163

172164
<!--
173165
## Detailed Release History for Active Branches

0 commit comments

Comments
 (0)