mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-02 00:07:50 +00:00
Refactor: add import alias to libcontainer cgroup manager
Signed-off-by: Itamar Holder <iholder@redhat.com>
This commit is contained in:
parent
d001d5684e
commit
2a5a6c7fb8
@ -28,7 +28,7 @@ import (
|
||||
|
||||
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
|
||||
"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"
|
||||
libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
|
||||
"k8s.io/klog/v2"
|
||||
@ -242,7 +242,7 @@ func (m *cgroupCommon) Destroy(cgroupConfig *CgroupConfig) error {
|
||||
}()
|
||||
|
||||
libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, false)
|
||||
manager, err := manager.New(libcontainerCgroupConfig)
|
||||
manager, err := libcontainercgroupmanager.New(libcontainerCgroupConfig)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -362,7 +362,7 @@ func (m *cgroupCommon) Update(cgroupConfig *CgroupConfig) error {
|
||||
}()
|
||||
|
||||
libcontainerCgroupConfig := m.libctCgroupConfig(cgroupConfig, true)
|
||||
manager, err := manager.New(libcontainerCgroupConfig)
|
||||
manager, err := libcontainercgroupmanager.New(libcontainerCgroupConfig)
|
||||
if err != nil {
|
||||
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)
|
||||
manager, err := manager.New(libcontainerCgroupConfig)
|
||||
manager, err := libcontainercgroupmanager.New(libcontainerCgroupConfig)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user