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

Merge pull request #43 from Roblox/alloc

Browse Source 
Bind mount ${NOMAD_ALLOC_DIR} into the container.
This commit is contained in:
Shishir 2020-09-23 13:47:04 -07:00 committed by GitHub
commit 737e022a1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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, netnsPath, secretsDir, taskDir string, env []string, config *TaskConfig) (containerd.Container, error) { func (d *Driver) createContainer(image containerd.Image, containerName, containerSnapshotName, containerdRuntime, netnsPath, secretsDir, taskDir, allocDir 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.")
} }
@ -135,6 +135,12 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
mounts = append(mounts, taskMount) mounts = append(mounts, taskMount)
} }
// Setup "/alloc" (NOMAD_ALLOC_DIR) in the container.
if allocDir != "" {
allocMount := buildMountpoint("bind", "/alloc", allocDir, []string{"rbind", "ro"})
mounts = append(mounts, allocMount)
}
if len(mounts) > 0 { if len(mounts) > 0 {
opts = append(opts, oci.WithMounts(mounts)) opts = append(opts, oci.WithMounts(mounts))
} }

7
containerd/driver.go
View File

@ -357,7 +357,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
// Setup environment variables. // Setup environment variables.
var env []string var env []string
var secretsDir, taskDir string var secretsDir, taskDir, allocDir string
for key, val := range cfg.Env { for key, val := range cfg.Env {
if skipOverride(key) { if skipOverride(key) {
continue continue
@ -368,6 +368,9 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
if key == "NOMAD_TASK_DIR" { if key == "NOMAD_TASK_DIR" {
taskDir = val taskDir = val
} }
if key == "NOMAD_ALLOC_DIR" {
allocDir = val
}
env = append(env, fmt.Sprintf("%s=%s", key, val)) env = append(env, fmt.Sprintf("%s=%s", key, val))
} }
@ -377,7 +380,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
netnsPath = cfg.NetworkIsolation.Path netnsPath = cfg.NetworkIsolation.Path
} }
container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, netnsPath, secretsDir, taskDir, env, &driverConfig) container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, netnsPath, secretsDir, taskDir, allocDir, 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)
} }