Merge branch 'master' into patch-17

This commit is contained in:
Xiaoyu Zhang
2017-03-21 08:16:35 +08:00
committed by GitHub
34 changed files with 1055 additions and 1025 deletions
@@ -55,7 +55,7 @@ The example below demonstrates the components of a StatefulSet.
* A Headless Service, named nginx, is used to control the network domain.
* The StatefulSet, named web, has a Spec that indicates that 3 replicas of the nginx container will be launched in unique Pods.
* The volumeClaimTemplates will provide stable storage using [PersistentVolumes](/docs/user-guide/volumes/) provisioned by a
* The volumeClaimTemplates will provide stable storage using [PersistentVolumes](/docs/concepts/storage/volumes/) provisioned by a
PersistentVolume Provisioner.
```yaml
@@ -144,7 +144,7 @@ Note that Cluster Domain will be set to `cluster.local` unless
### Stable Storage
Kubernetes creates one [PersistentVolume](/docs/user-guide/volumes/) for each
Kubernetes creates one [PersistentVolume](/docs/concepts/storage/volumes/) for each
VolumeClaimTemplate. In the nginx example above, each Pod will receive a single PersistentVolume
with a storage class of `anything` and 1 Gib of provisioned storage. When a Pod is (re)scheduled
onto a node, its `volumeMounts` mount the PersistentVolumes associated with its
@@ -274,7 +274,7 @@ spec:
* Get hands-on experience
[configuring liveness and readiness probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/).
* [Container Lifecycle Hooks](/docs/user-guide/container-environment/)
* [Container Lifecycle Hooks](/docs/concepts/containers/container-lifecycle-hooks/)
{% endcapture %}