diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index cb31f0dacef..0ae5c317202 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -91,10 +91,10 @@ func NewKubeletServer() *KubeletServer { ImageGCLowThresholdPercent: 80, LowDiskSpaceThresholdMB: 256, MasterServiceNamespace: api.NamespaceDefault, - MaxContainerCount: 100, + MaxContainerCount: 240, MaxPerPodContainerCount: 2, MaxOpenFiles: 1000000, - MaxPods: 40, + MaxPods: 110, MinimumGCAge: unversioned.Duration{1 * time.Minute}, NetworkPluginDir: "/usr/libexec/kubernetes/kubelet-plugins/net/exec/", NetworkPluginName: "", diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md index c641e20aadf..53cd8131430 100644 --- a/docs/admin/kubelet.md +++ b/docs/admin/kubelet.md @@ -112,8 +112,8 @@ kubelet --manifest-url-header="": HTTP header to use when accessing the manifest URL, with the key separated from the value with a ':', as in 'key:value' --master-service-namespace="default": The namespace from which the kubernetes master services should be injected into pods --max-open-files=1000000: Number of files that can be opened by Kubelet process. [default=1000000] - --max-pods=40: Number of Pods that can run on this Kubelet. - --maximum-dead-containers=100: Maximum number of old instances of containers to retain globally. Each container takes up some disk space. Default: 100. + --max-pods=110: Number of Pods that can run on this Kubelet. + --maximum-dead-containers=240: Maximum number of old instances of containers to retain globally. Each container takes up some disk space. Default: 100. --maximum-dead-containers-per-container=2: Maximum number of old instances to retain per container. Each container takes up some disk space. Default: 2. --minimum-container-ttl-duration=1m0s: Minimum age for a finished container before it is garbage collected. Examples: '300ms', '10s' or '2h45m' --minimum-image-ttl-duration=2m0s: Minimum age for a unused image before it is garbage collected. Examples: '300ms', '10s' or '2h45m'. Default: '2m' @@ -152,7 +152,7 @@ kubelet --volume-stats-agg-period=1m0s: Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes. To disable volume calculations, set to 0. Default: '1m' ``` -###### Auto generated by spf13/cobra on 18-Feb-2016 +###### Auto generated by spf13/cobra on 23-Feb-2016