Skip to content

Commit b421c94

Browse files
authored
Merge pull request #48016 from my-git9/pp-9200
[zh-cn] sync encrypt-data configure-liveness-readiness-startup-probes
2 parents ecd056b + a1a45fd commit b421c94

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

content/zh-cn/docs/tasks/administer-cluster/encrypt-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,10 @@ to give it precedence.
368368

369369
<!--
370370
For more detailed information about the `EncryptionConfiguration` struct, please refer to the
371-
[encryption configuration API](/docs/reference/config-api/apiserver-encryption.v1/).
371+
[encryption configuration API](/docs/reference/config-api/apiserver-config.v1/)).
372372
-->
373373
有关 `EncryptionConfiguration` 结构体的更多详细信息,
374-
请参阅[加密配置 API](/zh-cn/docs/reference/config-api/apiserver-encryption.v1/)
374+
请参阅[加密配置 API](/zh-cn/docs/reference/config-api/apiserver-config.v1/)
375375

376376
{{< caution >}}
377377
<!--

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,8 @@ liveness and readiness checks:
642642
ignored. Defaults to 0 seconds. Minimum value is 0.
643643
* `periodSeconds`: How often (in seconds) to perform the probe. Default to 10 seconds.
644644
The minimum value is 1.
645+
While a container is not Ready, the `ReadinessProbe` may be executed at times other than
646+
the configured `periodSeconds` interval. This is to make the Pod ready faster.
645647
* `timeoutSeconds`: Number of seconds after which the probe times out.
646648
Defaults to 1 second. Minimum value is 1.
647649
* `successThreshold`: Minimum consecutive successes for the probe to be considered successful
@@ -653,6 +655,8 @@ liveness and readiness checks:
653655
如果 `periodSeconds` 的值大于 `initialDelaySeconds`,则 `initialDelaySeconds`
654656
将被忽略。默认是 0 秒,最小值是 0。
655657
* `periodSeconds`:执行探测的时间间隔(单位是秒)。默认是 10 秒。最小值是 1。
658+
当容器未就绪时,`ReadinessProbe` 可能会在除配置的 `periodSeconds`
659+
间隔以外的时间执行。这是为了让 Pod 更快地达到可用状态。
656660
* `timeoutSeconds`:探测的超时后等待多少秒。默认值是 1 秒。最小值是 1。
657661
* `successThreshold`:探针在失败后,被视为成功的最小连续成功数。默认值是 1。
658662
存活和启动探测的这个值必须是 1。最小值是 1。

0 commit comments

Comments
 (0)