burble/nomad-driver-containerd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make containerd runtime configurable.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-05-12 14:51:00 -07:00
parent 74716f2f71
commit 2e3aad4ca3
No known key found for this signature in database
GPG Key ID: D41782E7688DEC4A
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
containerd/containerd.go
View File

@ -18,10 +18,11 @@ func (d *Driver) pullImage(imageName string) (containerd.Image, error) {
return d.client.Pull(d.ctxContainerd, imageName, containerd.WithPullUnpack) return d.client.Pull(d.ctxContainerd, imageName, containerd.WithPullUnpack)
} }
func (d *Driver) createContainer(image containerd.Image, containerName, containerSnapshotName string) (containerd.Container, error) { func (d *Driver) createContainer(image containerd.Image, containerName, containerSnapshotName, containerdRuntime string) (containerd.Container, error) {
return d.client.NewContainer( return d.client.NewContainer(
d.ctxContainerd, d.ctxContainerd,
containerName, containerName,
containerd.WithRuntime(containerdRuntime, nil),
containerd.WithNewSnapshot(containerSnapshotName, image), containerd.WithNewSnapshot(containerSnapshotName, image),
containerd.WithNewSpec(oci.WithImageConfig(image)), containerd.WithNewSpec(oci.WithImageConfig(image)),
) )

7
containerd/driver.go
View File

@ -59,6 +59,7 @@ var (
hclspec.NewAttr("enabled", "bool", false), hclspec.NewAttr("enabled", "bool", false),
hclspec.NewLiteral("true"), hclspec.NewLiteral("true"),
), ),
"containerd_runtime": hclspec.NewAttr("containerd_runtime", "string", true),
}) })
// taskConfigSpec is the specification of the plugin's configuration for // taskConfigSpec is the specification of the plugin's configuration for
@ -81,7 +82,8 @@ var (
// Config contains configuration information for the plugin // Config contains configuration information for the plugin
type Config struct { type Config struct {
Enabled bool `codec:"enabled"` Enabled bool `codec:"enabled"`
ContainerdRuntime string `codec:"containerd_runtime"`
} }
// TaskConfig contains configuration information for a task that runs with // TaskConfig contains configuration information for a task that runs with
@ -289,9 +291,10 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
} }
d.logger.Info("Successfully pulled %s image\n", image.Name()) d.logger.Info("Successfully pulled %s image\n", image.Name())
d.logger.Info("Containerd runtime: %s\n", d.config.ContainerdRuntime)
containerSnapshotName := fmt.Sprintf("%s-snapshot", containerName) containerSnapshotName := fmt.Sprintf("%s-snapshot", containerName)
container, err := d.createContainer(image, containerName, containerSnapshotName) container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("Error in creating container: %v", err) return nil, nil, fmt.Errorf("Error in creating container: %v", err)
} }

1
example/agent.hcl
View File

@ -3,5 +3,6 @@ log_level = "INFO"
plugin "containerd-driver" { plugin "containerd-driver" {
config { config {
enabled = true enabled = true
containerd_runtime = "io.containerd.runtime.v1.linux"
} }
} }