Merge pull request #19944 from mwielgus/simple-cm

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 06:41:28 -08:00
13 changed files with 1007 additions and 839 deletions

View File

@@ -82,6 +82,7 @@ kubelet
--cpu-cfs-quota[=true]: Enable CPU CFS quota enforcement for containers that specify CPU limits
--docker-endpoint="": If non-empty, use this for the docker endpoint to communicate with
--docker-exec-handler="native": Handler to use when executing a command in a container. Valid values are 'native' and 'nsenter'. Defaults to 'native'.
--enable-custom-metrics[=false]: Support for gathering custom metrics.
--enable-debugging-handlers[=true]: Enables server endpoints for log collection and local running of containers and commands
--enable-server[=true]: Enable the Kubelet's server
--event-burst=10: Maximum size of a bursty event records, temporarily allows event records to burst to this number, while still not exceeding event-qps. Only used if --event-qps > 0
@@ -146,7 +147,7 @@ kubelet
--volume-plugin-dir="/usr/libexec/kubernetes/kubelet-plugins/volume/exec/": <Warning: Alpha feature> The full path of the directory in which to search for additional third party volume plugins
```
###### Auto generated by spf13/cobra on 29-Jan-2016
###### Auto generated by spf13/cobra on 3-Feb-2016
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->