diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index c64067a3712..7c153703bb9 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -449,8 +449,7 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error { }() // Extract the cgroup resource parameters - resourceConfig := cgroupConfig.ResourceParameters - resources := m.toResources(resourceConfig) + resources := m.toResources(cgroupConfig.ResourceParameters) libcontainerCgroupConfig := &libcontainerconfigs.Cgroup{ Resources: resources, @@ -470,10 +469,6 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error { updateSystemdCgroupInfo(libcontainerCgroupConfig, cgroupConfig.Name) } - if cgroupConfig.ResourceParameters != nil && cgroupConfig.ResourceParameters.PidsLimit != nil { - resources.PidsLimit = *cgroupConfig.ResourceParameters.PidsLimit - } - if unified { supportedControllers := getSupportedUnifiedControllers() if !supportedControllers.Has("hugetlb") { @@ -512,10 +507,6 @@ func (m *cgroupManagerImpl) Create(cgroupConfig *CgroupConfig) error { libcontainerCgroupConfig.Path = cgroupConfig.Name.ToCgroupfs() } - if cgroupConfig.ResourceParameters != nil && cgroupConfig.ResourceParameters.PidsLimit != nil { - libcontainerCgroupConfig.PidsLimit = *cgroupConfig.ResourceParameters.PidsLimit - } - // get the manager with the specified cgroup configuration manager, err := m.adapter.newManager(libcontainerCgroupConfig, nil) if err != nil {