github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,017 Commits 3 Branches 2 Tags 112 MiB
f8538b5e12
Commit Graph

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
8bb521318a
Merge pull request #3055 from ehotinger/ehotinger/flow-opts 
Allow opts to flow to the backend snapshotter during snapshot creation.
 2019-06-19 14:54:36 -04:00
Maksym Pavlenko
5e0d793801 Fix bugs in BinaryIO creator 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-06-19 11:15:17 -07:00
Eric Hotinger
75f183887a Allow opts to flow to the backend snapshotter during snapshot creation. 
Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
 2019-06-19 11:00:22 -07:00
Justin Terry (VM)
cfeb2fed81 Return gRPC errors from instrumetedService 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-06-19 10:11:18 -07:00
Lantao Liu
6afd137c02 Fix runc and critools version in release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-19 08:07:04 -07:00
Lantao Liu
806c2641a1
Merge pull request #1178 from mikebrow/fix-slack-link 
use dynamic slack link
 2019-06-19 07:38:37 -07:00
Phil Estes
4355a2accc
Merge pull request #3355 from Ace-Tang/avoid-start-hang 
Add timeout in load shim v2
 2019-06-19 11:29:27 +01:00
Ace-Tang
95f9bbf18b Add timeout in load shim v2 
add timeout in connect shim v2 avoid starting containerd hang

Signed-off-by: Ace-Tang <aceapril@126.com>
 2019-06-19 13:10:18 +08:00
Michael Crosby
434f69e790
Merge pull request #3353 from mikebrow/fix-slack-invite 
switch to a working link
 2019-06-18 11:33:41 -04:00
Mike Brown
cdf48f2f45 use dynamic slack link 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-18 10:00:14 -05:00
Mike Brown
62e9e11696 switch to a working link 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-18 09:53:43 -05:00
Justin
3e7c6f6a6b
Merge pull request #3352 from crosbymichael/sn-panic 
Fix snapshotter getter in client code
 2019-06-17 11:05:11 -07:00
Michael Crosby
41e1bb8328 Fix snapshotter getter in client code 
Fixes #3312

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-17 16:57:48 +00:00
Akihiro Suda
cbb108e228
Merge pull request #3348 from mxpv/new-binary-io 
Make newBinaryIO public
 2019-06-16 21:47:56 +02:00
Phil Estes
062d056196
Merge pull request #3345 from crosbymichael/diff-panic 
Ensure labels is not nil in differ
 2019-06-14 11:43:18 -04:00
Michael Crosby
052551573d Ensure labels is not nil in differ 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-14 15:20:32 +00:00
Phil Estes
50cd49d1c8
Merge pull request #3343 from thaJeztah/appveyor_bump_go_1.12 
AppVeyor: Bump golang 1.12.6
 2019-06-14 10:27:25 -04:00
Sebastiaan van Stijn
67cf9f7f02
AppVeyor: Bump golang 1.12.6 
go1.12.6 (released 2019/06/11) includes fixes to the compiler, the linker,
the go command, and the crypto/x509, net/http, and os packages. See the
Go 1.12.6 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.12.6

full diff: https://github.com/golang/go/compare/go1.12.5...go1.12.6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-06-14 15:58:28 +02:00
Justin
fe58b496bb
Merge pull request #3341 from crosbymichael/ttrpcmd 
Update ttrpc for interceptors, closure, and metadata
 2019-06-13 16:46:27 -07:00
Mike Brown
0635ecf708 move up to golang 1.12.x 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-13 15:41:06 -05:00
Mike Brown
00b18fd728 synching up a bit with containerd Makefile 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-13 15:31:45 -05:00
Michael Crosby
0b7abc02b2 ttrpc updates for interceptors, close, and metadata 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-13 19:09:07 +00:00
Phil Estes
40b17e97f6
Merge pull request #3218 from fuweid/me-cross-push 
remotes: support cross-repo-push
 2019-06-13 09:42:00 -04:00
Phil Estes
667195fdd9
Merge pull request #3339 from YLonely/typo-fix 
docs: Fix typo to some markdown files in /docs.
 2019-06-13 08:34:05 -04:00
BoWen Yan
d15a06b190 docs: Fix typo to some markdown files in /docs. 
Signed-off-by: BoWen Yan <loneybw@gmail.com>
 2019-06-13 15:29:12 +08:00
Wei Fu
dd7c0aabcc remotes: support cross-repo-push 
With distribution source label in content store, select the longest
common prefix components as condidate mount blob source and try to push
with mount blob.

Fix #2964

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-06-13 09:51:46 +08:00
Maksym Pavlenko
bca5667362 Make newBinaryIO public 
Allow third-party runtime implementations to reuse NewBinaryIO
in order to support pluggable shim logging binary protocol.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-06-12 16:22:10 -07:00
Lantao Liu
bb020275cb
Merge pull request #1170 from Random-Liu/remove-ctr-cri-load 
Remove ctr cri load
 2019-06-12 14:41:49 -07:00
Lantao Liu
4a417fb083
Merge pull request #1171 from Random-Liu/add-http-proxy-support 
Fix http proxy ENV when TLS is enabled.
 2019-06-12 14:40:58 -07:00
Lantao Liu
72819d68d1 Update vendor 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:18:55 -07:00
Lantao Liu
199ee362e8 Update test and run test containerd in a different directory. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:18:55 -07:00
Lantao Liu
322cd48965 Remove load image support 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:14:11 -07:00
Lantao Liu
55e5ce0e95 Fix http client when TLS is enabled. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:09:53 -07:00
Lantao Liu
78b4a39f5b
Merge pull request #1163 from Random-Liu/config-v2 
Use the new v2 config
 2019-06-12 10:29:11 -07:00
Phil Estes
545e79ae11
Merge pull request #3337 from crosbymichael/config-bk 
Fix backwards compat with v2 containerd configs
 2019-06-11 21:08:15 -04:00
Michael Crosby
31afff2944 Fix backwards compat with v2 containerd configs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-11 23:44:39 +00:00
Lantao Liu
b3f733f0ad
Merge pull request #1166 from mikebrow/doc-cni-maxnum 
doc update for cni max num
 2019-06-11 10:55:28 -07:00
Lantao Liu
1275d6ded3
Merge pull request #1162 from Random-Liu/fix-image-pull 
Add cri managed image label when pulling the image.
 2019-06-11 10:51:34 -07:00
Michael Crosby
53896d7820
Merge pull request #3335 from dmcgowan/fix-user-agent 
Add user agent header to all requests
 2019-06-11 12:57:21 -04:00
Mike Brown
1c826eb689
Merge pull request #1165 from ZYecho/fix-link 
fix: fix CRI dead link
 2019-06-11 17:16:25 +02:00
Derek McGowan
bb00872800
Add user agent header to all requests 
Currently the user agent is only being used on the initial
resolve request, then switching to the default user agent.
This ensures the correct user agent is always used. There is
a larger fix in progress which does this is a cleaner way, but
the scope of this change is fixing the user agent issue.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-06-11 22:57:58 +08:00
Mike Brown
3ba04c01cc doc update for cni max num 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-11 08:35:22 -05:00
zhangyue
397adbab85 fix: fix CRI dead link 
Signed-off-by: zhangyue <zy675793960@yeah.net>
 2019-06-11 14:49:36 +08:00
Lantao Liu
150232325e Use v2 config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 20:51:18 -07:00
Lantao Liu
efba8e147f Update containerd to 2f69be5594. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 19:34:46 -07:00
Wei Fu
2f69be5594
Merge pull request #3322 from crosbymichael/configs 
Add v2 server config support with plugin URIs
 2019-06-11 09:56:08 +08:00
Lantao Liu
66d1870d25 Add cri managed image label when pulling the image. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 15:13:38 -07:00
Michael Crosby
9547d269a1 Add v2 server config support with plugin URIs 
Closes #3210

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-10 17:54:20 +00:00
Lantao Liu
53c71e2b10
Merge pull request #1155 from kuramal/cni_plugin_conf_file_max_num 
add cni plugin config file max num config
 2019-06-10 10:14:35 -07:00
Michael Crosby
42f4bb98ac
Merge pull request #3311 from jing-rui/shimlog 
fix shim std logs not close after shim exit
 2019-06-10 12:05:35 -04:00