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

Address comments

This commit is contained in:
Janet Kuo 2016-04-26 17:19:58 -07:00
parent cc0661a69e
commit 59dc7da9a4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/user-guide/deployments.md
View File

@ -426,9 +426,9 @@ the same schema as a [Pod](/docs/user-guide/pods), except it is nested and does
`apiVersion` or `kind`. `apiVersion` or `kind`.
In addition to required fields for a Pod, a pod template in a Deployment must specify appropriate In addition to required fields for a Pod, a pod template in a Deployment must specify appropriate
labels (see [selector](#selector)) and an appropriate restart policy. labels (i.e. don't overlap with other controllers, see [selector](#selector)) and an appropriate restart policy.
Only a [`RestartPolicy`](/docs/user-guide/pod-states/) equal to `Always` is allowed, which is the default Only a [`.spec.template.spec.restartPolicy`](/docs/user-guide/pod-states/) equal to `Always` is allowed, which is the default
if not specified. if not specified.
### Replicas ### Replicas
@ -438,14 +438,14 @@ to 1.
### Selector ### Selector
`.spec.selector` is an optional field that specifies [label selectors](/docs/user-guide/labels/#label-selectors) for Pods `.spec.selector` is an optional field that specifies a [label selector](/docs/user-guide/labels/#label-selectors) for the Pods
targeted by this deployment. targeted by this deployment.
If specified, `.spec.selector` must match `.spec.template.metadata.labels`, or it will If specified, `.spec.selector` must match `.spec.template.metadata.labels`, or it will
be rejected by the API. If `.spec.selector` is unspecified, `.spec.selector.matchLabels` will be defaulted to be rejected by the API. If `.spec.selector` is unspecified, `.spec.selector.matchLabels` will be defaulted to
`.spec.template.metadata.labels`. `.spec.template.metadata.labels`.
Deployment kills some of these Pods, if their Deployment may kill Pods whose labels match the selector, in the case that their
template is different than `.spec.template` or if the total number of such Pods template is different than `.spec.template` or if the total number of such Pods
exceeds `.spec.replicas`. It will bring up new Pods with `.spec.template` if exceeds `.spec.replicas`. It will bring up new Pods with `.spec.template` if
number of Pods are less than the desired number. number of Pods are less than the desired number.

2
docs/user-guide/labels.md
View File

@ -54,6 +54,8 @@ An empty label selector (that is, one with zero requirements) selects every obje
A null label selector (which is only possible for optional selector fields) selects no objects. A null label selector (which is only possible for optional selector fields) selects no objects.
**Note**: the label selectors of two controllers must not overlap within a namespace, otherwise they will fight with each other.
### _Equality-based_ requirement ### _Equality-based_ requirement
_Equality-_ or _inequality-based_ requirements allow filtering by label keys and values. Matching objects must satisfy all of the specified label constraints, though they may have additional labels as well. _Equality-_ or _inequality-based_ requirements allow filtering by label keys and values. Matching objects must satisfy all of the specified label constraints, though they may have additional labels as well.

4
docs/user-guide/replication-controller/index.md
View File

@ -97,9 +97,9 @@ the same schema as a [pod](/docs/user-guide/pods/), except it is nested and does
`kind`. `kind`.
In addition to required fields for a Pod, a pod template in a Replication Controller must specify appropriate In addition to required fields for a Pod, a pod template in a Replication Controller must specify appropriate
labels (see [pod selector](#pod-selector)) and an appropriate restart policy. labels (i.e. don't overlap with other controllers, see [pod selector](#pod-selector)) and an appropriate restart policy.
Only a [`RestartPolicy`](/docs/user-guide/pod-states/) equal to `Always` is allowed, which is the default Only a [`.spec.template.spec.restartPolicy`](/docs/user-guide/pod-states/) equal to `Always` is allowed, which is the default
if not specified. if not specified.
For local container restarts, replication controllers delegate to an agent on the node, For local container restarts, replication controllers delegate to an agent on the node,