Commit Graph

436 Commits

Author SHA1 Message Date
ktock
e79d666cdd vendor: update containerd/cri 61b7af7564
full diff: 92cb4ed978..61b7af7564

This adds new dependency github.com/fsnotify/fsnotify since 4ce334aa49

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-04-17 12:31:30 +09:00
Davanum Srinivas
f328f61b81
Update to selinux 1.5.1
Changes are listed here:
https://github.com/opencontainers/selinux/compare/v1.3.3...v1.5.1

Not urgent as such, just keep up with eco-system.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-04-08 06:29:50 -04:00
Akihiro Suda
4660e4dbb6
Merge pull request #4153 from thaJeztah/update_go_events
vendor: update go-events to fix alignment for 32bit systems
2020-04-07 10:09:49 +09:00
Maksym Pavlenko
fe7bfffbf4
Merge pull request #4151 from thaJeztah/bump_runtime_spec
vendor: runtime-spec v1.0.2
2020-04-05 16:37:33 -07:00
Maksym Pavlenko
3968fb0a49 Revert "vendor: update go.etcd.io/bbolt v1.3.4"
This reverts commit fb9e3d9f21.

Fixes: #4154

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-04 23:19:40 -07:00
Sebastiaan van Stijn
056d602240
vendor: update go-events to fix alignment for 32bit systems
- relates to moby/buildkit 1111
- relates to moby/buildkit 1079
- relates to docker/buildx 129

full diff: 9461782956...e31b211e4f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-04 02:02:17 +02:00
Sebastiaan van Stijn
4fb3410f65
vendor: cilium/ebbf 4032b1d8aae306b7bb94a2a11002932caf88c644
full diff: 60c3aa43f4...4032b1d8aa

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-04 00:31:39 +02:00
Sebastiaan van Stijn
e822296fc4
vendor: runtime-spec v1.0.2
full diff: 29686dbc55...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-04 00:21:43 +02:00
Kazuyoshi Kato
3261fb5c49 vendor: containerd/cgroups b4448137398923af7f4918b8b2ad8249172ca7a6
full diff: 7347743e5d...b444813739

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-04-03 11:54:48 -07:00
Sebastiaan van Stijn
fb9e3d9f21
vendor: update go.etcd.io/bbolt v1.3.4
full diff: https://github.com/etcd-io/bbolt/compare/v1.3.3...v1.3.4

- Fix unsafe pointer conversions caught by Go 1.14 checkptr
- Fix unexpected delete bucket error: "delete bucket: incompatible value"
- Add support for aix
- Add go.mod
- db.Path() resolves to db.file.Name()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-30 11:15:37 +02:00
Sebastiaan van Stijn
c00cf9a670
vendor: containerd/cri 92cb4ed978
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-12 23:15:45 +01:00
Sebastiaan van Stijn
1b7d1e81be
vendor: golang.org/x/sys 5c8b2ff67527cb88b770f693cebf3799036d8bc0
full diff: 52ab431487...5c8b2ff675

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-09 10:07:33 +01:00
Akihiro Suda
92cfc5b1fb
Merge pull request #4088 from mxpv/sd
Support NOTIFY_SOCKET
2020-03-08 15:49:26 +09:00
Maksym Pavlenko
ddae905b82 Support NOTIFY_SOCKET
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-03-07 10:24:51 -08:00
Sebastiaan van Stijn
b78dfbdfbe
vendor: golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
full diff: c990c680b6...52ab431487

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:36 +01:00
Sebastiaan van Stijn
ba6796abde
vendor: update kubernetes v1.18.0-beta.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:32 +01:00
Sebastiaan van Stijn
f3d062423c
vendor: sigs.k8s.io/yaml v1.2.0
full diff: https://github.com/kubernetes-sigs/yaml/compare/v1.1.0...v1.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:29 +01:00
Sebastiaan van Stijn
04c805e636
vendor: github.com/google/gofuzz v1.1.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:23 +01:00
Sebastiaan van Stijn
12c7d69769
vendor: update containerd/cri 1a00c06886
full diff: c0294ebfe0...1a00c06886

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:14 +01:00
Phil Estes
3a1c6a260a
Merge pull request #4073 from dims/update-opencontainers/selinux-to-1.3.3
Update to a released version of opencontainers/selinux (1.3.3)
2020-02-28 17:45:44 -05:00
Sebastiaan van Stijn
f2edc6f164
vendor: update gotest.tools v3.0.2
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 17:47:20 +01:00
Davanum Srinivas
026e43806a
Update to a released version of opencontainers/selinux (1.3.3)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-02-28 11:34:40 -05:00
Akihiro Suda
8e448bb279 vendor protobuf & grpc
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-26 10:57:05 +09:00
Sebastiaan van Stijn
f3652d0682
vendor: golang.org/x/crypto 1d94cc7ab1c630336ab82ccb9c9cda72a875c382
full diff: 69ecbb4d6d...1d94cc7ab1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-19 12:47:59 +01:00
Sebastiaan van Stijn
263ab70146
vendor: bump gopkg.in/yaml.v2 v2.2.8
full diff: https://github.com/go-yaml/yaml/compare/v2.2.4...v2.2.8

includes:

- go-yaml/yaml@f90ceb4 Fix check for non-map alias merging in v2
    - fix for "yaml.Unmarshal crashes on "assignment to entry in nil map""
- go-yaml/yaml 543 Port stale simple_keys fix to v2
- go-yaml/yaml@1f64d61 Fix issue in simple_keys improvements
    - fixes "Invalid simple_keys now cause panics later in decode"
- go-yaml/yaml 555 Optimize cases with long potential simple_keys

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-04 09:34:14 +01:00
Sebastiaan van Stijn
4c38278895
vendor: update containerd/cri c0294ebfe0
full diff: 19589b4bf9...c0294ebfe0

- containerd/cri#1387 vendor: bump gopkg.in/yaml.v2 v2.2.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-04 09:32:09 +01: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
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
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
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
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
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
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
wawa0210
4d62d8795c
bump microsoft/hcsshim to 0.8.7
Signed-off-by: 张潇 <xiaozhang0210@hotmail.com>
2020-01-11 13:45:30 +08: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
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
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
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
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