whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Aaron.L.Xu
2016-12-23 19:40:51 +08:00
committed by GitHub
parent c67b76a2f0 cda4b040b4
commit cbc897a320
54 changed files with 286 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/user-guide/pods/index.md
+1 -1
View File
@@ -10,7 +10,7 @@ title: Pods
_pods_ are the smallest deployable units of computing that can be created and
managed in Kubernetes.
## What is a pod?
## What is a Pod?
A _pod_ (as in a pod of whales or pea pod) is a group of one or more containers
(such as Docker containers), the shared storage for those containers, and
docs/user-guide/pods/init-container.md
+1 -1
View File
@@ -159,7 +159,7 @@ reasons:
* This is uncommon and would have to be done by someone with root access to nodes.
* All containers in a pod are terminated, requiring a restart (RestartPolicyAlways) AND the record of init container completion has been lost due to garbage collection.
## Support and compatibilty
## Support and compatibility
A cluster with Kubelet and Apiserver version 1.4.0 or greater supports init
containers with the beta annotations. Support varies for other combinations of