From d02f35f2d53170eeba4c9021d59038338831e1dc Mon Sep 17 00:00:00 2001 From: Shishir Mahajan Date: Wed, 26 Aug 2020 14:55:14 -0700 Subject: [PATCH] Updates. --- containerd/containerd.go | 6 +++--- containerd/driver.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/containerd/containerd.go b/containerd/containerd.go index 66ee143..d76ee52 100644 --- a/containerd/containerd.go +++ b/containerd/containerd.go @@ -41,7 +41,7 @@ func (d *Driver) pullImage(imageName string) (containerd.Image, error) { 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 { 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)) } - if networkNamespacePath != "" { - opts = append(opts, oci.WithLinuxNamespace(specs.LinuxNamespace{Type: specs.NetworkNamespace, Path: networkNamespacePath})) + if netnsPath != "" { + opts = append(opts, oci.WithLinuxNamespace(specs.LinuxNamespace{Type: specs.NetworkNamespace, Path: netnsPath})) } return d.client.NewContainer( diff --git a/containerd/driver.go b/containerd/driver.go index 8c95dda..d50294d 100644 --- a/containerd/driver.go +++ b/containerd/driver.go @@ -360,12 +360,12 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive } containerSnapshotName := fmt.Sprintf("%s-snapshot", containerName) - var networkNamespacePath string + var netnsPath string 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 { return nil, nil, fmt.Errorf("Error in creating container: %v", err) }