Commit Graph

8778 Commits

Author SHA1 Message Date
Michael Crosby
f0c6684ef1
Merge pull request #3884 from danbev/building-correction
Correct grammar/typo in BUILDING.MD
2019-12-10 09:57:18 -05:00
Daniel Bevenius
caeacfce34 Correct grammar/typo in BUILDING.MD
Signed-off-by: Daniel Bevenius <daniel.bevenius@gmail.com>
2019-12-10 12:19:51 +01:00
Jie Hao Liao
51a6813c06 Split uid and gid user ns remapping in oci
Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
2019-12-10 03:07:50 -06:00
Lantao Liu
0c2d3b718d Fix privileged devices.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-12-09 17:43:06 -08:00
Lantao Liu
78708b20c7
Merge pull request #1351 from Random-Liu/better-unknown-state-handling
Better handle unknown state.
2019-12-09 10:34:57 -08:00
Derek McGowan
30d92eff1c
Defer layer download until unpack
Moves the content fetching into the unpack process
and defers the download until the snapshot needs it
and is ready to apply. As soon as a layer is reached
which requires fetching, all remaining layers are
fetched.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-12-09 10:29:06 -08:00
Phil Estes
e8948e11aa
Merge pull request #3878 from crosbymichael/bump-console
Bump containerd console for os.File changes
2019-12-06 18:48:51 -05:00
Phil Estes
85e8b7f816
Merge pull request #3877 from crosbymichael/go-runc-race
Bump go-runc for buffer race fix
2019-12-06 18:48:11 -05:00
Lantao Liu
facbaa0e79 Better handle unknown state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-12-06 10:56:27 -08:00
Michael Crosby
9d5a095b00 Bump containerd console for os.File changes
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-12-06 13:46:47 -05:00
Michael Crosby
cd23ad2447 Bump go-runc for buffer race fix
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-12-06 11:40:50 -05:00
Mike Brown
69828d0bb2
Merge pull request #1349 from Zyqsempai/1316-use-with-host-devices
Use containerD WithHostDevices
2019-12-05 14:13:48 -08:00
Maksym Pavlenko
640ca7812f
Merge pull request #3874 from crosbymichael/image-meta
Return the underlying images metadata
2019-12-04 11:15:02 -08:00
Michael Crosby
6a22a8fc9e Return the underlying images metadata
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-12-04 13:03:41 -05:00
Phil Estes
6ed7ec4472
Merge pull request #3872 from liaojh1998/ctr-run-readonly
Modify ctr run to search for read-only flag instead of readonly
2019-12-04 09:43:25 -05:00
bpopovschi
5d7bd738e4 Use containerD WithHostDevices
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
2019-12-04 11:34:46 +02:00
Jie Hao Liao
787be0efe2 Modify ctr run to search for read-only flag instead of readonly
Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
2019-12-04 02:18:23 -06:00
Michael Crosby
5af0dcbe9d
Merge pull request #3869 from estesp/enable-appveyor-for-release-branches
Make sure for next release branch appveyor runs
2019-12-03 17:26:30 -05:00
Phil Estes
cfb4f734da
Make sure for next release branch appveyor runs
This is already added in release/1.3 and release/1.2 was fixed with a
specific branch name at some point.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-12-03 12:51:12 -05:00
Akihiro Suda
8b12d46a39
Merge pull request #3867 from awprice/issue-3865
Fix dependency in BUILDING.md
2019-12-03 11:07:39 +09:00
Alex Price
f92470b3eb Fix dependency in BUILDING.md
This commit fixes the btrfs dependency in the
"Build containerd and runc" section of BUILDING.md needed
for building containerd. btrfs/ioctl.h is now contained in
libbtrfs-dev.

Fixes #3865

Signed-off-by: Alex Price <aprice@atlassian.com>
2019-12-03 11:09:45 +11:00
Lantao Liu
0881caa9bd
Merge pull request #1348 from thaJeztah/bump_kubernetes_1.16.3
update kubernetes dependency to v1.16.3
2019-12-02 10:15:35 -08:00
Michael Crosby
b0821c801d
Merge pull request #3857 from Random-Liu/fix-container-pid
Fix container pid race condition.
2019-12-02 11:43:43 -05:00
Michael Crosby
8883983731
Merge pull request #3860 from sayaoailun/master
update cpuinfo to match kunpeng920 Architecture:aarch64
2019-12-02 09:54:01 -05:00
Michael Crosby
f2ef7b7d79
Merge pull request #3858 from thaJeztah/reformat_vendor
Reformat vendor.conf: use columns, pin by git-sha, and sort alphabetically
2019-12-02 09:03:37 -05:00
Lantao Liu
a6b6097c90 Fix container pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-12-02 01:02:22 -08:00
Lantao Liu
444f02a89e
Merge pull request #1344 from darfux/add-resolvconf-to-sandbox-container
Provide resolvConf to sandbox container's mounts
2019-12-01 21:25:19 -08:00
sayaoailun
726dcaea50 update cpuinfo to make variant matches aarch64 and so on
Signed-off-by: sayaoailun <guojianwei007@126.com>
2019-11-30 23:48:10 +08:00
Sebastiaan van Stijn
6fa9a42ea7
vendor.conf: sort imports alphabetically
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-29 13:33:41 +01:00
Sebastiaan van Stijn
a44189d2ff
vendor.conf: pin all dependencies by git-sha
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-29 13:33:39 +01:00
Sebastiaan van Stijn
55ea3dc9b1
vendor.conf: reformat to use columns
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-29 13:33:32 +01:00
Sebastiaan van Stijn
d63c62fb30
update kubernetes dependency to v1.16.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-28 14:44:15 +01:00
Li Yuxuan
dbc1fb37d0 Provide resolvConf to sandbox container's mounts
As https://github.com/kata-containers/runtime/issues/1603 discussed,
kata relies on such mount spec to setup resolv.conf for pod VM properly.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2019-11-28 12:05:05 +08:00
Wei Fu
3a31ce267d
Merge pull request #3853 from dmcgowan/fix-content-test-cleanup-race
Fix cleanup error on content client test
2019-11-27 22:58:37 +08:00
Lantao Liu
40e147cb73
Merge pull request #1347 from Random-Liu/fix-typo
Fix typo.
2019-11-26 16:36:23 -08:00
Lantao Liu
4f350ad474 Fix typo.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-26 15:09:07 -08:00
Lantao Liu
ae3c28c4d7
Merge pull request #1345 from Random-Liu/insecure-skip-verify
Add insecure_skip_verify option.
2019-11-26 14:34:55 -08:00
Lantao Liu
ab6701bd11 Add insecure_skip_verify option.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-26 13:25:52 -08:00
Derek McGowan
3e5402ce02
Merge pull request #3852 from estesp/update-vendors
Update cri and docker vendors
2019-11-26 12:00:04 -08:00
Derek McGowan
8da4346686
Fix cleanup error on content client test
A race occurs today where the cleanup runs after the lease
has been deleted, making all the content and statuses
eligible for collection during the cleanup. There is a case
where a status could be listed but removed before the
abort is called. In this case, abort will return a not found
and the test cleanup should ignore it.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-11-26 11:22:35 -08:00
Lantao Liu
d4d337b425
Merge pull request #1338 from Random-Liu/add-windows-release-tar-for-test
[WCOW] Add windows release tar for test
2019-11-26 10:58:13 -08:00
Akihiro Suda
75a46cec6a
Merge pull request #3851 from thaJeztah/bump_go_runc
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
2019-11-26 23:50:40 +09:00
Phil Estes
252d6550f5
Update cri and docker vendors
Update cri and docker to recent commits for mips enablement

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-11-26 09:46:46 -05:00
Sebastiaan van Stijn
8a66dc6edb
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
full diff: e029b79d8c...a2952bc25f

- containerd/go-runc#56 fix typo in successfully

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-26 14:54:26 +01:00
Akihiro Suda
45fb5aeaf7
Merge pull request #3793 from dmcgowan/prepare-snapshot-target
Support target snapshot references on prepare
2019-11-26 13:56:18 +09:00
Lantao Liu
0cb707e5f6 Add build script, this will be used in CI.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-25 16:45:56 -08:00
Lantao Liu
a60143be5b Add GOOS=windows make release support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-25 16:45:56 -08:00
Lantao Liu
4cc8bafa20 Update vendors.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-25 16:45:35 -08:00
Lantao Liu
c9d45e6526
Merge pull request #1341 from estesp/update-docker-vendor
Update docker/docker vendor to upstream latest
2019-11-25 14:27:25 -08:00
Derek McGowan
526c0db693
Support target snapshot references on prepare
Allows backend snapshots to bring existing snapshots into
a namespace without requiring clients to fully snapshots
when the target reference is known. Backend snapshots must
explicitly implement this functionality, it is equivalent
to sharing across namespaces and is up to the backend to
use the label when it is given or ignore it.

This enables remote snapshot functionality for a backend to
query for a target snapshot before a client has performed
any work to create that snapshot.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-11-25 10:07:25 -08:00