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

Add support for image_pull_timeout.

Browse Source
This commit is contained in:
Shishir Mahajan 2021-04-09 10:52:42 -07:00
parent 143104273d
commit 5b7969448a
No known key found for this signature in database
GPG Key ID: D41782E7688DEC4A
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -93,6 +93,7 @@ More detailed instructions are in the [`example README.md`](https://github.com/R
| Option | Type | Required | Description |
| :---: | :---: | :---: | :--- |
| **image** | string | yes | OCI image (docker is also OCI compatible) for your container. |
| **image_pull_timeout** | string | no | A time duration that controls how long `containerd-driver` will wait before cancelling an in-progress pull of the OCI image as specified in `image`. Defaults to `"5m"`. |
| **command** | string | no | Command to override command defined in the image. |
| **args** | []string | no | Arguments to the command. |
| **entrypoint** | []string | no | A string list overriding the image's entrypoint. |

9
containerd/containerd.go
View File

@ -61,8 +61,13 @@ func (d *Driver) getContainerdVersion() (containerd.Version, error) {
return d.client.Version(ctxWithTimeout)
}
func (d *Driver) pullImage(imageName string) (containerd.Image, error) {
ctxWithTimeout, cancel := context.WithTimeout(d.ctxContainerd, 90*time.Second)
func (d *Driver) pullImage(imageName, imagePullTimeout string) (containerd.Image, error) {
pullTimeout, err := time.ParseDuration(imagePullTimeout)
if err != nil {
return nil, fmt.Errorf("Failed to parse image_pull_timeout: %v", err)
}
ctxWithTimeout, cancel := context.WithTimeout(d.ctxContainerd, pullTimeout)
defer cancel()
named, err := refdocker.ParseDockerRef(imageName)

7
containerd/driver.go
View File

@ -104,6 +104,10 @@ var (
hclspec.NewAttr("host_dns", "bool", false),
hclspec.NewLiteral("true"),
),
"image_pull_timeout": hclspec.NewDefault(
hclspec.NewAttr("image_pull_timeout", "string", false),
hclspec.NewLiteral(`"5m"`),
),
"extra_hosts": hclspec.NewAttr("extra_hosts", "list(string)", false),
"entrypoint": hclspec.NewAttr("entrypoint", "list(string)", false),
"seccomp": hclspec.NewAttr("seccomp", "bool", false),
@ -166,6 +170,7 @@ type TaskConfig struct {
Privileged bool `codec:"privileged"`
PidsLimit int64 `codec:"pids_limit"`
HostDNS bool `codec:"host_dns"`
ImagePullTimeout string `codec:"image_pull_timeout"`
ExtraHosts []string `codec:"extra_hosts"`
Entrypoint []string `codec:"entrypoint"`
ReadOnlyRootfs bool `codec:"readonly_rootfs"`
@ -404,7 +409,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
containerConfig.ContainerName = containerName
var err error
containerConfig.Image, err = d.pullImage(driverConfig.Image)
containerConfig.Image, err = d.pullImage(driverConfig.Image, driverConfig.ImagePullTimeout)
if err != nil {
return nil, nil, fmt.Errorf("Error in pulling image %s: %v", driverConfig.Image, err)
}