Skip to content

Commit 0ad5f66

Browse files
authored
Merge pull request #49294 from B1F030/patch-1
[zh] remove duplicate descriptions in pod-termination
2 parents 2e305cc + 7028816 commit 0ad5f66

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

content/zh-cn/docs/concepts/workloads/pods/pod-lifecycle.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,9 +1142,10 @@ Pod 终止流程,如下例所示:
11421142
-->
11431143

11441144
1. 如果 Pod 中的容器之一定义了 `preStop`
1145-
[回调](/zh-cn/docs/concepts/containers/container-lifecycle-hooks),
1146-
`kubelet` 开始在容器内运行该回调逻辑。如果超出体面终止限期时,
1147-
`preStop` 回调逻辑仍在运行,`kubelet` 会请求给予该 Pod 的宽限期一次性增加 2 秒钟。
1145+
[回调](/zh-cn/docs/concepts/containers/container-lifecycle-hooks)
1146+
且 Pod 规约中的 `terminationGracePeriodSeconds` 未设为 0,
1147+
`kubelet` 开始在容器内运行该回调逻辑。默认的 `terminationGracePeriodSeconds`
1148+
设置为 30 秒.
11481149

11491150
如果 `preStop` 回调在体面期结束后仍在运行,kubelet 将请求短暂的、一次性的体面期延长 2 秒。
11501151

0 commit comments

Comments
 (0)