github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: skip setting the devices cgroup

Browse Source 
use the new libcontainer feature of skipping setting the devices
cgroup.  This is necessary on cgroup v2 to avoid leaking a eBPF
program every time the cgroup is re-configured.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-07-07 08:56:15 +02:00
parent c655a5b636
commit 0d2a493a8f
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/cgroup_manager_linux.go
View File

@ -495,6 +495,7 @@ func setResourcesV2(cgroupConfig *libcontainerconfigs.Cgroup) error {
Major: libcontainerconfigs.Wildcard, Major: libcontainerconfigs.Wildcard,
}, },
} }
cgroupConfig.Resources.SkipDevices = true
manager, err := cgroupfs2.NewManager(cgroupConfig, cgroupConfig.Path, false) manager, err := cgroupfs2.NewManager(cgroupConfig, cgroupConfig.Path, false)
if err != nil { if err != nil {
@ -517,6 +518,7 @@ func (m *cgroupManagerImpl) toResources(resourceConfig *ResourceConfig) *libcont
Major: libcontainerconfigs.Wildcard, Major: libcontainerconfigs.Wildcard,
}, },
}, },
SkipDevices: true,
} }
if resourceConfig == nil { if resourceConfig == nil {
return resources return resources

1
pkg/kubelet/cm/container_manager_linux.go
View File

@ -384,6 +384,7 @@ func createManager(containerName string) (cgroups.Manager, error) {
Major: configs.Wildcard, Major: configs.Wildcard,
}, },
}, },
SkipDevices: true,
}, },
} }

1
pkg/kubelet/dockershim/cm/container_manager_linux.go
View File

@ -125,6 +125,7 @@ func createCgroupManager(name string) (cgroups.Manager, error) {
Resources: &configs.Resources{ Resources: &configs.Resources{
Memory: int64(memoryLimit), Memory: int64(memoryLimit),
MemorySwap: -1, MemorySwap: -1,
SkipDevices: true,
Devices: []*configs.DeviceRule{ Devices: []*configs.DeviceRule{
{ {
Minor: configs.Wildcard, Minor: configs.Wildcard,