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

Add support for consul templates.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-09-22 14:11:52 -07:00
parent 6045772ad8
commit c79c4e4c30
No known key found for this signature in database
GPG Key ID: D41782E7688DEC4A
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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)
}
func (d *Driver) createContainer(image containerd.Image, containerName, containerSnapshotName, containerdRuntime, netnsPath string, env []string, config *TaskConfig) (containerd.Container, error) {
func (d *Driver) createContainer(image containerd.Image, containerName, containerSnapshotName, containerdRuntime, netnsPath, secretsDir, taskDir 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.")
}
@ -119,14 +119,22 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
return nil, fmt.Errorf("Options cannot be empty for mount type: %s. You need to atleast pass rbind and ro.", mount.Type)
}
m := specs.Mount{}
m.Type = mount.Type
m.Destination = mount.Target
m.Source = mount.Source
m.Options = mount.Options
m := buildMountpoint(mount.Type, mount.Target, mount.Source, mount.Options)
mounts = append(mounts, m)
}
// Setup "/secrets" (NOMAD_SECRETS_DIR) in the container.
if secretsDir != "" {
secretsMount := buildMountpoint("bind", "/secrets", 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"})
mounts = append(mounts, taskMount)
}
if len(mounts) > 0 {
opts = append(opts, oci.WithMounts(mounts))
}
@ -150,6 +158,16 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
)
}
// buildMountpoint builds the mount point for the container.
func buildMountpoint(mountType, mountTarget, mountSource string, mountOptions []string) specs.Mount {
m := specs.Mount{}
m.Type = mountType
m.Destination = mountTarget
m.Source = mountSource
m.Options = mountOptions
return m
}
func (d *Driver) loadContainer(id string) (containerd.Container, error) {
return d.client.LoadContainer(d.ctxContainerd, id)
}

9
containerd/driver.go
View File

@ -357,10 +357,17 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
// Setup environment variables.
var env []string
var secretsDir, taskDir string
for key, val := range cfg.Env {
if skipOverride(key) {
continue
}
if key == "NOMAD_SECRETS_DIR" {
secretsDir = val
}
if key == "NOMAD_TASK_DIR" {
taskDir = val
}
env = append(env, fmt.Sprintf("%s=%s", key, val))
}
@ -370,7 +377,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
netnsPath = cfg.NetworkIsolation.Path
}
container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, netnsPath, env, &driverConfig)
container, err := d.createContainer(image, containerName, containerSnapshotName, d.config.ContainerdRuntime, netnsPath, secretsDir, taskDir, env, &driverConfig)
if err != nil {
return nil, nil, fmt.Errorf("Error in creating container: %v", err)
}