diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 7e80c09aa4..af5e0a942a 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -188,12 +188,13 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I // Create a cgroup container manager. func createManager(containerName string) *fs.Manager { + allowAllDevices := true return &fs.Manager{ Cgroups: &configs.Cgroup{ Parent: "/", Name: containerName, Resources: &configs.Resources{ - AllowAllDevices: true, + AllowAllDevices: &allowAllDevices, }, }, } @@ -319,7 +320,7 @@ func (cm *containerManagerImpl) setupNode() error { } glog.V(2).Infof("Configure resource-only container %s with memory limit: %d", cm.RuntimeCgroupsName, memoryLimit) - + allowAllDevices := true dockerContainer := &fs.Manager{ Cgroups: &configs.Cgroup{ Parent: "/", @@ -327,7 +328,7 @@ func (cm *containerManagerImpl) setupNode() error { Resources: &configs.Resources{ Memory: memoryLimit, MemorySwap: -1, - AllowAllDevices: true, + AllowAllDevices: &allowAllDevices, }, }, } @@ -370,12 +371,13 @@ func (cm *containerManagerImpl) setupNode() error { if cm.KubeletCgroupsName != "" { cont := newSystemCgroups(cm.KubeletCgroupsName) + allowAllDevices := true manager := fs.Manager{ Cgroups: &configs.Cgroup{ Parent: "/", Name: cm.KubeletCgroupsName, Resources: &configs.Resources{ - AllowAllDevices: true, + AllowAllDevices: &allowAllDevices, }, }, } diff --git a/pkg/util/resourcecontainer/resource_container_linux.go b/pkg/util/resourcecontainer/resource_container_linux.go index f7c2046a09..86477c5aa2 100644 --- a/pkg/util/resourcecontainer/resource_container_linux.go +++ b/pkg/util/resourcecontainer/resource_container_linux.go @@ -30,12 +30,13 @@ import ( // // containerName must be an absolute container name. func RunInResourceContainer(containerName string) error { + allowAllDevices := true manager := fs.Manager{ Cgroups: &configs.Cgroup{ Parent: "/", Name: containerName, Resources: &configs.Resources{ - AllowAllDevices: true, + AllowAllDevices: &allowAllDevices, }, }, }