Skip to content

Commit 0d2a493

Browse files
committed
kubelet: skip setting the devices cgroup
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 <[email protected]>
1 parent c655a5b commit 0d2a493

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

pkg/kubelet/cm/cgroup_manager_linux.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ func setResourcesV2(cgroupConfig *libcontainerconfigs.Cgroup) error {
495495
Major: libcontainerconfigs.Wildcard,
496496
},
497497
}
498+
cgroupConfig.Resources.SkipDevices = true
498499

499500
manager, err := cgroupfs2.NewManager(cgroupConfig, cgroupConfig.Path, false)
500501
if err != nil {
@@ -517,6 +518,7 @@ func (m *cgroupManagerImpl) toResources(resourceConfig *ResourceConfig) *libcont
517518
Major: libcontainerconfigs.Wildcard,
518519
},
519520
},
521+
SkipDevices: true,
520522
}
521523
if resourceConfig == nil {
522524
return resources

pkg/kubelet/cm/container_manager_linux.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ func createManager(containerName string) (cgroups.Manager, error) {
384384
Major: configs.Wildcard,
385385
},
386386
},
387+
SkipDevices: true,
387388
},
388389
}
389390

pkg/kubelet/dockershim/cm/container_manager_linux.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@ func createCgroupManager(name string) (cgroups.Manager, error) {
123123
Parent: "/",
124124
Name: name,
125125
Resources: &configs.Resources{
126-
Memory: int64(memoryLimit),
127-
MemorySwap: -1,
126+
Memory: int64(memoryLimit),
127+
MemorySwap: -1,
128+
SkipDevices: true,
128129
Devices: []*configs.DeviceRule{
129130
{
130131
Minor: configs.Wildcard,

0 commit comments

Comments
 (0)