github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #40327 from yujuhong/rm_code 

Automatic merge from submit-queue (batch tested with PRs 39275, 40327, 37264)

dockertools: remove some dead code

Remove `dockerRoot` that's not used anywhere.
pull/6/head
Kubernetes Submit Queue 2017-01-24 10:52:10 -08:00 committed by GitHub
parent 284dfb270e c1d043af18
commit 92c5457854
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/dockertools/docker_manager.go
View File

@ -141,9 +141,6 @@ type DockerManager struct {
// wrapped image puller. // wrapped image puller.
imagePuller images.ImageManager imagePuller images.ImageManager
// Root of the Docker runtime.
dockerRoot string
// cgroup driver used by Docker runtime. // cgroup driver used by Docker runtime.
cgroupDriver string cgroupDriver string
@ -240,10 +237,6 @@ func NewDockerManager(
// Wrap the docker client with instrumentedDockerInterface // Wrap the docker client with instrumentedDockerInterface
client = NewInstrumentedDockerInterface(client) client = NewInstrumentedDockerInterface(client)
// Work out the location of the Docker runtime, defaulting to /var/lib/docker
// if there are any problems.
dockerRoot := "/var/lib/docker"
// cgroup driver is only detectable in docker 1.11+ // cgroup driver is only detectable in docker 1.11+
// when the execution driver is not detectable, we provide the cgroupfs form. // when the execution driver is not detectable, we provide the cgroupfs form.
// if your docker engine is configured to use the systemd cgroup driver, and you // if your docker engine is configured to use the systemd cgroup driver, and you
@ -254,11 +247,7 @@ func NewDockerManager(
dockerInfo, err := client.Info() dockerInfo, err := client.Info()
if err != nil { if err != nil {
glog.Errorf("Failed to execute Info() call to the Docker client: %v", err) glog.Errorf("Failed to execute Info() call to the Docker client: %v", err)
glog.Warningf("Using fallback default of /var/lib/docker for location of Docker runtime")
} else { } else {
dockerRoot = dockerInfo.DockerRootDir
glog.Infof("Setting dockerRoot to %s", dockerRoot)
cgroupDriver = dockerInfo.CgroupDriver cgroupDriver = dockerInfo.CgroupDriver
glog.Infof("Setting cgroupDriver to %s", cgroupDriver) glog.Infof("Setting cgroupDriver to %s", cgroupDriver)
} }
@ -271,7 +260,6 @@ func NewDockerManager(
machineInfo: machineInfo, machineInfo: machineInfo,
podInfraContainerImage: podInfraContainerImage, podInfraContainerImage: podInfraContainerImage,
dockerPuller: newDockerPuller(client), dockerPuller: newDockerPuller(client),
dockerRoot: dockerRoot,
cgroupDriver: cgroupDriver, cgroupDriver: cgroupDriver,
containerLogsDir: containerLogsDir, containerLogsDir: containerLogsDir,
networkPlugin: networkPlugin, networkPlugin: networkPlugin,