Commit Graph

9017 Commits

Author SHA1 Message Date
Shengjing Zhu
90cd777a6c platforms: fill default arm variant when parse platform specifier
arm has been supported, but something is missing, causes test failure

    --- FAIL: TestParseSelector/linux (0.00s)
        platforms_test.go:292: arm support not fully implemented: not implemented
    --- FAIL: TestParseSelector/macOS (0.00s)
        platforms_test.go:292: arm support not fully implemented: not implemented

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-01-08 13:35:49 +08:00
Akihiro Suda
b553bc14a2 update docs/rootless.md
* Updated an example config to v2 syntax
* Updated for shim v2 (relates to #2767)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-08 13:37:29 +09:00
Derek McGowan
94d499843c
Add Makefile variable to skip test packages
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-01-07 15:25:05 -08:00
Derek McGowan
123af61c0b
Add Cleanup to snapshot API
Cleanup is an optional method a snapshotter may implement.
Cleanup can be used to cleanup resources after a snapshot
has been removed. This function allows a snapshotter to defer
longer resource cleanup until after snapshot removals are
completed. Adding this to the API allows proxy snapshotters
to leverage this enhancement.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-01-07 14:59:20 -08:00
Michael Crosby
0d276ece0e
Merge pull request #3932 from AkihiroSuda/ovl-test-opts
overlay: test actual Opts
2020-01-07 12:07:07 -05:00
Michael Crosby
fda9cebc81
Merge pull request #3936 from hs0210/work
Fix outdated comments
2020-01-07 11:45:56 -05:00
Phil Estes
da2890a908
Merge pull request #3934 from AkihiroSuda/ctr-address-env
ctr: support $CONTAINERD_ADDRESS env var
2020-01-07 09:14:48 -05:00
Phil Estes
82fdac1cd6
Merge pull request #3935 from zhsj/fix-gccgo
Fix build with gccgo
2020-01-07 08:47:14 -05:00
Shengjing Zhu
465c11dc87 Fix build with gccgo
+ archive: don't convert syscall.Timespec to unix.Timespec
  archive/tar_unix.go:179:76: error: invalid type conversion (cannot use type syscall.Timespec as type unix.Timespec)
    179 |  timespec := []unix.Timespec{unix.Timespec(fs.StatAtime(st)), unix.Timespec(fs.StatMtime(st))}
+ gccgo has no plugin support
  https://github.com/golang/go/issues/36403
+ update github.com/containerd/continuity
  to include same fix for Timespec

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-01-07 19:28:26 +08:00
Hu Shuai
52e477f947 Fix outdated comments
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2020-01-07 16:30:44 +08:00
Akihiro Suda
b127b666aa ctr: support $CONTAINERD_ADDRESS env var
`$CONTAINERD_ADDRESS` can be specified instead of the `ctr --address` flag.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-07 15:59:12 +09:00
Akihiro Suda
a4b423b19b overlay: test actual Opts
AsynchronousRemove opt was untested while it is specified by default in the plugin init.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-07 13:52:13 +09:00
Wei Fu
d5714702d1
Merge pull request #3883 from AkihiroSuda/ci-crun
.travis.yml: run test with crun
2020-01-07 12:46:32 +08:00
Akihiro Suda
067a66b90a
.travis.yml: run test with crun
Relates to #3727

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-06 16:29:06 -08:00
Mike Brown
55566f9682
Merge pull request #1364 from katiewasnothere/local_introspection
add introspection service to cri plugin
2020-01-06 15:58:17 -08:00
Derek McGowan
b9fad5e310
Merge pull request #3765 from AkihiroSuda/mount-fuse
mount: support FUSE helper
2020-01-06 11:15:39 -08:00
Wei Fu
7c856d1980
Merge pull request #3929 from darfux/v2_fix_win_ctx_ns
v2: Fix missing ns when openShimLog on windows
2020-01-06 15:42:32 +08:00
Li Yuxuan
1fb1d93212 v2: Fix missing ns when openShimLog on windows
Related to
https://github.com/containerd/containerd/pull/3921#discussion_r363046745

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2020-01-05 19:42:33 +08:00
Kathryn Baldauf
63d2a0445c add local support for introspection service
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-01-03 11:42:21 -08:00
Wei Fu
5fc0f30167
Merge pull request #3903 from katiewasnothere/local_introspection
create local version of introspection service
2020-01-03 15:36:31 +08:00
Kathryn Baldauf
a18f77bea0 create local version of introspection service
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-01-02 12:34:23 -08:00
Phil Estes
b95fa01b95
Merge pull request #3915 from yeahdongcn/push
Support pushing a specific platform of a multi-architecture docker image to a registry
2020-01-02 12:26:35 -05:00
Akihiro Suda
e739314ed4 mount: support FUSE helper
When m.Type starts with either `fuse.` or `fuse3`, the
mount helper binary `mount.fuse` or `mount.fuse3` is executed.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-01 04:16:30 +09:00
Phil Estes
537afb1498
Merge pull request #3921 from darfux/v2_try_to_delete_shim_when_create_fail
v2: Call shim.Delete at first when create is failed
2019-12-31 00:02:27 -05:00
Michael Crosby
06b15f072d
Merge pull request #3920 from hs0210/work
Fix a typo in task.go
2019-12-30 10:49:04 -05:00
hs0210
87e2a95951 Fix a typo in task.go
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2019-12-30 13:40:33 +08:00
Derek McGowan
f823c37708
Merge pull request #3904 from yeahdongcn/manifest
Replace ocispec.MediaTypeImageManifest with manifest.MediaType
2019-12-27 22:03:13 -08:00
Li Yuxuan
d82fa43193 v2: Call shim.Delete at first when create is failed
If the context is cancelled during `shim.Create()`, such as the client
disconnects unexpectedly. The created shim will never be deleted.
What's more, if the context is cancelled during `openShimLog()`, the
fifo will be closed and block the shim output.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2019-12-28 00:02:11 +08:00
Michael Crosby
6b94b646b7
Merge pull request #3911 from ktock/passinfo
Enable to propagate necessary information to snapshotter during unpack
2019-12-26 10:42:17 -05:00
ktock
493a36de95 Move label filter to snapshots package
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2019-12-25 12:13:08 +09:00
Wei Fu
c1a24be5ac
Merge pull request #3916 from thaJeztah/bump_golang_1.13.5
Bump golang 1.13.5
2019-12-24 21:20:32 +08:00
Sebastiaan van Stijn
06f6ea099a
switch nighly builds to Go 1.13.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-23 15:29:09 +01:00
Sebastiaan van Stijn
c07e356d29
Update Golang 1.13.5
go1.13.5 (released 2019/12/04) includes fixes to the go command, the runtime, the
linker, and the net/http package. See the Go 1.13.5 milestone on our issue tracker
for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-23 15:27:18 +01:00
Xiaodong Ye
072dfbaf36 Support pushing a specific platform of a multi-architecture docker image to a registry
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
2019-12-23 17:24:45 +08:00
Kohei Tokunaga
4ccb7aa221 Enable to propagate necessary information to snapshotter during unpack
Though containerd gives ChainID to backend snapshotters during unpack for
searching snapshots to be skipped downloading the contents, ChainID isn't enough
for some snapshotters which require additional information of layers.
Some examples are remote snapshotters which is based on stargz filesystem
(requires image-related information to query the contents to docker registry)
and those which is based on CernVM-FS (requires manifest digest, etc. for
providing squashed rootfs).

This commit solves this issue by enabling a handler to inject additional
information of layers to snapshotters during unpack.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2019-12-23 10:39:40 +09:00
Maksym Pavlenko
97712c8ad7
Merge pull request #3906 from estesp/update-console-vendor
Update containerd/console vendor for fix
2019-12-20 10:38:56 -08:00
Maksym Pavlenko
166cc8b7d5
Merge pull request #3905 from estesp/more-adopters
Add more adopters to ADOPTERS.md
2019-12-20 10:38:07 -08:00
Phil Estes
496836c092
Update containerd/console vendor for fix
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-12-20 11:33:11 -05:00
Phil Estes
a057bfbd71
Add more adopters to ADOPTERS.md
Add k3s and Fargate.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-12-20 11:27:50 -05:00
Xiaodong Ye
facedf8980 Remove an empty line
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
2019-12-20 17:19:41 +08:00
Xiaodong Ye
05d192929b Update checkImages to accept images.MediaTypeDockerSchema2Manifest
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
2019-12-20 11:38:54 +08:00
Xiaodong Ye
c4ed3ff1ed Replace ocispec.MediaTypeImageManifest with manifest.MediaType
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
2019-12-20 10:26:13 +08:00
Lantao Liu
5a9c12d49e Validate and update the right config
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-12-19 17:50:51 -08:00
Michael Crosby
1809231003
Merge pull request #3896 from sipsma/close-platform-once
runtime v2: Close platform in runc shim's Shutdown method.
2019-12-19 11:54:26 -05:00
Michael Crosby
f602b7b883
Merge pull request #3899 from AkihiroSuda/fix-sys-mkdiras
sys: mkdirAs: do chown if dir already exists
2019-12-19 11:44:13 -05:00
Erik Sipsma
fbd46d7094
runtime v2: Close platform in runc shim's Shutdown method.
Previously, the platform was closed as part of the Delete method when the
process was an init for a task and there were no more tasks after its deletion.
This can create problems if another task is created within the shim right after
the delete runs, which results in the platform being closed but the shim
continuing to run.

This change moves closing the platform to the Shutdown method after the shim's
context is canceled, which ensures the platform is only closed once the shim
is sure its done servicing containers.

Signed-off-by: Erik Sipsma <sipsma@amazon.com>
2019-12-19 09:47:40 -05:00
Akihiro Suda
05bc0a1899
Merge pull request #3898 from estesp/test-5.0-kernel-ci
Temporarily disable criu tests in Travis CI
2019-12-19 21:45:26 +09:00
Phil Estes
8c7e6be290
Merge pull request #3870 from dmcgowan/download-during-apply
Defer layer download until unpack
2019-12-19 00:11:04 -05:00
Phil Estes
aac1ba0da4
Merge pull request #3893 from Zyqsempai/3736-added-cpu-and-memory-metrics
Added memory and cpu metrics for cgroupv2
2019-12-19 00:09:21 -05:00
Phil Estes
02dcf384bf
Disable criu tests in Travis CI
Temporarily disable criu tests until the 5.0.0 CI kernel issue is
resolved. Also update criu to v3.13

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-12-19 00:06:12 -05:00