Commit Graph

4116 Commits

Author SHA1 Message Date
Derek McGowan
9ca687be63
Merge pull request #2522 from jterry75/runc_typo
Fix a typo in runc-v1 shim
2018-08-02 12:50:53 -07:00
Samuel Karp
9665a2650a *: replace 3600 seconds with 1 hour
Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-08-02 11:40:03 -07:00
Justin Terry (VM)
9936370fef Refactors the TasksService requires per platform
Removes the start dependency on V1 runtimes in the TasksService for:
// +build windows_v2. For unix and windows (v1) this code remains to load all
v1 runtimes as expected.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-02 11:20:35 -07:00
Justin Terry (VM)
9ff702b9a1 Fix a typo in runc-v1 shim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-02 11:16:31 -07:00
Phil Estes
b8f4c7a9bd
Merge pull request #2520 from dmcgowan/use-pause-multiplatform-test
Update multi-arch image tests
2018-08-01 16:49:52 -04:00
Michael Crosby
d3887f6764
Merge pull request #2519 from jterry75/various_win_fixes
Various Windows fixes to support the runtime v2 shim workflow
2018-08-01 16:40:04 -04:00
Justin Terry (VM)
dcb905701c Adds retry support to Windows AnonDialer
Adds retry support to AnonDialer if the pipe does not exist. This will
retry up to the timeout for the pipe to exist and connect. This solves
the race between the containerd-shim-* start command and the
reinvocation.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-01 13:22:25 -07:00
Justin Terry (VM)
790c3a3663 Remove extra allocation in NewTask
Reorders the code so that it doesnt overwrite the previous allocation
when creating a NewTask via ctr.exe

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-01 13:22:18 -07:00
Michael Crosby
123de20b59
Merge pull request #2517 from estesp/fix-travis-script
Fix loss of CRI test failure status in CI
2018-08-01 14:50:17 -04:00
Derek McGowan
438b3cb694
Update multi-arch image tests
Ensure the test pull for all platforms uses a multi-arch image
Use the pause container for testing specific platforms
Update the image unpack test to be explicit about the platform to unpack

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-01 11:22:07 -07:00
Phil Estes
9622369f0e
Fix loss of CRI test failure status in CI
Prior PR fixed the wrong use of `exit` built-in within a Travis script,
but lost the reporting of a failure result of CRI testing in the process.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-08-01 13:54:16 -04:00
Justin Terry (VM)
6a252a7141 IO Windows remove unused wait group
Removes an unused and unneeded wait group.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-01 09:54:31 -07:00
Derek McGowan
efb04a3361
Merge pull request #2513 from dmcgowan/set-default-platform-withplatform
Fix for empty platform
2018-07-31 17:38:23 -07:00
Derek McGowan
9dc55ea1d2
Merge pull request #2514 from jterry75/runtime_v2_shim_command
Runtime v2 absolute shim path to executable
2018-07-31 16:26:23 -07:00
Derek McGowan
d64d8a06d5
Use image constructor in client
Replace manual image struct creation with the image
constructor which is there to do just that.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-31 15:23:08 -07:00
Derek McGowan
3629344e6e
Ensure specifying an empty platform is treated as default
The default platform had previously been provided using the
empty string. This change ensures that the platforms
field is always filled in correctly and empty string is
properly interpreted.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-31 15:08:59 -07:00
Justin Terry (VM)
9f13b74f4a Runtime v2 absolute shim path to executable
Fixes an issue where the runtime v2 was not using an absolute path to
the executable but setting the .Dir field on the exec.Cmd. This causes
the executable to need to be relative to .Dir but no shim is actually
copied to the bundle directory that its work dir is set to.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-07-31 15:07:55 -07:00
Kenfe-Mickaël Laventure
875b92c507
Merge pull request #2512 from crosbymichael/gpupath
Add nvidia Opts to lookup containerd binary or hook path
2018-07-31 09:28:33 -07:00
Phil Estes
ed0e73422d
Merge pull request #2468 from dmcgowan/set-platform-on-unpack
Update client Image to have configurable platform
2018-07-31 11:56:09 -04:00
Phil Estes
4249f44d81
Merge pull request #2493 from dmcgowan/sync-lease-removal
Add sync option to lease removal
2018-07-31 11:31:55 -04:00
Michael Crosby
d0ab8c8510
Merge pull request #2496 from dmcgowan/lease-content-uploads
Add content ingests to lease and gc
2018-07-31 11:27:57 -04:00
Michael Crosby
e4f33dcfb5 Add nvidia Opts to lookup containerd binary or hook path
This is for consumers like Docker that manage a `docker-containerd`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-31 10:11:25 -04:00
Phil Estes
c55b9636f7
Merge pull request #2263 from alibaba/fix_no_gzip
fixbug: blob for schemav1 could be uncompressed
2018-07-30 18:49:28 -04:00
Phil Estes
6647e75651
Merge pull request #2509 from crosbymichael/bundle-cleanup
Cleanup workdirs on manager load
2018-07-30 18:46:21 -04:00
Derek McGowan
45d0df8fe3
Merge pull request #2510 from crosbymichael/gpucaps2
Change gpu Capability type to string
2018-07-30 14:35:59 -07:00
Stephen Day
920dc79b4d
Merge pull request #2504 from samuelkarp/ctr-t-metrics
ctr: add new metrics subcommand
2018-07-30 13:07:19 -07:00
Michael Crosby
81e2859e8b Change gpu Capability type to string
This helps with mappings so that we are not translating multiple times
from caller to hook.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-30 15:37:13 -04:00
Derek McGowan
ca71484793
Merge pull request #2480 from dmcgowan/proxy-plugin-doc
Document plugins
2018-07-30 11:23:24 -07:00
Stephen Day
578a236f30
Merge pull request #2506 from crosbymichael/gpucaps
nvidia GPU support for caps and multiple uuids
2018-07-30 11:21:53 -07:00
Michael Crosby
23fbdbaf13 Cleanup workdirs on manager load
This cleans up persistent work dirs on TaskManager boot.  These dirs can
be left behind in a machine reboot.  The state in /run will not exist
but the work dir in the root does, we should cleanup work dirs when
tasks are not loaded.

This also improves error handling that would prevent the task manager
from loading when a single task fails to load or cleanup.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-30 10:21:04 -04:00
Michael Crosby
e8f7c2af26
Merge pull request #2507 from flx42/fix-readme-runtime-v2
Remove reference to WithExit in README
2018-07-30 09:57:52 -04:00
Derek McGowan
2ebfba575c
Merge pull request #2479 from stevvooe/with-file-combinator
oci: introduce WithSpecFromFile combinator
2018-07-27 15:56:53 -07:00
Samuel Karp
9a34bb046a metrics: add optional json output
Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-07-27 15:21:08 -07:00
Felix Abecassis
e22f19618c Remove reference to WithExit in README
This function was removed from the containerd package in da1b5470cd

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2018-07-27 15:16:43 -07:00
Stephen Day
2a1bd7414b
oci: introduce WithSpecFromFile combinator
We introduce a WithSpecFromFile option combinator to allow creation
simpler creation of OCI specs from a file name. Often used as the first
option in a `SpecOpts` slice, it simplifies choosing between a local
file and the built-in default.

The code in `ctr run` has been updated to use the new option, with out
changing the order of operations or functionality present there.

Signed-off-by: Stephen Day <stephen.day@getcruise.com>
2018-07-27 14:25:42 -07:00
Phil Estes
985920c513
Merge pull request #2505 from crosbymichael/cmdargs
Add WithImageConfigArgs to replace CMD on image
2018-07-27 15:55:13 -04:00
Michael Crosby
dd0c04970d nvidia GPU support for caps and multiple uuids
This improves nvidia support for multiple uuids per container and fixes
the API to add individual capabilities.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-27 15:28:59 -04:00
Derek McGowan
362405f7b5
Merge pull request #2495 from jterry75/runtime_v2_windows
Adds runtime v2 support for Windows shim's
2018-07-27 11:24:34 -07:00
Justin Terry (VM)
af1b6a026e Review feedback.
1. Moves the log message for each socket to the appropriate _unix and
_windows.go
2. Replaces all reference to Abstract Socket for Windows.
3. Adds support for ctrl+c on Windows to exit a shim.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-07-27 09:49:33 -07:00
Justin
4b5403f9c9
Merge pull request #2 from crosbymichael/runtime-v2-windows
Abstract to SocketAddress
2018-07-27 09:43:56 -07:00
Michael Crosby
13549f7a07 Abstract to SocketAddress
This updates some methods for cross platform use as well as unifying
_unix files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-27 12:39:53 -04:00
Samuel Karp
2c87d120df ctr: add new metrics subcommand
Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-07-27 09:37:57 -07:00
Michael Crosby
e956441fe0 Add WithImageConfigArgs to replace CMD on image
This allows users to provide args for the process arguments while
creating the base spec with an image.  It provides the same symantics as
Docker where additional args replace the CMD while leaving the
ENTRYPOINT the same.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-27 12:09:11 -04:00
Derek McGowan
c8017d0275
Merge pull request #2500 from crosbymichael/12deps
Update containerd dependencies for 1.2
2018-07-26 12:59:34 -07:00
Michael Crosby
5a0b040ab4 Update containerd dependencies for 1.2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-26 15:00:59 -04:00
Michael Crosby
c09932fcb0
Merge pull request #2347 from crosbymichael/streamingapis
Add containers streaming API
2018-07-26 14:42:02 -04:00
Michael Crosby
400f16fc46 Add containers streaming API
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-26 13:55:20 -04:00
Justin
965cca6f75
Merge pull request #1 from crosbymichael/runtime-v2-windows
Add Windows Publisher and Signal Handler
2018-07-26 10:07:14 -07:00
Michael Crosby
9d72b4543b Handle windows signals
Since windows does not require a signal handler, we just block on the
channel forever so that it does not exit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-26 11:24:20 -04:00
Michael Crosby
f15a1170d3 Add windows publisher
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-26 11:21:50 -04:00