github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
5,411 Commits 3 Branches 2 Tags 112 MiB
659c971cad
Commit Graph

5411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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