diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index 90393298138..7d2644026fd 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -33,7 +33,6 @@ import ( "github.com/opencontainers/runc/libcontainer/cgroups/fscommon" cgroupsystemd "github.com/opencontainers/runc/libcontainer/cgroups/systemd" libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs" - libcontainerdevices "github.com/opencontainers/runc/libcontainer/devices" "k8s.io/klog/v2" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" @@ -380,15 +379,6 @@ func getSupportedUnifiedControllers() sets.String { func (m *cgroupManagerImpl) toResources(resourceConfig *ResourceConfig) *libcontainerconfigs.Resources { resources := &libcontainerconfigs.Resources{ - Devices: []*libcontainerdevices.Rule{ - { - Type: 'a', - Permissions: "rwm", - Allow: true, - Minor: libcontainerdevices.Wildcard, - Major: libcontainerdevices.Wildcard, - }, - }, SkipDevices: true, } if resourceConfig == nil { diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 31a728b7291..d7aa6270f2b 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -38,7 +38,6 @@ import ( utilio "k8s.io/utils/io" utilpath "k8s.io/utils/path" - libcontainerdevices "github.com/opencontainers/runc/libcontainer/devices" libcontaineruserns "github.com/opencontainers/runc/libcontainer/userns" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -396,15 +395,6 @@ func createManager(containerName string) (cgroups.Manager, error) { Parent: "/", Name: containerName, Resources: &configs.Resources{ - Devices: []*libcontainerdevices.Rule{ - { - Type: 'a', - Permissions: "rwm", - Allow: true, - Minor: libcontainerdevices.Wildcard, - Major: libcontainerdevices.Wildcard, - }, - }, SkipDevices: true, }, } diff --git a/pkg/kubelet/dockershim/cm/container_manager_linux.go b/pkg/kubelet/dockershim/cm/container_manager_linux.go index f515a5bfb25..aa32936e726 100644 --- a/pkg/kubelet/dockershim/cm/container_manager_linux.go +++ b/pkg/kubelet/dockershim/cm/container_manager_linux.go @@ -28,7 +28,6 @@ import ( "github.com/opencontainers/runc/libcontainer/cgroups" cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs" "github.com/opencontainers/runc/libcontainer/configs" - libcontainerdevices "github.com/opencontainers/runc/libcontainer/devices" utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" @@ -127,15 +126,6 @@ func createCgroupManager(name string) (cgroups.Manager, error) { Memory: int64(memoryLimit), MemorySwap: -1, SkipDevices: true, - Devices: []*libcontainerdevices.Rule{ - { - Minor: libcontainerdevices.Wildcard, - Major: libcontainerdevices.Wildcard, - Type: 'a', - Permissions: "rwm", - Allow: true, - }, - }, }, } return cgroupfs.NewManager(cg, nil, false), nil