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

Updates.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-08-26 14:55:14 -07:00
parent c872343d45
commit d02f35f2d5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containerd/containerd.go
View File

@ -41,7 +41,7 @@ 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, containerdRuntime, networkNamespacePath string, env []string, config *TaskConfig) (containerd.Container, error) { func (d *Driver) createContainer(image containerd.Image, containerName, containerSnapshotName, containerdRuntime, netnsPath string, env []string, config *TaskConfig) (containerd.Container, error) {
if config.Command == "" && len(config.Args) > 0 { if config.Command == "" && len(config.Args) > 0 {
return nil, fmt.Errorf("Command is empty. Cannot set --args without --command.") return nil, fmt.Errorf("Command is empty. Cannot set --args without --command.")
} }
@ -123,8 +123,8 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
opts = append(opts, oci.WithMounts(mounts)) opts = append(opts, oci.WithMounts(mounts))
} }
if networkNamespacePath != "" { if netnsPath != "" {
opts = append(opts, oci.WithLinuxNamespace(specs.LinuxNamespace{Type: specs.NetworkNamespace, Path: networkNamespacePath})) opts = append(opts, oci.WithLinuxNamespace(specs.LinuxNamespace{Type: specs.NetworkNamespace, Path: netnsPath}))
} }
return d.client.NewContainer( return d.client.NewContainer(

6
containerd/driver.go
View File

@ -360,12 +360,12 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
} }
containerSnapshotName := fmt.Sprintf("%s-snapshot", containerName) containerSnapshotName := fmt.Sprintf("%s-snapshot", containerName)
var networkNamespacePath string var netnsPath string
if cfg.NetworkIsolation != nil && cfg.NetworkIsolation.Path != "" { if cfg.NetworkIsolation != nil && cfg.NetworkIsolation.Path != "" {
networkNamespacePath = cfg.NetworkIsolation.Path netnsPath = cfg.NetworkIsolation.Path
} }
container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, networkNamespacePath, env, &driverConfig) container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, netnsPath, env, &driverConfig)
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)
} }