github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

dockershim: set the default cgroup driver

Browse Source
This commit is contained in:
Yu-Ju Hong 2017-02-07 13:57:30 -08:00
parent 3d78271dd9
commit f96611ac45
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/dockershim/docker_service.go
View File

@ -68,6 +68,8 @@ const (
// The expiration time of version cache. // The expiration time of version cache.
versionCacheTTL = 60 * time.Second versionCacheTTL = 60 * time.Second
defaultCgroupDriver = "cgroupfs"
// TODO: https://github.com/kubernetes/kubernetes/pull/31169 provides experimental // TODO: https://github.com/kubernetes/kubernetes/pull/31169 provides experimental
// defaulting of host user namespace that may be enabled when the docker daemon // defaulting of host user namespace that may be enabled when the docker daemon
// is using remapped UIDs. // is using remapped UIDs.
@ -147,18 +149,21 @@ func NewDockerService(client dockertools.DockerInterface, seccompProfileRoot str
glog.Infof("Docker cri networking managed by %v", plug.Name()) glog.Infof("Docker cri networking managed by %v", plug.Name())
// NOTE: cgroup driver is only detectable in docker 1.11+ // NOTE: cgroup driver is only detectable in docker 1.11+
var cgroupDriver string cgroupDriver := defaultCgroupDriver
dockerInfo, err := ds.client.Info() dockerInfo, err := ds.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 cgroupfs as cgroup driver") glog.Warningf("Falling back to use the default driver: %q", cgroupDriver)
} else if len(dockerInfo.CgroupDriver) == 0 {
glog.Warningf("No cgroup driver is set in Docker")
glog.Warningf("Falling back to use the default driver: %q", cgroupDriver)
} else { } else {
cgroupDriver = dockerInfo.CgroupDriver cgroupDriver = dockerInfo.CgroupDriver
}
if len(kubeCgroupDriver) != 0 && kubeCgroupDriver != cgroupDriver { if len(kubeCgroupDriver) != 0 && kubeCgroupDriver != cgroupDriver {
return nil, fmt.Errorf("misconfiguration: kubelet cgroup driver: %q is different from docker cgroup driver: %q", kubeCgroupDriver, cgroupDriver) return nil, fmt.Errorf("misconfiguration: kubelet cgroup driver: %q is different from docker cgroup driver: %q", kubeCgroupDriver, cgroupDriver)
} }
glog.Infof("Setting cgroupDriver to %s", cgroupDriver) glog.Infof("Setting cgroupDriver to %s", cgroupDriver)
}
ds.cgroupDriver = cgroupDriver ds.cgroupDriver = cgroupDriver
ds.versionCache = cache.NewObjectCache( ds.versionCache = cache.NewObjectCache(
func() (interface{}, error) { func() (interface{}, error) {