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

8947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
4f7d1d74fb
Merge pull request #5260 from fuweid/limit-concurent-uploads-when-push 
remotes/ctr: allow to limit max concurrent uploads like downloads
 2021-03-25 09:22:44 -04:00
Phil Estes
f2d84035f6
Merge pull request #5266 from Ace-Tang/ace 
ctr: add --user for task exec
 2021-03-25 09:17:52 -04:00
acetang
5e94745f26 ctr: add --user for task exec 
set user in exec container

$ ctr t exec --exec-id e1 --user admin container id
uid=500(admin) gid=500(admin) groups=500(admin)

Signed-off-by: chuangxue <chenglong.lcl@alibaba-inc.com>
Signed-off-by: acetang <aceapril@126.com>
 2021-03-25 19:29:30 +08:00
Wei Fu
f8c2f04756 remotes/ctr: allow to limit max concurrent uploads like downloads 
Also add flags for push/pull subcommand to limit max concurrent
uploads/downloads.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-03-25 14:37:02 +08:00
Fu, Wei
80fa9fe32a
Merge pull request #5135 from AkihiroSuda/default-config-crypt 
add imgcrypt stream processors to the default config
 2021-03-25 14:31:38 +08:00
Mike Brown
548d984f27
Merge pull request #5132 from mikebrow/add-some-debug-out-for-dep-setups 
adds a new install-deps in the makefile; and some refactoring of the scripts
 2021-03-24 15:28:16 -05:00
Phil Estes
bcda849e7c
Merge pull request #5133 from TBBle/correct-cleanup-of-windows-layers-in-test 
Correct clean-up of Windows Layers in testsuite
 2021-03-24 16:03:11 -04:00
Paul "TBBle" Hampson
1fd3d12f93 go mod tidy the client integration test module 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2021-03-25 05:26:24 +11:00
Paul "TBBle" Hampson
da7d96ba3f Clean up WCOW layers after tests in the correct order 
This ensures that we do not trigger assertions inside HCS by tring to
call hcsshim.DestroyLayer on the parent of a currently-activated layer.

It also deactivates the layers before deletion, to ensure we trigger or
avert file-in-use failures due to leftover state from the tests with
more detail than 'destroy failed'.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2021-03-25 05:26:24 +11:00
Mike Brown
9ad87b9ba7 adds critools-version 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-03-24 10:58:40 -05:00
Derek McGowan
31a0f92df1
Merge pull request #5234 from mxpv/http-dbg 
Support HTTP debug in ctr
 2021-03-23 19:05:57 -07:00
Maksym Pavlenko
181e2d4216
Merge pull request #5250 from dmcgowan/cri-fix-reference-ordering 
Fix reference ordering in CRI image store
 2021-03-23 14:45:16 -07:00
Mike Brown
664088dd2e
Merge pull request #5254 from voltbit/clarify-cri-registry-doc 
Make CRI registry docs more clear
 2021-03-23 16:11:04 -05:00
Andrei Dobre
e4b9b1038b
Make CRI registry docs more clear 
Added reference to previous config syntax.

Signed-off-by: Andrei Dobre <andreidobre.web@gmail.com>
 2021-03-23 22:10:06 +02:00
Michael Crosby
2ad54a2cde
Merge pull request #5255 from dmcgowan/bump-linux-integration-timeout 
Increase timeout for linux integration tests
 2021-03-23 16:03:15 -04:00
Maksym Pavlenko
792336b09b
Merge pull request #5245 from mxpv/oom 
Fix oom tests on non Linux
 2021-03-23 12:34:32 -07:00
Derek McGowan
ec4d7736d8
Increase timeout for linux integration tests 
The integration test times have slightly increased and are often
hitting the 25 minutes timeout. This increases to give more room
but still keeps it low enough to catch regressions in tests
causing longer than expected execution.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-03-23 12:10:41 -07:00
Maksym Pavlenko
eb7c7c71e2 Fix oom tests on non Linux 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-03-23 11:57:24 -07:00
Derek McGowan
d54225ccee
Merge pull request #5125 from Iceber/add-caller-info 2021-03-23 08:28:20 -07:00
Phil Estes
717dde3c27
Merge pull request #5252 from thaJeztah/separate_userns 
Move RunningInUserNS() to its own package
 2021-03-23 08:56:04 -04:00
Sebastiaan van Stijn
708299ca40
Move RunningInUserNS() to its own package 
This allows using the utility without bringing whole of "sys" with it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-03-23 11:29:53 +01:00
Derek McGowan
0886ceaea2
Fix reference ordering in CRI image store 
Currently image references end up being stored in a
random order due to the way maps are iterated through
in Go. This leads to inconsistent identifiers being
resolved when a single reference is needed to identify
an image and the ordering of the references is used for
the selection.

Sort references in a consistent and ranked manner,
from higher information formats to lower.

Note: A `name + tag` reference is considered higher
information than a `name + digest` reference since a
registry may be used to resolve the digest from a
`name + tag` reference.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-03-22 22:29:57 -07:00
Iceber Gu
bf9db47e8a
add caller info to the testHook 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-03-23 09:26:27 +08:00
Derek McGowan
edf6484165
Merge pull request #5243 from AkihiroSuda/update-zfs-20210322 
go.mod: github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7 (for snapshot usage)
 2021-03-22 15:09:58 -07:00
Maksym Pavlenko
22ef69d77d Support HTTP debug in ctr 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-03-22 09:32:34 -07:00
Derek McGowan
4e919ffaba
Merge pull request #5244 from pacoxu/fix/night-run 2021-03-22 06:12:03 -07:00
pacoxu
01765d0974 night ci fix: add packages for ubuntu 20.04 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
 2021-03-22 17:57:14 +08:00
Akihiro Suda
8cdc1f13b6
go.mod: github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7 
Contains "Implements zfs usage by returning the USED field from the zfs snapshot"
(https://github.com/containerd/zfs/pull/38)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-03-22 16:58:00 +09:00
Maksym Pavlenko
56f17a0856
Merge pull request #5148 from wzshiming/fix/defer-cleanup 
runtime/v2: Fix defer cleanup for TaskManager.Create
 2021-03-20 13:24:42 -07:00
Shiming Zhang
30e1e66e5c runtime/v2: Fix defer cleanup 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
 2021-03-20 18:40:36 +08:00
Akihiro Suda
6150170d95
Merge pull request #5235 from estesp/testimage-userns-ro 
Use specific image for user namespaces tests
 2021-03-20 14:34:14 +09:00
Phil Estes
33776ada04
Use specific image for user namespaces tests 
Due to the lack of an existing /proc dir in the rootfs of busybox, there
seems to be a race between the mount of /proc and whether the root dir
is already readonly? May need investigation, but for now use an image
that has a /proc dir existing.

Signed-off-by: Phil Estes <estesp@amazon.com>
 2021-03-19 22:51:32 -04:00
Maksym Pavlenko
a47feaf462
Merge pull request #4898 from timchenxiaoyu/makefile 
standard makefile,fix not work no  macos
 2021-03-19 16:05:46 -07:00
Michael Crosby
f7bd43c137
Merge pull request #5216 from estesp/testimage-429 
Switch test image to a non rate-limited manifest list
 2021-03-19 15:02:47 -04:00
Michael Crosby
a7b456d2f8
Merge pull request #5233 from kzys/mkfs-error 
Specifically mention "mkfs.ext4" on the error from the command
 2021-03-19 14:31:38 -04:00
Michael Crosby
e0c94bb269
Merge pull request #4708 from kzys/enable-criu 
Re-enable CRIU tests by not using overlayfs snapshotter
 2021-03-19 14:23:05 -04:00
Derek McGowan
0d569f8f4a
Merge pull request #5229 from wzshiming/fix/log-cp-file 
Fix error log when copy file
 2021-03-19 10:51:23 -07:00
Kazuyoshi Kato
7704fe72d0 Specifically mention "mkfs.ext4" on the error from the command 
Before the change, the error on the caller-side (e.g. ctr) was
something like

> unpack: failed to prepare extraction snapshot "...": exit status 5:
> unknown

which was too cryptic.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-03-19 10:38:47 -07:00
Phil Estes
2061227b56
Merge pull request #4949 from hs0210/work 
Add unit test for func in remotes/docker/pusher.go
 2021-03-19 13:11:46 -04:00
Shiming Zhang
1410220d8f Fix error log when copy file 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
 2021-03-20 00:13:00 +08:00
Phil Estes
86a7db4865
Merge pull request #5227 from tonistiigi/grpc-stream-close 
contentproxy: ensure grpc stream is closed on commit
 2021-03-19 09:21:56 -04:00
Phil Estes
fbf79545df
Merge pull request #5230 from wzshiming/fix/log-kill-shim 
Fix error log when kill shim
 2021-03-19 09:20:18 -04:00
Shiming Zhang
fe787efa2b Fix error log when kill shim 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
 2021-03-19 19:03:47 +08:00
Tonis Tiigi
8d8c15ca53 contentproxy: ensure grpc stream is closed on commit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-03-18 22:46:49 -07:00
Maksym Pavlenko
2d5f9bf870
Merge pull request #4990 from kzys/host-status 
ci: log the status of GitHub Actions' VM at the end
 2021-03-18 15:56:46 -07:00
Phil Estes
6e343f25e8
Switch test image to a non rate-limited manifest list 
Signed-off-by: Phil Estes <estesp@amazon.com>
 2021-03-18 14:07:32 -04:00
Michael Crosby
969b3d638b
Merge pull request #5202 from wzshiming/fix/dgst-debug 
Change dgst to digest in debug
 2021-03-18 11:54:44 -04:00
Michael Crosby
63b605d8fd
Merge pull request #5210 from thaJeztah/bump_k8s 
go.mod: kubernetes v1.20.4
 2021-03-18 11:44:55 -04:00
Michael Crosby
3f98a6d2d3
Merge pull request #5211 from pacoxu/pause/3.5 
upgrade pause image to 3.5 for non-root
 2021-03-18 11:43:59 -04:00
Michael Crosby
31c0587351
Merge pull request #5218 from alakesh/runtime-v2-stress 
change default runtime for containerd-stress app
 2021-03-18 11:42:30 -04:00