Skip to content

Commit

Permalink
Merge pull request kubernetes#115 from rata/cluster-components
Browse files Browse the repository at this point in the history
Fix kube-controller-manager description
  • Loading branch information
johndmulhausen committed Mar 16, 2016
2 parents 66c7a02 + 9df5b9e commit 38f88b3
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions docs/admin/cluster-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,11 @@ process.

These controllers include:

* Node Controller
* Responsible for noticing & responding when nodes go down.
* Replication Controller
* Responsible for maintaining the correct number of pods for every replication
controller object in the system.
* Endpoints Controller
* Populates the Endpoints object (i.e., join Services & Pods).
* Service Account & Token Controllers
* Create default accounts and API access tokens for new namespaces.
* Node Controller: Responsible for noticing & responding when nodes go down.
* Replication Controller: Responsible for maintaining the correct number of pods for every replication
controller object in the system.
* Endpoints Controller: Populates the Endpoints object (i.e., join Services & Pods).
* Service Account & Token Controllers: Create default accounts and API access tokens for new namespaces.
* ... and others.

### kube-scheduler
Expand Down

0 comments on commit 38f88b3

Please sign in to comment.