Merge pull request #13155 from derekwaynecarr/enforce_limits

Map cpu limits to cpu-quota in docker run
This commit is contained in:
Abhi Shah
2015-09-03 16:28:04 -07:00
12 changed files with 112 additions and 7 deletions

View File

@@ -228,6 +228,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
MaxPods: s.MaxPods,
DockerExecHandler: dockerExecHandler,
ResolverConfig: s.ResolverConfig,
CPUCFSQuota: s.CPUCFSQuota,
}
kcfg.NodeName = kcfg.Hostname
@@ -330,6 +331,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
kc.MaxPods,
kc.DockerExecHandler,
kc.ResolverConfig,
kc.CPUCFSQuota,
)
if err != nil {
return nil, nil, err