github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17202 from brendandburns/fix2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-17 00:49:13 -08:00
parent 4657f1f112 fb576f30c8
commit 1334401888
8 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/fake_manager.go
View File

@@ -44,7 +44,7 @@ func NewFakeDockerManager(
httpClient kubetypes.HttpGetter, imageBackOff *util.Backoff) *DockerManager {
fakeOOMAdjuster := oom.NewFakeOOMAdjuster()
fakeProcFs := procfs.NewFakeProcFs()
fakeProcFs := procfs.NewFakeProcFS()
dm := NewDockerManager(client, recorder, livenessManager, containerRefManager, machineInfo, podInfraContainerImage, qps,
burst, containerLogsDir, osInterface, networkPlugin, generator, httpClient, &NativeExecHandler{},
fakeOOMAdjuster, fakeProcFs, false, imageBackOff, true)

4
pkg/kubelet/dockertools/manager.go
View File

@@ -133,7 +133,7 @@ type DockerManager struct {
oomAdjuster *oom.OOMAdjuster
// Get information from /proc mount.
procFs procfs.ProcFsInterface
procFs procfs.ProcFSInterface
// If true, enforce container cpu limits with CFS quota support
cpuCFSQuota bool
@@ -158,7 +158,7 @@ func NewDockerManager(
httpClient kubetypes.HttpGetter,
execHandler ExecHandler,
oomAdjuster *oom.OOMAdjuster,
procFs procfs.ProcFsInterface,
procFs procfs.ProcFSInterface,
cpuCFSQuota bool,
imageBackOff *util.Backoff,
serializeImagePulls bool) *DockerManager {