From 54e99d9f52821ba94cc984527579837e5e74d176 Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Fri, 2 Oct 2015 22:49:52 +0000 Subject: [PATCH] bugfix: configure oomAdjuster so that it gets passed on to the kubelet --- contrib/mesos/pkg/executor/service/service.go | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 27a894b908e..76bf4b2ab5f 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/contrib/mesos/pkg/executor/service/service.go @@ -198,6 +198,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error { 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 NodeStatusUpdateFrequency: s.NodeStatusUpdateFrequency, + OOMAdjuster: oomAdjuster, ResourceContainer: s.ResourceContainer, CgroupRoot: s.CgroupRoot, ContainerRuntime: s.ContainerRuntime,