Commit Graph

5531 Commits

Author SHA1 Message Date
Derek McGowan
12cb1554be
Merge pull request #3972 from fuweid/me-fix-3937
Pull: create image record after blobs download
2020-01-30 10:56:59 -08:00
Phil Estes
431cfd86e7
Merge pull request #3991 from mihaicmn/fix-default-config
Fix startup_delay within default configuration
2020-01-30 11:42:40 +02:00
Mihai Coman
5e6d56ee2d Fix startup_delay within default configuration
Without this patch, the containerd daemon fails to start using the
default configuration example:
containerd[37139]: containerd: time: missing unit in duration 100000000

Signed-off-by: Mihai Coman <mihai.cmn@gmail.com>
2020-01-29 15:34:23 +02:00
Phil Estes
07de4eccf1
Merge pull request #3983 from AkihiroSuda/ctr-events-ignore-err
ctr events: do not exit on an error
2020-01-29 15:05:48 +02:00
Phil Estes
a07cb9d0c4
Merge pull request #3987 from thaJeztah/bump_golang_1.13.7
Update Golang 1.13.7, x/crypto (CVE-2020-0601, CVE-2020-7919)
2020-01-29 10:35:45 +02:00
Akihiro Suda
833701165a ctr events: do not exit on an error
Errors like `"type with url %s: not found"` are typical for non-builtin
event types, and should not resultin exiting `ctr`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-29 13:10:16 +09:00
Sebastiaan van Stijn
2002411638
vendor: update golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
full diff: 60c769a6c5...69ecbb4d6d

Includes 69ecbb4d6d
(forward-port of 8b5121be2f),
to address CVE-2020-7919:

Panic in crypto/x509 certificate parsing and golang.org/x/crypto/cryptobyte
On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1 parsing
functions of golang.org/x/crypto/cryptobyte can lead to a panic.
The malformed certificate can be delivered via a crypto/tls connection to a
client, or to a server that accepts client certificates. net/http clients can
be made to crash by an HTTPS server, while net/http servers that accept client
certificates will recover the panic and are unaffected.
Thanks to Project Wycheproof for providing the test cases that led to the
discovery of this issue. The issue is CVE-2020-7919 and Go issue golang.org/issue/36837.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 18:46:31 +01:00
Sebastiaan van Stijn
32ba75f0fb
Update Golang 1.13.7 (CVE-2020-0601, CVE-2020-7919)
full diff: https://github.com/golang/go/compare/go1.13.6...go1.13.7

go1.13.7 (released 2020/01/28) includes two security fixes. One mitigates
the CVE-2020-0601 certificate verification bypass on Windows. The other affects
only 32-bit architectures.

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

- X.509 certificate validation bypass on Windows 10
  A Windows vulnerability allows attackers to spoof valid certificate chains when
  the system root store is in use. These releases include a mitigation for Go
  applications, but it’s strongly recommended that affected users install the
  Windows security update to protect their system.
  This issue is CVE-2020-0601 and Go issue golang.org/issue/36834.
- Panic in crypto/x509 certificate parsing and golang.org/x/crypto/cryptobyte
  On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1 parsing
  functions of golang.org/x/crypto/cryptobyte can lead to a panic.
  The malformed certificate can be delivered via a crypto/tls connection to a
  client, or to a server that accepts client certificates. net/http clients can
  be made to crash by an HTTPS server, while net/http servers that accept client
  certificates will recover the panic and are unaffected.
  Thanks to Project Wycheproof for providing the test cases that led to the
  discovery of this issue. The issue is CVE-2020-7919 and Go issue golang.org/issue/36837.
  This is also fixed in version v0.0.0-20200124225646-8b5121be2f68 of golang.org/x/crypto/cryptobyte.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 18:35:49 +01:00
Akihiro Suda
d3b42574a7
Merge pull request #3986 from thaJeztah/fix_release_tool_link
Fix broken link to release-tool
2020-01-29 01:06:57 +09:00
Akihiro Suda
09944e714f
Merge pull request #3985 from thaJeztah/bump_versions
RELEASES.md update links to latest v1.2.11 and v1.3.2
2020-01-29 01:06:41 +09:00
Sebastiaan van Stijn
e42110f326
Fix broken link to release-tool
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 14:57:31 +01:00
Sebastiaan van Stijn
e2e07c9bc1
RELEASES.md update links to latest v1.2.11 and v1.3.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 14:53:07 +01:00
Phil Estes
a1e0303e7a
Merge pull request #3978 from dims/sync-with-latest-containerd-cri-master-including-selinux-change
Sync with latest changes in containerd/cri
2020-01-25 23:41:13 +02:00
Davanum Srinivas
0dc69620b8
update dependencies of containerd/cri
List generated by running:
`git diff c9d45e6526 19589b4bf9 vendor.conf`

in the containerd/cri repositoru

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-25 14:20:17 -05:00
Davanum Srinivas
53ced5ffe1
update to latest containerd/cri (master)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-25 14:20:11 -05:00
Davanum Srinivas
faf03c3d23
Pick up fix for CVE-2019-16884 in opencontainers/selinux
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-25 14:19:59 -05:00
Phil Estes
5c72f92a5d
Merge pull request #3973 from dims/update-to-new-rc10-of-opencontainers/runc
Bump to opencontainers/runc new version - v1.0.0-rc10
2020-01-25 06:58:34 +02:00
Davanum Srinivas
923c05bed1
Bump to opencontainers/runc new version - v1.0.0-rc10
We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-19921 as well. The full
diff upstream is here:
https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-24 10:13:56 -05:00
Phil Estes
c2ad9dc12d
Merge pull request #3970 from TBBle/windows_build_without_cgo
Revendor hcsshim to remove CGO requirement from Windows build
2020-01-22 18:38:09 +02:00
Paul "TBBle" Hampson
e44d008659 Appveyor on_success field should be an array.
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-22 21:29:52 +11:00
Paul "TBBle" Hampson
a224937d2c Disable CGO for AppVeyor build steps
CGO is explicitly enabled for the test steps, as `-race` is passed to
`go test`, which depends on CGO to function.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-22 21:29:52 +11:00
Wei Fu
75af17946d Pull: create image record after blobs download
When pull image with unpack option, the fetch action will defer blobs
download until unpack. If create image record in ImageService before
blobs download, the following requests to use image will fail because
there is still missing blobs download.

In order to fix concurrent issue, need to create image record after
blobs download.

Fix: #3937

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-01-20 18:26:14 +08:00
Paul "TBBle" Hampson
45a17cffb6 Vendor Microsoft/hcsshim with CGO removal
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-19 06:07:10 +11:00
Akihiro Suda
592a617f3d
Merge pull request #3969 from thaJeztah/bump_golang_1.13.6
Update Golang 1.13.6
2020-01-18 02:43:26 +09:00
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
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
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