github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

pkg/kubelet/cm: rm dup code

Browse Source 
Commit ecd6361f added setting PidsLimit to Create and Update.

Commit bce9d5f2 added setting PidsLimit to m.toResources.

Now, PidsLimit is assigned twice.

Remove the duplicate.

Fixes: bce9d5f2
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2021-08-23 14:06:46 -07:00
parent a673b64864
commit 59148e22d0
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,8 +449,7 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error {
}() }()
// Extract the cgroup resource parameters // Extract the cgroup resource parameters
resourceConfig := cgroupConfig.ResourceParameters resources := m.toResources(cgroupConfig.ResourceParameters)
resources := m.toResources(resourceConfig)
libcontainerCgroupConfig := &libcontainerconfigs.Cgroup{ libcontainerCgroupConfig := &libcontainerconfigs.Cgroup{
Resources: resources, Resources: resources,
@ -470,10 +469,6 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error {
updateSystemdCgroupInfo(libcontainerCgroupConfig, cgroupConfig.Name) updateSystemdCgroupInfo(libcontainerCgroupConfig, cgroupConfig.Name)
} }
if cgroupConfig.ResourceParameters != nil && cgroupConfig.ResourceParameters.PidsLimit != nil {
resources.PidsLimit = *cgroupConfig.ResourceParameters.PidsLimit
}
if unified { if unified {
supportedControllers := getSupportedUnifiedControllers() supportedControllers := getSupportedUnifiedControllers()
if !supportedControllers.Has("hugetlb") { if !supportedControllers.Has("hugetlb") {
@ -512,10 +507,6 @@ func (m *cgroupManagerImpl) Create(cgroupConfig *CgroupConfig) error {
libcontainerCgroupConfig.Path = cgroupConfig.Name.ToCgroupfs() 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 // get the manager with the specified cgroup configuration
manager, err := m.adapter.newManager(libcontainerCgroupConfig, nil) manager, err := m.adapter.newManager(libcontainerCgroupConfig, nil)
if err != nil { if err != nil {