Merge branch 'master' into release-1.8

2017-08-08 11:27:06 -07:00
parent 4032cd08d7 2576f404f0
commit b2eebbbc8c
93 changed files with 3689 additions and 1532 deletions
@@ -122,7 +122,7 @@ CIDR block to the node when it is registered (if CIDR assignment is turned on).

 The second is keeping the node controller's internal list of nodes up to date with
 the cloud provider's list of available machines. When running in a cloud
-environment, whenever a node is unhealthy the node controller asks the cloud
+environment, whenever a node is unhealthy, the node controller asks the cloud
 provider if the VM for that node is still available. If not, the node
 controller deletes the node from its list of nodes.

@@ -73,9 +73,9 @@ The API group is specified in a REST path and in the `apiVersion` field of a ser

 Currently there are several API groups in use:

-1. the "core" (oftentimes called "legacy", due to not having explicit group name) group, which is at
+1. The "core" (oftentimes called "legacy", due to not having explicit group name) group, which is at
   REST path `/api/v1` and is not specified as part of the `apiVersion` field, e.g. `apiVersion: v1`.
-1. the named groups are at REST path `/apis/$GROUP_NAME/$VERSION`, and use `apiVersion: $GROUP_NAME/$VERSION`
+1. The named groups are at REST path `/apis/$GROUP_NAME/$VERSION`, and use `apiVersion: $GROUP_NAME/$VERSION`
   (e.g. `apiVersion: batch/v1`).  Full list of supported API groups can be seen in [Kubernetes API reference](/docs/reference/).


@@ -26,13 +26,13 @@ different flags and/or different memory and cpu requests for different hardware

 ## Writing a DaemonSet Spec

-### Create a DeamonSet
+### Create a DaemonSet

-You can describe a DeamonSet in a YAML file. For example, the deamonset.yaml file below describes a DeamonSet that runs the fluentd-elasticsearch Docker image:
+You can describe a DaemonSet in a YAML file. For example, the deamonset.yaml file below describes a DaemonSet that runs the fluentd-elasticsearch Docker image:

 {% include code.html language="yaml" file="deamonset.yaml" ghlink="/docs/concepts/workloads/controllers/deamonset.yaml" %}

-* Create a DeamonSet based on the YAML file:
+* Create a DaemonSet based on the YAML file:
 ```
 kubectl create -f deamonset.yaml
 ```
@@ -49,7 +49,7 @@ A DaemonSet also needs a [`.spec`](https://git.k8s.io/community/contributors/dev

 The `.spec.template` is the only required field of the `.spec`.

-The `.spec.template` is a [pod template](/docs/concepts/workloads/pods/pod-overview/#pod-templates). It has exactly the same schema as a [pod](docs/concepts/workloads/pods/pod/), except it is nested and does not have an `apiVersion` or `kind`.
+The `.spec.template` is a [pod template](/docs/concepts/workloads/pods/pod-overview/#pod-templates). It has exactly the same schema as a [pod](/docs/concepts/workloads/pods/pod/), except it is nested and does not have an `apiVersion` or `kind`.

 In addition to required fields for a pod, a pod template in a DaemonSet has to specify appropriate
 labels (see [pod selector](#pod-selector)).
@@ -787,7 +787,7 @@ A Deployment also needs a [`.spec` section](https://git.k8s.io/community/contrib

 The `.spec.template` is the only required field of the `.spec`.

-The `.spec.template` is a [pod template](/docs/concepts/workloads/pods/pod-overview/#pod-templates). It has exactly the same schema as a [Pod](docs/concepts/workloads/pods/pod/), except it is nested and does not have an
+The `.spec.template` is a [pod template](/docs/concepts/workloads/pods/pod-overview/#pod-templates). It has exactly the same schema as a [Pod](/docs/concepts/workloads/pods/pod/), except it is nested and does not have an
 `apiVersion` or `kind`.

 In addition to required fields for a Pod, a pod template in a Deployment must specify appropriate
@@ -810,7 +810,7 @@ the API.  If `.spec.selector` is unspecified, `.spec.selector.matchLabels` defau
 `.spec.template.metadata.labels`.

 A Deployment may terminate Pods whose labels match the selector if their template is different
-tfrom `.spec.template` or if the total number of such Pods exceeds `.spec.replicas`. It brings up new
+from `.spec.template` or if the total number of such Pods exceeds `.spec.replicas`. It brings up new
 Pods with `.spec.template` if the number of Pods is less than the desired number.

 **Note:** You should not create other pods whose labels match this selector, either directly, by creating
@@ -147,6 +147,13 @@ Here's an example that orphans the dependents of a ReplicaSet:
 kubectl delete replicaset my-repset --cascade=false
 ```

+### Addtional note on Deployments
+
+When using cascading deletes with Deployments you *must* use `propagationPolicy: Foreground`
+to delete not only the ReplicaSets created, but also their Pods. If this type of _propagationPolicy_
+is not used, only the ReplicaSets will be deleted, and the Pods will be orphaned.
+See [kubeadm/#149](https://github.com/kubernetes/kubeadm/issues/149#issuecomment-284766613) for more information.
+
 ## Known issues

 Tracked at [#26120](https://github.com/kubernetes/kubernetes/issues/26120)
@@ -192,7 +192,7 @@ The cluster state now looks like this:
 |                      | pod-b *available*   | pod-c *available*  |
 |                      | pod-d *available*   | pod-y              |

-Now, the cluster admin tries to drain `node-2`.
+Now, the cluster administrator tries to drain `node-2`.
 The drain command will try to evict the two pods in some order, say
 `pod-b` first and then `pod-d`.  It will succeed at evicting `pod-b`.
 But, when it tries to evict `pod-d`, it will be refused because that would leave only