github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add runtime cgroup and fix a cli panic.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-01-25 22:01:05 +00:00
parent 11042a4141
commit e7f2a74a84
8 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/service.go
View File

@@ -75,7 +75,7 @@ type CRIContainerdService interface {
// criContainerdService implements CRIContainerdService.
type criContainerdService struct {
// config contains all configurations.
config options.CRIConfig
config options.Config
// imageFSUUID is the device uuid of image filesystem.
imageFSUUID string
// apparmorEnabled indicates whether apparmor is enabled.
@@ -114,7 +114,7 @@ type criContainerdService struct {
}
// NewCRIContainerdService returns a new instance of CRIContainerdService
func NewCRIContainerdService(config options.CRIConfig) (CRIContainerdService, error) {
func NewCRIContainerdService(config options.Config) (CRIContainerdService, error) {
var err error
c := &criContainerdService{
config: config,

2
pkg/server/service_test.go
View File

@@ -39,7 +39,7 @@ const (
// newTestCRIContainerdService creates a fake criContainerdService for test.
func newTestCRIContainerdService() *criContainerdService {
return &criContainerdService{
config: options.CRIConfig{
config: options.Config{
RootDir: testRootDir,
PluginConfig: options.PluginConfig{
SandboxImage: testSandboxImage,