github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: configure oomAdjuster so that it gets passed on to the kubelet

Browse Source
This commit is contained in:
James DeFelice 2015-10-02 22:49:52 +00:00
parent 7007481f00
commit 54e99d9f52
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/mesos/pkg/executor/service/service.go
View File

@ -198,6 +198,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
DiskSpacePolicy: diskSpacePolicy, DiskSpacePolicy: diskSpacePolicy,
Cloud: nil, // TODO(jdef) Cloud, specifying null here because we don't want all kubelets polling mesos-master; need to account for this in the cloudprovider impl Cloud: nil, // TODO(jdef) Cloud, specifying null here because we don't want all kubelets polling mesos-master; need to account for this in the cloudprovider impl
NodeStatusUpdateFrequency: s.NodeStatusUpdateFrequency, NodeStatusUpdateFrequency: s.NodeStatusUpdateFrequency,
OOMAdjuster: oomAdjuster,
ResourceContainer: s.ResourceContainer, ResourceContainer: s.ResourceContainer,
CgroupRoot: s.CgroupRoot, CgroupRoot: s.CgroupRoot,
ContainerRuntime: s.ContainerRuntime, ContainerRuntime: s.ContainerRuntime,