Merge branch 'master' into release-1.8

2017-08-23 10:10:51 -07:00
parent 6c68762cef 74fe1170cc
commit 9403dc361f
35 changed files with 548 additions and 490 deletions
@@ -129,7 +129,7 @@ job "hello-1202039034" deleted

 Once the jobs are deleted, the pods created by them are deleted as well. Note that all jobs created by cron
 job "hello" will be prefixed "hello-". You can delete them at once with `kubectl delete jobs --all`, if you want to
-delete all jobs in the current namespace (not just the ones created by "hello".)
+delete all jobs in the current namespace (not just the ones created by "hello").

 ## Cron Job Limitations

@@ -262,7 +262,7 @@ removed label still exists in any existing Pods and ReplicaSets.

 Sometimes you may want to rollback a Deployment; for example, when the Deployment is not stable, such as crash looping.
 By default, all of the Deployment's rollout history is kept in the system so that you can rollback anytime you want
-(you can change that by modifyingrevision history limit]).
+(you can change that by modifying revision history limit]).

 **Note:** a Deployment's revision is created when a Deployment's rollout is triggered. This means that the
 new revision is created if and only if the Deployment's pod template (`.spec.template`) is changed,
@@ -94,7 +94,7 @@ Before you start deploying applications as PetSets, there are a few limitations

 * PetSet is an *alpha* resource, not available in any Kubernetes release prior to 1.3.
 * As with all alpha/beta resources, it can be disabled through the `--runtime-config` option passed to the apiserver, and in fact most likely will be disabled on hosted offerings of Kubernetes.
-* The only updatable field on a PetSet is `replicas`
+* The only updatable field on a PetSet is `replicas`.
 * The storage for a given pet must either be provisioned by a [persistent volume provisioner](http://releases.k8s.io/{{page.githubbranch}}/examples/persistent-volume-provisioning/README.md) based on the requested `storage class`, or pre-provisioned by an admin. Note that persistent volume provisioning is also currently in alpha.
 * Deleting and/or scaling a PetSet down will *not* delete the volumes associated with the PetSet. This is done to ensure safety first, your data is more valuable than an auto purge of all related PetSet resources. **Deleting the Persistent Volume Claims will result in a deletion of the associated volumes**.
 * All PetSets currently require a "governing service", or a Service responsible for the network identity of the pets. The user is responsible for this Service.