Skip to content

Commit

Permalink
Merge pull request #1716 from ahmetalpbalkan/patch-1
Browse files Browse the repository at this point in the history
List Deployment next to ReplicationController
  • Loading branch information
jaredbhatti authored Nov 17, 2016
2 parents 8ea8de0 + 4bc42a3 commit 4be980c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/user-guide/pod-states.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ The possible values for RestartPolicy are `Always`, `OnFailure`, or `Never`. If
Three types of controllers are currently available:

- Use a [`Job`](/docs/user-guide/jobs/) for pods which are expected to terminate (e.g. batch computations).
- Use a [`ReplicationController`](/docs/user-guide/replication-controller/) for pods which are not expected to
terminate (e.g. web servers).
- Use a [`ReplicationController`](/docs/user-guide/replication-controller/) or [`Deployment`](/docs/user-guide/deployments/)
for pods which are not expected to terminate (e.g. web servers).
- Use a [`DaemonSet`](/docs/admin/daemons/): Use for pods which need to run 1 per machine because they provide a
machine-specific system service.
If you are unsure whether to use ReplicationController or Daemon, then see [Daemon Set versus
Expand Down

0 comments on commit 4be980c

Please sign in to comment.