Skip to content

Commit 2657a84

Browse files
authored
Merge pull request #48663 from my-git9/pp-25837
[zh-cn]sync liveness-readiness-startup-probes configure-liveness-readiness-startup-probes
2 parents 0bd4268 + ed8d579 commit 2657a84

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

content/zh-cn/docs/concepts/configuration/liveness-readiness-startup-probes.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Kubernetes 提供了多种探针:
2929
<!--
3030
## Liveness probe
3131
32-
Liveness probes determine when to restart a container. For example, liveness probes could catch a deadlock, when an application is running, but unable to make progress.
32+
Liveness probes determine when to restart a container. For example, liveness probes could catch a deadlock when an application is running, but unable to make progress.
3333
-->
3434
## 存活探针 {#liveness-probe}
3535

@@ -42,8 +42,7 @@ If a container fails its liveness probe repeatedly, the kubelet restarts the con
4242
如果一个容器的存活探针失败多次,kubelet 将重启该容器。
4343

4444
<!--
45-
Liveness probes do not wait for readiness probes to succeed. If you want to wait before
46-
executing a liveness probe you can either define `initialDelaySeconds`, or use a
45+
Liveness probes do not wait for readiness probes to succeed. If you want to wait before executing a liveness probe, you can either define `initialDelaySeconds`, or use a
4746
[startup probe](#startup-probe).
4847
-->
4948
存活探针不会等待就绪探针成功。
@@ -52,7 +51,7 @@ executing a liveness probe you can either define `initialDelaySeconds`, or use a
5251
<!--
5352
## Readiness probe
5453
55-
Readiness probes determine when a container is ready to start accepting traffic. This is useful when waiting for an application to perform time-consuming initial tasks, such as establishing network connections, loading files, and warming caches.
54+
Readiness probes determine when a container is ready to start accepting traffic. This is useful when waiting for an application to perform time-consuming initial tasks, such as establishing network connections, loading files, and warming caches.
5655
-->
5756
## 就绪探针 {#readiness-probe}
5857

@@ -62,7 +61,7 @@ Readiness probes determine when a container is ready to start accepting traffic.
6261
<!--
6362
If the readiness probe returns a failed state, Kubernetes removes the pod from all matching service endpoints.
6463
65-
Readiness probes runs on the container during its whole lifecycle.
64+
Readiness probes run on the container during its whole lifecycle.
6665
-->
6766
如果就绪探针返回的状态为失败,Kubernetes 会将该 Pod 从所有对应服务的端点中移除。
6867

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ startupProbe:
805805

806806
{{< note >}}
807807
<!--
808-
When the kubelet probes a Pod using HTTP, it only follows redirects if the redirect
808+
When the kubelet probes a Pod using HTTP, it only follows redirects if the redirect
809809
is to the same host. If the kubelet receives 11 or more redirects during probing, the probe is considered successful
810810
and a related Event is created:
811811
-->
@@ -821,7 +821,7 @@ Events:
821821
Normal Pulled 24m kubelet Successfully pulled image "docker.io/kennethreitz/httpbin" in 5m12.402735213s
822822
Normal Created 24m kubelet Created container httpbin
823823
Normal Started 24m kubelet Started container httpbin
824-
Warning ProbeWarning 4m11s (x1197 over 24m) kubelet Readiness probe warning: Probe terminated redirects
824+
Warning ProbeWarning 4m11s (x1197 over 24m) kubelet Readiness probe warning: Probe terminated redirects
825825
```
826826

827827
<!--

0 commit comments

Comments
 (0)