github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,017 Commits 3 Branches 2 Tags 112 MiB
f8538b5e12
Commit Graph

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
94964b36d0
Update Golang 1.13.6 
full diff: https://github.com/golang/go/compare/go1.13.5...go1.13.6

go1.13.6 (released 2020/01/09) includes fixes to the runtime and the net/http
package. See the Go 1.13.6 milestone on the issue tracker for details.

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-17 15:54:16 +01:00
Phil Estes
6b5553ee6c
Merge pull request #3919 from Zyqsempai/add-io-metrics 
Added IO metrics for cgroup v2
 2020-01-17 08:56:54 -05:00
Boris Popovschi
6b8846cdf8 vendor updated + added cgroupv2 metrics 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2020-01-17 11:55:06 +02:00
Akihiro Suda
64b08f90e9
Merge pull request #3966 from zhsj/update-btrfs 
vendor: bump containerd/btrfs to 153935315f4ab9be5bf03650a1341454b05efa5d
 2020-01-17 15:30:10 +09:00
Shengjing Zhu
22b73a9a78 vendor: bump containerd/btrfs to 153935315f4ab9be5bf03650a1341454b05efa5d 
Fix building issue on mipsle

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-17 10:57:48 +08:00
Derek McGowan
b8797016bb
Merge pull request #3964 from zhsj/flaky-metastore-test 
snapshots: fix flaky TestMetastore
 2020-01-15 11:05:24 -08:00
Phil Estes
e095480716
Merge pull request #3962 from zhsj/clean-test 
sys: clean up process after test
 2020-01-15 13:36:53 -05:00
Shengjing Zhu
1189cc40f2 snapshots: fix flaky TestMetastore 
35a8e6e589/check/containerd-build-arm64/de237af/logs/make_test.txt

--- FAIL: TestMetastore (18.27s)
    --- FAIL: TestMetastore/GetInfo (13.91s)
        metastore_test.go:242: assertion failed:
            --- expected
            +++ info
            {snapshots.Info}.Created:
            	-: s"0001-01-01 00:00:00 +0000 UTC"
            	+: s"2020-01-15 14:15:38.71882571 +0000 UTC"
            {snapshots.Info}.Updated:
            	-: s"0001-01-01 00:00:00 +0000 UTC"
            	+: s"2020-01-15 14:15:38.71882571 +0000 UTC"
            : on key committed-1

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-15 23:12:05 +08:00
Shengjing Zhu
35a8e6e589 sys: clean up process after test 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-15 22:03:39 +08:00
Phil Estes
5383d31f32
Merge pull request #3963 from zhsj/flaky-gc-test 
gc: increase sleep time in test
 2020-01-15 08:27:07 -05:00
Boris Popovschi
3eb57b01be Added IO metrics 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2020-01-15 14:35:47 +02:00
Shengjing Zhu
e859b8a92b gc: increase sleep time in test 
Fix some flaky tests.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-15 18:28:11 +08:00
Lantao Liu
b2804c0693
Merge pull request #1371 from AkihiroSuda/cgroup2-unshare-cgroupns 
cgroup2: unshare cgroup namespace for containers
 2020-01-14 10:08:14 -08:00
fahedouch
486d33631e test runtime v2 CPU settings 
Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>
 2020-01-14 18:23:54 +01:00
Akihiro Suda
c55bd87f47
Merge pull request #3956 from sethp-nr/fix/eventfd-leak 
fix: eventfd leak
 2020-01-14 12:11:57 +09:00
Derek McGowan
bb9d4e8bf2
Merge pull request #3959 from thaJeztah/bump_prometheus 
Bump prometheus/client_golang and dependencies v1.3.0
 2020-01-13 15:29:15 -08:00
Seth Pellegrino
66508589d3 fix: eventfd leak for v2 runtime with v1 cgroups 
There's no OOM monitoring for the v2 cgroups yet, so it seems unlikely
that there was a leak in that case.

Signed-off-by: Seth Pellegrino <spellegrino@newrelic.com>
 2020-01-13 10:49:11 -08:00
Seth Pellegrino
9456040acb fix: eventfd leak 
Only start watching the cgroup for OOMs when the first process starts
instead of on every process.

Signed-off-by: Seth Pellegrino <spellegrino@newrelic.com>
 2020-01-13 10:39:54 -08:00
Sebastiaan van Stijn
2f0db8e2a8
vendor: bump prometheus/client_golang v1.3.0 
full diff: https://github.com/prometheus/client_golang/compare/v1.1.0...v1.3.0

This requires LK4D/vndr v0.1.0 or newer for vendoring; also adds a new
dependency: github.com/cespare/xxhash

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 17:00:24 +01:00
Sebastiaan van Stijn
e10c911876
vendor: bump prometheus/client_golang v1.1.0 
full diff: https://github.com/prometheus/client_golang/compare/v0.9.4...v1.1.0

Using v1.1.0, because version v1.2.0 and up use versioned import paths for the
github.com/cespare/xxhash/v2 dependency (prometheus/client_golang#657), which
causes vendoring with vndr to break due to the v2 in the import-path.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:43:31 +01:00
Sebastiaan van Stijn
845b91d6b5
vendor: bump prometheus/client_golang v0.9.4 
full diff: f4fb1b73fb...v0.9.4

version v0.9.0 is the minimum tagged version to work with go-metrics v0.0.1,
as it depends on `prometheus.Observer`:

    vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:43:29 +01:00
Sebastiaan van Stijn
04506b87d6
vendor: bump docker/go-metrics v0.0.1: 
full diff: 4ea375f775...v0.0.1

- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:43:20 +01:00
Sebastiaan van Stijn
99911ea668
vendor: bump prometheus/procfs v0.0.8 
full diff: cb4147076a...v0.0.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:11:53 +01:00
Sebastiaan van Stijn
ed6ae81861
vendor: bump prometheus/common v0.7.0 
full diff: 89604d1970...v0.7.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:10:10 +01:00
Sebastiaan van Stijn
c02dc24ecf
vendor: bump prometheus/client_model v0.1.0 
full diff: 99fa1f4be8...v0.1.0

- prometheus/client_model#22 add `go_package`, regenerate Go binding file
- prometheus/client_model#31 Support Go Modules
- prometheus/client_model#38 Remove all languages but Go and add a deprecation note

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:08:24 +01:00
Sebastiaan van Stijn
77a3780c25
vendor: bump beorn7/perks v1.0.1 
full diff: 4c0e84591b...v1.0.1

- beorn7/perks#3 Avoid iterating on maps
    - Speed up InsertTargeted* functions by at least 2x by avoiding iterating on maps.
- beorn7/perks#4 Fixed format error
- Use 1000000 instead of 1e6 for int constant
- Add go module support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:05:45 +01:00
Phil Estes
a767b62321
Merge pull request #3954 from AkihiroSuda/vendor-cgroups-20200110 
revendor containerd/cgroups
 2020-01-13 08:48:04 -05:00
Akihiro Suda
e1221e69a8 revendor containerd/cgroups 
Note: now vndr >= v0.10 is required (https://github.com/containerd/cgroups/issues/139)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-13 16:09:59 +09:00
Wei Fu
1c2606d05b
Merge pull request #3946 from wawa0210/bump-hcsshim 
bump microsoft/hcsshim to 0.8.7
 2020-01-13 09:30:43 +08:00
wawa0210
4d62d8795c
bump microsoft/hcsshim to 0.8.7 
Signed-off-by: 张潇 <xiaozhang0210@hotmail.com>
 2020-01-11 13:45:30 +08:00
Akihiro Suda
982e767745
Merge pull request #1374 from lumjjb/bump_containerd 
Bump vendor containerd/containerd version
 2020-01-11 07:28:33 +09:00
Brandon Lum
73cd077c6b Bump vendor containerd/containerd version 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-01-10 20:13:22 +00:00
Yecheng Fu
ef7f327f2a update config syntax in registry.md 
Signed-off-by: Yecheng Fu <fuyecheng@pingcap.com>
 2020-01-10 17:43:41 +08:00
Lantao Liu
83a9d2460c
Merge pull request #1363 from Random-Liu/fix-validate-config 
Validate and update the right config
 2020-01-10 00:11:27 -08:00
Phil Estes
0a1f2b4064
Merge pull request #3952 from lumjjb/fix_unpacker 
Fix unpacker to pass apply options
 2020-01-09 11:49:06 -05:00
Brandon Lum
95fbf3dc28 Fix unpacker to pass use apply options 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-01-09 15:10:07 +00:00
Phil Estes
7804afb226
Merge pull request #3950 from dmcgowan/fix-printf-scanner-error 
Fix filter errors
 2020-01-09 09:21:30 -05:00
Akihiro Suda
71740399e0 cgroup2: unshare cgroup namespace for containers 
In cgroup v1 container implementations, cgroupns is not used by default because
it was not available in the kernel until kernel 4.6 (May 2016), and the default
behavior will not change on cgroup v1 environments, because changing the
default will break compatibility and surprise users.

For cgroup v2, implementations are going to unshare cgroupns by default
so as to hide /sys/fs/cgroup from containers.

* Discussion: https://github.com/containers/libpod/issues/4363
* Podman PR (merged): https://github.com/containers/libpod/pull/4374
* Moby PR: https://github.com/moby/moby/pull/40174

This PR enables cgroupns for containers, but pod sandboxes are untouched
because probably there is no need to do.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-09 14:58:30 +09:00
Maksym Pavlenko
9f193c41d7
Merge pull request #3948 from jterry75/fix_lcow_size 
Support disk usage in windows-lcow snapshot
 2020-01-08 20:47:48 -08:00
Derek McGowan
3af3a76026
Fix filter errors 
Prevent error messages from being output to stderr.
Return illegal token when a quoted string is invalid and
capture the error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2020-01-08 18:07:50 -08:00
Hu Shuai
7b52bc506c Add unit test for func in filter.go 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2020-01-09 09:11:37 +08:00
Justin
522a056fe6
Merge pull request #1368 from mikebrow/vendor-update-2020-01-06 
update for containerd vendor changes
 2020-01-08 14:57:45 -08:00
Justin Terry (VM)
cd1cad9d55 Support disk usage in windows-lcow snapshot 
Windows snapshot usage was completed in ref: #3785 but lcow didnt get updated.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2020-01-08 13:43:48 -08:00
Mike Brown
2da1ced9a1 update for containerd vendor changes 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-01-08 15:30:36 -06:00
Michael Crosby
d3c1691ae1
Merge pull request #3933 from AkihiroSuda/update-rootless-md 
update docs/rootless.md
 2020-01-08 11:10:28 -05:00
Michael Crosby
8b3ef5fb20
Merge pull request #3944 from zhsj/fix-openlabci 
ci: set pipefail in zuul script
 2020-01-08 11:03:12 -05:00
Michael Crosby
41088e405f
Merge pull request #3939 from zhsj/fix-arm 
platforms: fill default arm variant when parse platform specifier
 2020-01-08 11:00:56 -05:00
Phil Estes
80d50a8a63
Merge pull request #3925 from dmcgowan/snapshot-cleanup-api 
Add Cleanup to snapshot API
 2020-01-08 10:03:18 -05:00
Phil Estes
3e9ef5db79
Merge pull request #3941 from dmcgowan/skip_tests 
Add Makefile variable to skip test packages
 2020-01-08 09:44:05 -05:00
Shengjing Zhu
f3090ce80f ci: set pipefail in zuul script 
Otherwise the exit code is always 0

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-08 13:50:20 +08:00