Commit Graph

8706 Commits

Author SHA1 Message Date
Derek McGowan
36e4c8e55d
Merge pull request #3420 from crosbymichael/sn-regression
Fix regression from #3403 with snapshot cmd
2019-07-16 13:52:09 -07:00
Michael Crosby
b5d0c78225
Merge pull request #3406 from fuweid/me-update-Manifest
images: only fetch the best matched manifest info
2019-07-16 15:32:09 -04:00
Michael Crosby
ce0d2489ac Fix regiression from #3403 with snapshot cmd
The snapshot command calls the snapshotter service directly, therefore,
the name must be resolved.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-16 19:24:24 +00:00
Michael Crosby
e4bfab7182
Merge pull request #3417 from dmcgowan/testing-log-hook
Add unit test logging hook
2019-07-16 15:11:12 -04:00
Derek McGowan
0b29c9c371
Update resolver to handle endpoint configuration
Adds support for registry mirrors
Adds support for multiple pull endpoints
Adds capabilities to limit trust in public mirrors
Fixes user agent header missing


Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-16 11:28:23 -07:00
Derek McGowan
63ceaf877d
Add testing log context
Enables showing debug logs in testing output.
For integration tests the client log output will show
in addition to daemon output, with timestamps for better
correlation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-16 10:31:43 -07:00
Derek McGowan
f63eab32e1
Add testing log hook to context
Allows log output to sent along with test output
for cleaner output and clearer ordering.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-16 10:31:43 -07:00
Justin Terry (VM)
7b0c78bacd ExecSync should block unless client context is canceled
A call to ExecSync should only return if the client context was canceled or
exceeded. The Timeout parameter to ExecSyncRequest is now used to send SIGKILL
if the exec'd process does not exit within Timeout but all paths wait for the
exec to exit.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-07-16 09:47:55 -07:00
Justin Terry (VM)
71cecedc44 StopContainer should block unless client context is canceled
A call to StopContainer should only return if the client context is canceled or
its deadline was exceeded. The Timeout parameter on StopContainerRequest is now
used as the time AFTER sending the stop signal before the SIGKILL is delivered.
The call will remain until the container has exited or the client context has
finished.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-07-16 09:44:23 -07:00
Justin Terry (VM)
d7c3ecd0fb RunPodSandbox should block unless client context is canceled
A call to RunPodSandbox should only return timeout if the operation has timed
out because the clients context deadline was exceeded. On client cancelation
it should return gRPC Canceled otherwise it should block until the sandbox has
exited.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-07-16 09:35:56 -07:00
Phil Estes
d6be45e151
Merge pull request #3416 from crosbymichael/hard-code-err
Replace hard coded error messages
2019-07-15 17:14:59 -04:00
Michael Crosby
61d930ad5b Move specific errors to their respective packages
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-15 20:21:11 +00:00
Derek McGowan
7d03fc63e1
Merge pull request #3414 from estesp/refactor-forloop
Small refactor due to CI linter changes
2019-07-15 11:19:48 -07:00
Phil Estes
82826df9bd
Small refactor due to CI linter changes
Without the open variable in use, no reason to define it or use it as the
for loop control.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-07-15 10:43:31 -07:00
Michael Crosby
f3e148b1cc
Merge pull request #3411 from mxpv/linter
Switch from gometalinter to golangci-lint
2019-07-15 10:58:59 -04:00
Phil Estes
adb8b02b66
Merge pull request #3408 from wangpeng168/master
fix: view snapshot is deleted before diff
2019-07-15 09:39:28 -04:00
Maksym Pavlenko
ef7f46eb7b Fix linter errors
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-14 20:49:40 -07:00
Maksym Pavlenko
2b521e25a7 Switch to golangci-lint
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-14 20:49:28 -07:00
Fahed Dorgaa
abc152d14c fix name in containers file
Signed-off-by: Fahed Dorgaa <fahed.dorgaa@gmail.com>
2019-07-14 21:49:07 +02:00
Fahed Dorgaa
70b00a0fa9 fix variable name
Signed-off-by: Fahed Dorgaa <fahed.dorgaa@gmail.com>
2019-07-14 21:47:15 +02:00
Peng Wang
4988424fc0 * fix: view snapshot is deleted before diff
Signed-off-by: Peng Wang <wang_peng168@163.com>
2019-07-14 07:06:04 -04:00
Fahed Dorgaa
db95af43f3 centralize harded-code message
Signed-off-by: Fahed Dorgaa <fahed.dorgaa@gmail.com>
2019-07-13 15:07:23 +02:00
Wei Fu
d643f1dc88 images: only fetch the best matched manifest info
When client uses Pull action to pull image, it will limit the number of
manifest as one. But Unpack action will call Manifest to traverse all
the manifests including non-dowloaded one. If the platform has more than
one manifest, the Pull with unpack action will fail. And also, there is
no need to read non-best matched manifest. Therefore, the Manifest can
do the sort earlier.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-07-12 22:34:43 -04:00
Phil Estes
f2b6c31d0f
Merge pull request #3403 from mxpv/labels
Better default label handling
2019-07-11 16:17:53 -04:00
Maksym Pavlenko
550a6f1d73 Fix integration tests
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-11 11:54:48 -07:00
Mike Brown
98c266fb86
Merge pull request #1177 from jterry75/togrpc_errors
Return gRPC errors from instrumentedService
2019-07-10 20:05:26 -05:00
Maksym Pavlenko
1918ee4d11 Respect default snapshotter label
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-10 12:16:43 -07:00
Maksym Pavlenko
47d2ac0902 Improve default label handling
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-10 12:15:08 -07:00
Maksym Pavlenko
4e2fc81edd Add aliases to namespaces subcommand
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-10 12:10:14 -07:00
Akihiro Suda
9d4fc1d405
Merge pull request #3399 from crosbymichael/criu12
Bump travis to criu 3.12
2019-07-10 11:16:39 +09:00
Michael Crosby
2a92c27413 Bump travis to criu 3.12
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-09 19:42:28 +00:00
Phil Estes
309647b1f0
Merge pull request #3398 from crosbymichael/release-config
Add RELEASE note about config versioning
2019-07-09 15:25:37 -04:00
Michael Crosby
5ed1a3ce08 Add RELEASE note about config versioning
Closes #3196

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-09 18:08:40 +00:00
Phil Estes
a0696b2bc6
Merge pull request #3374 from crosbymichael/runtime
Refactor runtime package for code usage
2019-07-08 12:51:47 -04:00
Michael Crosby
dce11a21de
Merge pull request #3395 from hinshun/metadata-actual
Fix metadata content store to call writer digest after commit
2019-07-08 12:49:33 -04:00
Michael Crosby
6601b406b7 Refactor runtime code for code sharing
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-08 11:47:53 -04:00
Phil Estes
2aa8780ce6
Merge pull request #3393 from lifupan/fix_deadshim
shimv2: remove the dead task from runtime task list
2019-07-08 11:42:55 -04:00
Edgar Lee
7d21172453 Fix metadata content store to call writer digest after commit
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2019-07-08 07:26:49 -07:00
Phil Estes
d80513ee8a
Merge pull request #3388 from seemethere/image_tag
Add ctr images tag subcommand
2019-07-08 10:02:01 -04:00
Eli Uriegas
af93e4009b ctr: Add images tag subcommand
Adds a subcommand for tagging images managed by containerd.

Usage:

  ctr images tag docker.io/library/alpine:latest docker.io/library/alpine:new

Comes with a --force flag to allow you to gracefully overwrite image references
that already exist.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-07-06 15:44:17 +00:00
Justin
1312801786
Merge pull request #1194 from joedborg/patch-1
Correcting typo
2019-07-05 12:23:06 -07:00
Joe Borg
9ebc10ec08 Correcting typo
`/ec/` > `/etc/`

Signed-off-by: Joe Borg <joe@josephb.org>
2019-07-04 14:12:20 -04:00
lifupan
ec8d9d3d7a shimv2: remove the dead task from runtime task list
When shimv2 dead, the container would be cleanup, but
the corresponding runtime task still existed in runtime
task lists, it should be deleted too.

Signed-off-by: lifupan <lifupan@gmail.com>
2019-07-04 15:51:03 +08:00
Justin
c1c710ae16
Merge pull request #3390 from Ace-Tang/update-go-runc
vendor: bump go-runc
2019-07-03 11:05:05 -07:00
Ace-Tang
d3e1a51f85 vendor: bump go-runc
bump go-runc to 9007c2405372fe28918845901a3276c0915689a1
in order to support get actually error log if checkpint fail, this
version get two new diff

Add common project content/checks:
8e51df4212
Fix Method of judging command execution
failure:4e99c72acd

Signed-off-by: Ace-Tang <aceapril@126.com>
2019-07-03 21:57:10 +08:00
Mike Brown
41a9176b0d
Merge pull request #1190 from odinuge/dep/cgroups
Update dependency containerd/cgroups
2019-07-02 16:20:24 -05:00
Michael Crosby
876c8890ae
Merge pull request #3384 from mxpv/exec-log-uri
Support --log-uri in exec subcommand
2019-07-02 14:34:13 -04:00
Maksym Pavlenko
46af8ccd2d Check exec log flags compatibility
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-02 09:53:11 -07:00
Michael Crosby
3ce077e740
Merge pull request #3385 from ehotinger/ehotinger/refactor-winio
Bump go-winio and refactor Windows snapshotters
2019-07-02 10:54:05 -04:00
Eric Hotinger
9fda4a5fe6 Bumps the version of go-winio.
This also refactors the lcow and windows
snapshotters to use go-winio's utility functions for checking the
filesystem type.

Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
2019-07-01 14:51:06 -07:00