kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix link to Upgrade 1.6
  livenessProbe -> periodSeconds (#2832)
pull/2947/head
Andrew Chen 2017-03-21 19:54:15 -07:00
parent 4eba51d6f2 807ccaed78
commit 4800b4f881
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/cluster-management.md
View File

@ -21,7 +21,7 @@ To install Kubernetes on a set of machines, consult one of the existing [Getting
The current state of cluster upgrades is provider dependent, and some releases may require special care when upgrading. It is recommended that administrators consult both the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md), as well as the version specific upgrade notes prior to upgrading their clusters.
* [Upgrading to 1.6](/docs/admin/upgrade)
* [Upgrading to 1.6](/docs/admin/upgrade-1-6)
### Upgrading Google Compute Engine clusters

2
docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md
View File

@ -42,7 +42,7 @@ In this exercise, you create a Pod that runs a Container based on the
{% include code.html language="yaml" file="exec-liveness.yaml" ghlink="/docs/tasks/configure-pod-container/exec-liveness.yaml" %}
In the configuration file, you can see that the Pod has a single Container.
The `livenessProbe` field specifies that the kubelet should perform a liveness
The `periodSeconds` field specifies that the kubelet should perform a liveness
probe every 5 seconds. The `initialDelaySeconds` field tells the kubelet that it
should wait 5 second before performing the first probe. To perform a probe, the
kubelet executes the command `cat /tmp/healthy` in the Container. If the