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:
Ankur Shukla
2016-08-31 15:03:41 -07:00
committed by GitHub
parent d554c7e963 a1ea0a9558
commit 2584ec4819
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/user-guide/replication-controller/index.md
+3 -3
View File
@@ -114,7 +114,7 @@ for example the [Kubelet](/docs/admin/kubelet/) or Docker.
The replication controller can itself have labels (`.metadata.labels`). Typically, you The replication controller can itself have labels (`.metadata.labels`). Typically, you
would set these the same as the `.spec.template.metadata.labels`; if `.metadata.labels` is not specified would set these the same as the `.spec.template.metadata.labels`; if `.metadata.labels` is not specified
then it is defaulted to `.spec.template.metadata.labels`. However, they are allowed to be then it is defaulted to `.spec.template.metadata.labels`. However, they are allowed to be
different, and the `.metadata.labels` do not affec the behavior of the replication controller. different, and the `.metadata.labels` do not affect the behavior of the replication controller.
### Pod Selector ### Pod Selector
@@ -254,8 +254,8 @@ Use a [`Job`](/docs/user-guide/jobs/) instead of a replication controller for po
### DaemonSet ### DaemonSet
Use a [`DaemonSet`](/docs/admin/daemons/) instead of a replication controller for pods that provide a Use a [`DaemonSet`](/docs/admin/daemons/) instead of a replication controller for pods that provide a
machine-level function, such as machine monitoring or machine logging. These pods have a lifetime is tied machine-level function, such as machine monitoring or machine logging. These pods have a lifetime that is tied
to machine lifetime: the pod needs to be running on the machine before other pods start, and are to a machine lifetime: the pod needs to be running on the machine before other pods start, and are
safe to terminate when the machine is otherwise ready to be rebooted/shutdown. safe to terminate when the machine is otherwise ready to be rebooted/shutdown.
## For more information ## For more information