Swicth to 1.0.0-alpha2 containerd api.

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown
2017-07-24 20:24:04 -05:00
committed by Lantao Liu
parent 6017d84040
commit 73748840da
21 changed files with 246 additions and 151 deletions

View File

@@ -20,9 +20,10 @@ import (
"fmt"
"github.com/containerd/containerd"
"github.com/containerd/containerd/api/services/containers"
"github.com/containerd/containerd/api/services/execution"
versionapi "github.com/containerd/containerd/api/services/version"
"github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/api/services/tasks/v1"
versionapi "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
diffservice "github.com/containerd/containerd/services/diff"
@@ -71,9 +72,9 @@ type criContainerdService struct {
// imageStore stores all resources associated with images.
imageStore *imagestore.Store
// containerService is containerd containers client.
containerService containers.ContainersClient
containerService containers.Store
// taskService is containerd tasks client.
taskService execution.TasksClient
taskService tasks.TasksClient
// contentStoreService is the containerd content service client.
contentStoreService content.Store
// snapshotService is the containerd snapshot service client.
@@ -93,6 +94,8 @@ type criContainerdService struct {
agentFactory agents.AgentFactory
// client is an instance of the containerd client
client *containerd.Client
// eventsService is the containerd task service client
eventService events.EventsClient
}
// NewCRIContainerdService returns a new instance of CRIContainerdService
@@ -117,12 +120,14 @@ func NewCRIContainerdService(containerdEndpoint, rootDir, networkPluginBinDir, n
taskService: client.TaskService(),
imageStoreService: client.ImageService(),
contentStoreService: client.ContentStore(),
snapshotService: client.SnapshotService(),
diffService: client.DiffService(),
versionService: client.VersionService(),
healthService: client.HealthService(),
agentFactory: agents.NewAgentFactory(),
client: client,
// Use daemon default snapshotter.
snapshotService: client.SnapshotService(""),
diffService: client.DiffService(),
versionService: client.VersionService(),
healthService: client.HealthService(),
agentFactory: agents.NewAgentFactory(),
client: client,
eventService: client.EventService(),
}
netPlugin, err := ocicni.InitCNI(networkPluginBinDir, networkPluginConfDir)