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

Fix review comments: Add ContainerConfig struct.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-09-28 19:08:02 -07:00
parent a54d675d08
commit 44b3fc82bc
No known key found for this signature in database
GPG Key ID: D41782E7688DEC4A
2 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
containerd/containerd.go
View File

@ -29,6 +29,19 @@ import (
specs "github.com/opencontainers/runtime-spec/specs-go"
)
type ContainerConfig struct {
Image containerd.Image
ContainerName string
ContainerSnapshotName string
NetworkNamespacePath string
SecretsDir string
TaskDir string
AllocDir string
Env []string
MemoryLimit int64
CPUShares int64
}
func (d *Driver) isContainerdRunning() (bool, error) {
return d.client.IsServing(d.ctxContainerd)
}
@ -41,7 +54,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, netnsPath, secretsDir, taskDir, allocDir string, env []string, memoryLimit, cpuShares int64, config *TaskConfig) (containerd.Container, error) {
func (d *Driver) createContainer(containerConfig *ContainerConfig, config *TaskConfig) (containerd.Container, error) {
if config.Command == "" && len(config.Args) > 0 {
return nil, fmt.Errorf("Command is empty. Cannot set --args without --command.")
}
@ -59,7 +72,7 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
var opts []oci.SpecOpts
opts = append(opts, oci.WithImageConfigArgs(image, args))
opts = append(opts, oci.WithImageConfigArgs(containerConfig.Image, args))
// Enable privileged mode.
if config.Privileged {
@ -103,13 +116,13 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
}
// Set environment variables.
opts = append(opts, oci.WithEnv(env))
opts = append(opts, oci.WithEnv(containerConfig.Env))
// Set cgroups memory limit.
opts = append(opts, oci.WithMemoryLimit(uint64(memoryLimit)))
opts = append(opts, oci.WithMemoryLimit(uint64(containerConfig.MemoryLimit)))
// Set CPU Shares.
opts = append(opts, oci.WithCPUShares(uint64(cpuShares)))
opts = append(opts, oci.WithCPUShares(uint64(containerConfig.CPUShares)))
// Add linux devices into the container.
for _, device := range config.Devices {
@ -130,20 +143,20 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
}
// Setup "/secrets" (NOMAD_SECRETS_DIR) in the container.
if secretsDir != "" {
secretsMount := buildMountpoint("bind", "/secrets", secretsDir, []string{"rbind", "ro"})
if containerConfig.SecretsDir != "" {
secretsMount := buildMountpoint("bind", "/secrets", containerConfig.SecretsDir, []string{"rbind", "ro"})
mounts = append(mounts, secretsMount)
}
// Setup "/local" (NOMAD_TASK_DIR) in the container.
if taskDir != "" {
taskMount := buildMountpoint("bind", "/local", taskDir, []string{"rbind", "ro"})
if containerConfig.TaskDir != "" {
taskMount := buildMountpoint("bind", "/local", containerConfig.TaskDir, []string{"rbind", "ro"})
mounts = append(mounts, taskMount)
}
// Setup "/alloc" (NOMAD_ALLOC_DIR) in the container.
if allocDir != "" {
allocMount := buildMountpoint("bind", "/alloc", allocDir, []string{"rbind", "ro"})
if containerConfig.AllocDir != "" {
allocMount := buildMountpoint("bind", "/alloc", containerConfig.AllocDir, []string{"rbind", "ro"})
mounts = append(mounts, allocMount)
}
@ -154,18 +167,18 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
// nomad use CNI plugins e.g bridge to setup a network (and network namespace) for the container.
// CNI plugins need to be installed under /opt/cni/bin.
// network namespace is created at /var/run/netns/<id>.
// netnsPath is the path to the network namespace, which containerd joins to provide network
// for the container.
// containerConfig.NetworkNamespacePath is the path to the network namespace, which
// containerd joins to provide network for the container.
// NOTE: Only bridge networking mode is supported at this point.
if netnsPath != "" {
opts = append(opts, oci.WithLinuxNamespace(specs.LinuxNamespace{Type: specs.NetworkNamespace, Path: netnsPath}))
if containerConfig.NetworkNamespacePath != "" {
opts = append(opts, oci.WithLinuxNamespace(specs.LinuxNamespace{Type: specs.NetworkNamespace, Path: containerConfig.NetworkNamespacePath}))
}
return d.client.NewContainer(
d.ctxContainerd,
containerName,
containerd.WithRuntime(containerdRuntime, nil),
containerd.WithNewSnapshot(containerSnapshotName, image),
containerConfig.ContainerName,
containerd.WithRuntime(d.config.ContainerdRuntime, nil),
containerd.WithNewSnapshot(containerConfig.ContainerSnapshotName, containerConfig.Image),
containerd.WithNewSpec(opts...),
)
}

29
containerd/driver.go
View File

@ -336,6 +336,8 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
return nil, nil, fmt.Errorf("failed to decode driver config: %v", err)
}
containerConfig := ContainerConfig{}
if driverConfig.HostNetwork && cfg.NetworkIsolation != nil {
return nil, nil, fmt.Errorf("host_network and bridge network mode are mutually exclusive, and only one of them should be set")
}
@ -347,45 +349,44 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
// Generate a random container name using docker namesgenerator package.
// https://github.com/moby/moby/blob/master/pkg/namesgenerator/names-generator.go
containerName := cfg.AllocID[:8] + "_" + namesgenerator.GetRandomName(1)
containerConfig.ContainerName = containerName
image, err := d.pullImage(driverConfig.Image)
var err error
containerConfig.Image, err = d.pullImage(driverConfig.Image)
if err != nil {
return nil, nil, fmt.Errorf("Error in pulling image: %v", err)
}
d.logger.Info(fmt.Sprintf("Successfully pulled %s image\n", image.Name()))
d.logger.Info(fmt.Sprintf("Successfully pulled %s image\n", containerConfig.Image.Name()))
// Setup environment variables.
var env []string
var secretsDir, taskDir, allocDir string
for key, val := range cfg.Env {
if skipOverride(key) {
continue
}
if key == "NOMAD_SECRETS_DIR" {
secretsDir = val
containerConfig.SecretsDir = val
}
if key == "NOMAD_TASK_DIR" {
taskDir = val
containerConfig.TaskDir = val
}
if key == "NOMAD_ALLOC_DIR" {
allocDir = val
containerConfig.AllocDir = val
}
env = append(env, fmt.Sprintf("%s=%s", key, val))
containerConfig.Env = append(containerConfig.Env, fmt.Sprintf("%s=%s", key, val))
}
containerSnapshotName := fmt.Sprintf("%s-snapshot", containerName)
var netnsPath string
containerConfig.ContainerSnapshotName = fmt.Sprintf("%s-snapshot", containerName)
if cfg.NetworkIsolation != nil && cfg.NetworkIsolation.Path != "" {
netnsPath = cfg.NetworkIsolation.Path
containerConfig.NetworkNamespacePath = cfg.NetworkIsolation.Path
}
// memory and cpu are coming from the resources stanza of the nomad job.
// https://www.nomadproject.io/docs/job-specification/resources
memoryLimit := cfg.Resources.LinuxResources.MemoryLimitBytes
cpuShares := cfg.Resources.LinuxResources.CPUShares
containerConfig.MemoryLimit = cfg.Resources.LinuxResources.MemoryLimitBytes
containerConfig.CPUShares = cfg.Resources.LinuxResources.CPUShares
container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, netnsPath, secretsDir, taskDir, allocDir, env, memoryLimit, cpuShares, &driverConfig)
container, err := d.createContainer(&containerConfig, &driverConfig)
if err != nil {
return nil, nil, fmt.Errorf("Error in creating container: %v", err)
}