Commit Graph

5531 Commits

Author SHA1 Message Date
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
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
Akihiro Suda
62adc516dd sys: mkdirAs: do chown if dir already exists
Fix `buildkitd --group GROUP` issue when `/run/buildkit` already exists
and is owned by the root.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-12-18 14:19:19 +09:00
Michael Crosby
9b5581cc9c
Merge pull request #3887 from joakimr-axis/joakimr-axis_scripts
Improve install scripts
2019-12-17 09:20:32 -05:00
Boris Popovschi
49e7039a85 cpu metrics consistency
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
2019-12-17 12:30:12 +02:00
Boris Popovschi
b9d9bdf1fd make cpu metrics consistent with v2 docs
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
2019-12-17 12:22:55 +02:00
Boris Popovschi
929ab521c6 fix system usage naming
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
2019-12-17 11:05:28 +02:00
Boris Popovschi
659c971cad task metrics fix
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
2019-12-17 10:52:37 +02:00
Boris Popovschi
23dbae3e71 Schema name fix
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
2019-12-17 10:40:11 +02:00
Derek McGowan
566121485b
Merge pull request #3868 from awprice/issue-3850
Improve host fallback behaviour in docker remote
2019-12-16 21:43:10 -08:00
Boris Popovschi
17d61d6b7e Units fix
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
2019-12-16 19:54:21 +02:00
bpopovschi
f287bc2292 Schema names fix
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
2019-12-16 19:28:42 +02:00
bpopovschi
6bfb24824b Fix prometheus metrics units
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
2019-12-16 18:27:50 +02:00
bpopovschi
b98cc79184 Added memory and cpu metrics for cgroupv2
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
2019-12-16 16:10:51 +02:00
Akihiro Suda
5473637144
Merge pull request #3892 from mxpv/dm-retry
Attempt to make device mapper snapshotter tests less flaky
2019-12-14 15:26:03 +09:00
Phil Estes
6c82fe5429
Merge pull request #3891 from AkihiroSuda/rename-pids-v2
metrics: rename pids_v2 to pids
2019-12-14 13:16:50 +11:00
Maksym Pavlenko
75efbaf678 Attempt to make device mapper snapshotter tests less flaky
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-12-13 13:20:23 -08:00
Joakim Roubert
9eef69e3ae Update after review comments
Change-Id: Ic566e4857436409cdf1cdd7a635dfeee809b91a9
Signed-off-by: Joakim Roubert <joakimr@axis.com>
2019-12-13 08:07:23 +01:00
Akihiro Suda
43fca9eba2 metrics: rename pids_v2 to pids
dicussed in #3726

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-12-13 15:41:08 +09:00
Michael Crosby
082f7e3aed
Merge pull request #3890 from estesp/printf-to-log
Use logrus instead of printf for warning
2019-12-12 21:02:39 -05:00
Alex Price
a022c21819 Improve host fallback behaviour in docker remote
This commit improves the fallback behaviour when resolving and
fetching images with multiple hosts. If an error is encountered
when resolving and fetching images, and more than one host is being
used, we will try the same operation on the next host. The error
from the first host is preserved so that if all hosts fail, we can
display the error from the first host.

fixes #3850

Signed-off-by: Alex Price <aprice@atlassian.com>
2019-12-13 11:42:32 +11:00
Phil Estes
fa62b6d238
Use logrus instead of printf for warning
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-12-12 19:33:04 -05:00
Phil Estes
ff91f225fa
Merge pull request #3889 from dmcgowan/allow-empty-scope
Allow empty scope authorization
2019-12-13 07:36:04 +11:00
Michael Crosby
5d93ece758
Merge pull request #3799 from AkihiroSuda/cgroup2
support cgroup2
2019-12-12 14:30:19 -05:00
Michael Crosby
1649e8e43b
Merge pull request #3848 from liaojh1998/master
support user remapping in ctr
2019-12-12 14:20:07 -05:00
Derek McGowan
08517e5864
Allow empty scope authorization
Registries may allow using token authorization without
explicitly setting the scope. This may cover use cases where
no scope is required for an endpoint or the registry is only
covering authentication using the token. This aligns with the
oauth2 spec which specifies the scope as optional.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-12-12 11:05:48 -08:00
Joakim Roubert
499fbb0337 Improve install scripts
* Only use bash where needed (scripts with pipes that use -o pipefail)
* Make string comparisons POSIX compatible
* Handle whitespace(s) in GOPATH
* Remove superfluous quotes in variable assignments

Change-Id: If1ea55f06f402ded646b5085d4837c0996f90fab
Signed-off-by: Joakim Roubert <joakimr@axis.com>
2019-12-12 13:25:25 +01:00
Akihiro Suda
55698e6942
Merge pull request #3886 from joakimr-axis/joakimr-axis_helptext
start.go: Improve help text
2019-12-12 20:12:10 +09:00
Joakim Roubert
e0011978ff start.go: Improve help text
Change-Id: I9adfc27868b246fb85823d18c65f95668e3fbc58
Signed-off-by: Joakim Roubert <joakimr@axis.com>
2019-12-12 11:19:41 +01:00
Jie Hao Liao
9862cb8f85 support user remapping in ctr
* --uidmap support for one remapping
* --gidmap support for one remapping
* create IoUid and IoGid options for getNewTaskOpts

Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
2019-12-12 01:16:47 -06:00
Akihiro Suda
b02e20f12e cgroup2: enable controllers automatically
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-12-12 02:56:51 +09:00
Akihiro Suda
8f870c233f support cgroup2
* only shim v2 runc v2 ("io.containerd.runc.v2") is supported
* only PID metrics is implemented. Others should be implemented in separate PRs.
* lots of code duplication in v1 metrics and v2 metrics. Dedupe should be separate PR.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-12-12 02:56:51 +09:00
Akihiro Suda
f01665aa02
Merge pull request #3881 from liaojh1998/idmap
Split uid and gid user ns remapping in oci
2019-12-11 20:05:28 +09:00
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
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
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
Maksym Pavlenko
640ca7812f
Merge pull request #3874 from crosbymichael/image-meta
Return the underlying images metadata
2019-12-04 11:15:02 -08:00