github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Refactor: add import alias to libcontainer cgroup manager

Browse Source 
Signed-off-by: Itamar Holder <iholder@redhat.com>
This commit is contained in:
Itamar Holder 2024-04-07 10:24:39 +03:00
parent d001d5684e
commit 2a5a6c7fb8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ import (
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups" libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon" "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
"github.com/opencontainers/runc/libcontainer/cgroups/manager" libcontainercgroupmanager "github.com/opencontainers/runc/libcontainer/cgroups/manager"
cgroupsystemd "github.com/opencontainers/runc/libcontainer/cgroups/systemd" cgroupsystemd "github.com/opencontainers/runc/libcontainer/cgroups/systemd"
libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs" libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
"k8s.io/klog/v2" "k8s.io/klog/v2"
@ -242,7 +242,7 @@ func (m *cgroupCommon) Destroy(cgroupConfig *CgroupConfig) error {
}() }()
libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, false) libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, false)
manager, err := manager.New(libcontainerCgroupConfig) manager, err := libcontainercgroupmanager.New(libcontainerCgroupConfig)
if err != nil { if err != nil {
return err return err
} }
@ -362,7 +362,7 @@ func (m *cgroupCommon) Update(cgroupConfig *CgroupConfig) error {
}() }()
libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, true) libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, true)
manager, err := manager.New(libcontainerCgroupConfig) manager, err := libcontainercgroupmanager.New(libcontainerCgroupConfig)
if err != nil { if err != nil {
return fmt.Errorf("failed to create cgroup manager: %v", err) return fmt.Errorf("failed to create cgroup manager: %v", err)
} }
@ -377,7 +377,7 @@ func (m *cgroupCommon) Create(cgroupConfig *CgroupConfig) error {
}() }()
libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, true) libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, true)
manager, err := manager.New(libcontainerCgroupConfig) manager, err := libcontainercgroupmanager.New(libcontainerCgroupConfig)
if err != nil { if err != nil {
return err return err
} }