github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,706 Commits 3 Branches 2 Tags 112 MiB
6be7c9f4e2
Commit Graph

8706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
88bfc17d14 Update cri to 8506fe836677cc3bb23a16b68145128243d843b5. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-05 14:53:17 -07:00
Lantao Liu
e4f33828c3
Merge pull request #938 from Random-Liu/update-kubernetes-1.12 
Update kubernetes to v1.12.0.
 2018-10-05 12:19:29 -07:00
Lantao Liu
0580ce45fd Update test based on new CRI. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-05 11:01:20 -07:00
Lantao Liu
5a2da31351 Update kubernetes to v1.12.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-04 18:33:29 -07:00
Derek McGowan
0c5f8f63c3
Merge pull request #2699 from dmcgowan/update-1.2-rc.1 
Update version to 1.2-rc.1
 2018-10-03 14:43:26 -07:00
Derek McGowan
7b750c7b83
Update version to 1.2-rc.1 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-03 14:00:06 -07:00
Derek McGowan
0e6a562b1d
Merge pull request #2698 from jterry75/lcow_spec_opt 
Skip AdditionalGID's for LCOW oci spec
 2018-10-03 13:58:09 -07:00
Lantao Liu
fb26f47b4c
Merge pull request #937 from DataDog/JulienBalestra/cni-debug 
cni result: add a debug message
 2018-10-03 10:43:29 -07:00
Justin Terry (VM)
223acbca2a Skip AdditionalGID's for LCOW oci spec 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-03 10:43:29 -07:00
JulienBalestra
27f33cd4d6
cni result: add a debug message 
Signed-off-by: JulienBalestra <julien.balestra@datadoghq.com>
 2018-10-03 17:19:51 +02:00
Phil Estes
de4bb2ddfb
Merge pull request #2692 from jterry75/shim_reconnect 
Various runhcs shim fixes
 2018-10-03 10:51:04 +02:00
Phil Estes
43acab8100
Merge pull request #2690 from dmcgowan/resolver-updates 
Update Docker resolver to pass in Authorizer interface
 2018-10-03 09:58:42 +02:00
Phil Estes
90b7b88e10
Merge pull request #2696 from dmcgowan/import-docker-tar-test 
Content store fix and import integration test
 2018-10-03 09:57:25 +02:00
Mike Brown
801882b046
Merge pull request #935 from mikebrow/makefile-fix-for-syntax 
corrects syntax error in Makefile
 2018-10-03 00:48:56 -05:00
Mike Brown
24a5a0e6ba corrects syntax error in Makefile 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-10-02 21:16:47 -05:00
Derek McGowan
29dab3bb24
Merge pull request #2694 from AkihiroSuda/continuity-testutil 
remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback
 2018-10-02 14:30:51 -07:00
Derek McGowan
440c7ed249
Fix commit already exists not leasing 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-02 14:16:57 -07:00
Justin Terry (VM)
ab2031236a Add blocking buffered writes to shim 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-02 11:10:43 -07:00
Justin Terry (VM)
beb1f432be Review fixes 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-02 11:10:43 -07:00
Justin Terry (VM)
2ddbb2db05 Handle shim delete workdir on Windows 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-02 11:10:43 -07:00
Justin Terry (VM)
b8945d35f5 Decrease shim timeout on pipe not found 
On Windows because of the way the log pipe is forwarded to the shim there is a
condition where the pipe listener may not yet be active when a client tries to
connect. To handle this case we allow polling on the file and rety on pipe not
found. This limits the pipe not found retry to 5 seconds but leaves the connect
timeout alone as if there is a listener we want to connect to it normally.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-02 11:10:43 -07:00
Justin Terry (VM)
ddbeb3f7c7 Adds Windows shim reconnect logs support 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-02 11:10:37 -07:00
Akihiro Suda
5349fa31df remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-10-02 13:12:25 +09:00
Derek McGowan
b6107dca86
Add import integration test 
Move tar creation test utilities to separate package
Test all supported formats for import

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-01 11:47:10 -07:00
Derek McGowan
a6198b7692
Update resolver code 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-28 14:32:23 -07:00
Phil Estes
ac01f20a8e
Merge pull request #2577 from samuelkarp/stop-signal 
ctr: make kill optionally use stop-signal
 2018-09-28 12:05:56 -04:00
Michael Crosby
655ba65875
Merge pull request #2686 from jterry75/runhcs_improvements 
Various containerd-shim-runhcs bug fixes/improvements
 2018-09-28 11:19:54 -04:00
Wei Fu
57d79e1b49 bugfix: cache empty layer for docker schema1 image 
containerd should cache empty label for docker schema1 image.

if not, the original empty layer will be non-empty layer and the image
config will be changed too. in this case, the image ID will be changed.

check the blob empty label to avoid changing image ID when repull docker
schema1 image.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-09-28 15:45:59 +08:00
Samuel Karp
607888ce29 ctr: make kill use stop-signal by default 
The OCI image specification includes a `StopSignal` field in the image
configuration, denoting the system call signal to be sent to the
container to exit.  This commit adds a new `WithImageStopSignal` container
option that can be used for storing the `StopSignal` field as a label on
the container.  This commit also adjusts `ctr run` to call
`WithImageStopSignal` and `ctr tasks kill` to send the signal stored in
that label by default.

Signed-off-by: Samuel Karp <skarp@amazon.com>
 2018-09-27 15:53:38 -07:00
Samuel Karp
b392a3a8e4 signals: move ParseSignal to containerd package 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2018-09-27 15:53:38 -07:00
Lantao Liu
58ab1e09b2
Merge pull request #926 from Random-Liu/better-external-image-handling 
Better external image handling
 2018-09-27 13:19:21 -07:00
Lantao Liu
6905460b85 Add integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-27 11:37:26 -07:00
Lantao Liu
db68300a5a Manage unmanaged images in k8s.io namespace 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-27 11:19:11 -07:00
Phil Estes
df60d3272a
Merge pull request #2687 from dmcgowan/fix-pigz-panic 
Fix panic when bufio Reader called in 2 goroutines
 2018-09-27 12:43:09 -04:00
Justin Terry (VM)
81eb40fabf Adds containerd-shim-runhcs verbose logging support 
Revendors to Microsoft/hcsshim v0.7.5 that added support for logging all
runhcs.exe commands via Windows named pipes. This now launches all runhcs.exe
commands and forwards debug logging to the containerd-shim-runhcs log when
with --debug.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-09-27 07:46:09 -07:00
Justin Terry (VM)
772644e978 Fixes containerd-shim-runhcs State on exec id 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-09-27 07:46:09 -07:00
Justin Terry (VM)
83437ef646 Fixes containerd-shim-runhcs Delete on exec id 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-09-27 07:46:09 -07:00
Justin Terry (VM)
84aa0bfde6 Forward containerd debug to shim invocation 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-09-27 07:46:01 -07:00
Lifubang
cb0eed833d decode Spec value in command 'ctr c info <containerid>' 
Signed-off-by: Lifubang <lifubang@aliyun.com>

fix some errors

use typeurl.UnmarshalAny instead json.Unmarshal to interface{}

Signed-off-by: Lifubang <lifubang@aliyun.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-27 10:44:54 -04:00
Michael Crosby
75d7d6e7a8
Merge pull request #2684 from dmcgowan/manifest-resolution 
Update manifest resolution for non-index manifests
 2018-09-27 10:24:47 -04:00
Lantao Liu
4d553cbef8
Merge pull request #924 from Random-Liu/add-timeout-for-recover 
Add timeout for recover and event monitor
 2018-09-27 02:40:57 -07:00
Derek McGowan
db358a9fd2
Fix panic when bufio Reader called in 2 goroutines 
A panic was seen related to the buffer being reset in
one goroutine while being read in another. In the case
of pigz an early cancellation will cause the reader to
close, resetting the buffer and signaling the process
to shut down, but races since the process must stop
reading before the reset otherwise the a panic may occur.
This fix guarantees that the bufio is always reset and
returned to the pool on the same goroutine that is
doing the read. If a buffer is not fully read the
buffered reader should just be discarded and not
returned back to the pool.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-26 18:11:30 -07:00
Lantao Liu
e3aa8adbb0 Update containerd to f88d3e5d6d. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-26 15:23:15 -07:00
Lantao Liu
963a01735b Add timeout for container/sandbox recover and event monitor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-26 15:23:15 -07:00
Lantao Liu
6de38f1f3a
Merge pull request #927 from Random-Liu/fix-readiness-check 
Fix readiness check in test utils.
 2018-09-26 10:28:17 -07:00
Lantao Liu
00443ebd6c
Merge pull request #928 from Random-Liu/update-crictl 
Update critools version.
 2018-09-26 10:25:59 -07:00
Derek McGowan
f88d3e5d6d
Merge pull request #2685 from Random-Liu/expose-labels 
Add `Labels()` to client.Image.
 2018-09-26 10:25:42 -07:00
Lantao Liu
92fbbcf065 Update critools version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-26 02:01:43 -07:00
Lantao Liu
3d5a408bfa Add Labels to client.Image. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-26 00:42:13 -07:00
Lantao Liu
68152dab84 Fix readiness check in test utils. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-26 00:38:43 -07:00