dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-08 22:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,224 Commits 33 Branches 333 Tags
4fe080beaf4f690cb0f57d013fa5ded2bd7d0bbc
Commit Graph
420 Commits
Author SHA1 Message Date
Shengjing Zhu cbcb2f57fb vendor: update cri 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-03-03 01:09:16 +08:00
Phil Estes 8a7e41c5c6 Merge pull request #5018 from zhsj/bpo-4974 
[release/1.4] Update gogo/protobuf to v1.3.2
 2021-02-08 09:11:04 -05:00
Shengjing Zhu f4a6e163e0 Update continuity 
Pickup usage calculation fix

Signed-off-by: Derek McGowan <derek@mcg.dev>

(cherry picked from commit 41da96d670)

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-02-08 12:13:15 +08:00
Shengjing Zhu 2ec4a495fa Update gogo/protobuf to v1.3.2 
bump version 1.3.2 for gogo/protobuf due to CVE-2021-3121 discovered
in gogo/protobuf version 1.3.1, CVE has been fixed in 1.3.2

Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>

(cherry picked from commit 1423e9199d)

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-02-08 11:47:43 +08:00
Derek McGowan ca99507552 Update cri version to pickup unknown state fix 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-25 17:25:29 -08:00
Derek McGowan 0b97c62041 Update cri plugin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-24 17:52:10 -08:00
Phil Estes fbe18caa19 Update btrfs vendor for chkptr fix for Go >= 1.14 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(cherry picked from commit 6fb56aa58b)
 2020-11-23 18:47:43 -05:00
Phil Estes c745d237e0 Revendor CRI to get disabled annotation config default 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-11-03 09:25:39 -05:00
Kevin Parsons 856a12fcab Update github.com/Microsoft/hcsshim to v0.8.10 
Brings in a variety of changes, mostly to the containerd shim.

There is also a change to the Windows layer unpack code which fixes #4301.

Release link: https://github.com/microsoft/hcsshim/releases/tag/v0.8.10

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
(cherry picked from commit a043c0dc3d)
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2020-10-26 13:51:04 -07:00
Sebastiaan van Stijn ce7ba6691f vendor: github.com/willf/bitset v1.1.11 
The changes needed by opencontainers/selinux are now in a tagged
release. This will make our dependency slightly ahead of what's
used by opencontainers/selinux until a v1.6.1 is tagged.

full diff: https://github.com/willf/bitset/compare/d5bec3311243...v1.1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a6fc9ca490)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-09-15 21:40:06 +02:00
Antonio Ojea 16712ae493 bump cni version to v0.8.0 
bump cni dependencies so we can benefits from its
bugfixes and improvements

Signed-off-by: Antonio Ojea <antonio.ojea.garcia@gmail.com>
(cherry picked from commit e3d27f9ed8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-09-11 09:40:45 +02:00
Sebastiaan van Stijn a1736f98a5 vendor: containerd/cri 4e6644c8cf 
full diff: https://github.com/containerd/cri/compare/8871d5cdf8102a7d5989c307f2a366946feb54ee...4e6644c8cf7fb825f62e0007421b7d83dfeab5a1

- Bump Golang 1.13.15
- Bump containerd v1.4.0 rc.0
- vendor: kubernetes 1.19.0 rc.4 and dependencies

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 10:11:05 +02:00
Sebastiaan van Stijn aa40ebb417 vendor: json-iterator/go v1.1.10 
full diff: https://github.com/json-iterator/go/compare/v1.1.9...v1.1.10

- Fix 459 map keys of custom types should serialize using MarshalText when available
- Fix potential panic in (*stringAny).ToInt64 and (*stringAny).ToUint64 (see 450)
- Fix 449 do NOT marshal the field whose name start with underscore
- Reuse stream buffer and remove flush in (*Stream).WriteMore(see 441 440)
- Fix 421 simplify the error string returned by the decoder when it meets error unmarshaling anonymous structs
- Fix 389 411 do NOT marshal the json.RawMessage type field whose real type is integer/float as "null" with ValidateJsonRawMessage option enabled
- Fix 326 do Not marshal private field after calling extra.SetNamingStrategy() to register naming strategy extension

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 09:57:36 +02:00
Akihiro Suda 8433602989 update runc to v1.0.0-rc92 
Changes: https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc92

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-06 20:31:33 +09:00
Akihiro Suda 362b7167a7 vendor: update cri (no more libseccomp cgo dependency) 
https://github.com/containerd/cri/compare/8448b92d237e877bed1e4aa7a0baf0dee234dbcb...8871d5cdf8102a7d5989c307f2a366946feb54ee

The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is
always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-31 14:32:08 +09:00
Wei Fu 4a96be9795 Merge pull request #4431 from TBBle/import_manifest_for_test_binary 
Import Windows manifest into test build, rather than copying by script
 2020-07-30 23:13:15 +08:00
Akihiro Suda 779ef60231 Merge pull request #4435 from tao12345666333/update-runc 
vendor runc library to v1.0.0-rc91-48-g67169a9d
 2020-07-30 13:10:51 +09:00
Jintao Zhang b870231854 vendor runc library to v1.0.0-rc91-48-g67169a9d 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2020-07-29 14:52:48 +08:00
Paul "TBBle" Hampson aa56cfc0a8 Import Windows manifest into test build, rather than copying by script 
This will ensure that we can always get the current Windows OS build
version, without being put into Windows 8 compatibility mode.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-07-29 06:02:35 +10:00
Sebastiaan van Stijn 5b1627410d vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 
full diff: https://github.com/containerd/continuity/compare/d3ef23f19fbb106bb73ffde425d07a9187e30745...efbc4488d8fe1bdc16bde3b2d2990d9b3a899165

Fix sameFile() to recognize empty files as the same
  - fixes "Empty files can diff as "modified" even when they're not"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-07-28 16:39:35 +02:00
Michael Crosby 3611efdcef update cri to 8448b92d23 
This includes an update of the selinux package and the ability in the CRI
configuration to set the upper bounds for the selinux category labels that are
generated.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-07-23 17:11:18 -04:00
Akihiro Suda 1a7bbd1f71 vendor: update containerd/cri 
Changes: https://github.com/containerd/cri/compare/8fb244a65baad2457e6c8658db18ed28b1f77cfe...fcda0cf4a7e70f0317238b09556329239321353b

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-20 13:14:11 +09:00
Davanum Srinivas 212c29833f Updates to go-systemd and selinux 
caught these when i was looking at cadvisor's deps.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-07-15 17:08:34 -04:00
Sebastiaan van Stijn cc493eba3f vendor: containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff 
full diff: https://github.com/containerd/cgroups/compare/0dbf7f05ba59274095946e2c0c89540726e8a8aa...318312a373405e5e91134d8063d04d59768a1bff

relevant changes:

- cpuset: typo fix for function name
- Retry file writes on EINTR errors to work with Go 1.14 asynchronous preemption
- Various linting issues and cleanup

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-07-13 14:54:05 +02:00
Mike Brown d7e59b141c enable removecontainer to forcibly remove containers 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-07-05 12:47:43 -05:00
Davanum Srinivas 963625d7bc Update runc to v1.0.0-rc91 
https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc91

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-07-04 14:46:03 -04:00
Sebastiaan van Stijn a6dd1f27d9 update urfave/cli v1.22.1, go-md2man v2.0.0, blackfriday v2.0.1 
This updates urfave/cli and its dependencies to v1.22.1:

- diff for urfave/cli: https://github.com/urfave/cli/compare/v1.22.0...v1.22.1
- diff for go-md2man: https://github.com/cpuguy83/go-md2man/compare/v1.0.10...v2.0.0
- diff for blackfriday: https://github.com/russross/blackfriday/compare/v1.5.2...v2.0.1

Also adds github.com/shurcooL/sanitized_anchor_name as a new dependency, which is
used by russross/blackfriday, but will be removed again in a future update (dependency
is already removed on the v2 branch through russross/blackfriday@919b1f5b9b

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-07-02 10:48:45 +02:00
Michael Crosby 785f4c5cd9 Bump CRI for 1.4x release 
includes selinux bump.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-06-15 16:07:00 -04:00
Davanum Srinivas e64b14820e Revendor CRI to 62c91260d2 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-02 15:27:39 -04:00
Akihiro Suda 2f601013e6 cgroup2: implement containerd.events.TaskOOM event 
How to test (from https://github.com/opencontainers/runc/pull/2352#issuecomment-620834524):
  (host)$ sudo swapoff -a
  (host)$ sudo ctr run -t --rm --memory-limit $((1024*1024*32)) docker.io/library/alpine:latest foo
  (container)$ sh -c 'VAR=$(seq 1 100000000)'

An event `/tasks/oom {"container_id":"foo"}` will be displayed in `ctr events`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-01 14:00:13 +09:00
Maksym Pavlenko 62fd1750e2 Revendor CRI to 8898550e34 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-29 14:34:27 -07:00
Michael Crosby c5273930bd Update CRI to 52c2c6b5df 
This bump contains updates for CRI with selinux support.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-05-26 21:06:18 -04:00
Phil Estes f13ba8f2f2 Merge pull request #4247 from thaJeztah/bump_continuity 
vendor: containerd/continuity, containerd/fifo, containerd/go-runc
 2020-05-12 10:41:02 -04:00
Sebastiaan van Stijn 3e7bbb8a49 vendor: update containerd/cri, remove "docker/distribution" dependency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-12 15:00:51 +02:00
Sebastiaan van Stijn f09e999099 vendor: containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c 
full diff: https://github.com/containerd/go-runc/compare/a5c2862aed5e6358b305b0e16bfce58e0549b1cd...7016d3ce2328dd2cb1192b2076ebd565c4e8df0c

- add go.mod
- Parse runc version even if commit is missing

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 23:13:39 +02:00
Sebastiaan van Stijn d9d1d5b624 vendor: containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf 
full diff: https://github.com/containerd/fifo/compare/bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13...f15a3290365b9d2627d189e619ab4008e0069caf

- add go.mod
- replace "golang.org/x/net/context"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 23:11:33 +02:00
Sebastiaan van Stijn c5078a5b72 vendor: containerd/continuity d3ef23f19fbb106bb73ffde425d07a9187e30745 
full diff: https://github.com/containerd/continuity/compare/0ec596719c75bfd42908850990acea594b7593ac...d3ef23f19fbb106bb73ffde425d07a9187e30745

- fs: support for OpenBSD
- sysx/xattr: fix and improve
- remove Windows' Readlink fork

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 23:02:40 +02:00
Sebastiaan van Stijn 2c77dc63a4 vendor: update containerd/cri to current master 
- Remove dependency on libcontainer/system
- Get rid of socat for port forwarding
- Roll docker/distribution back to latest (v2.7.1) release
  Now that 901bcb2231 was merged in containerd,
  we no longer depend on the ParseDockerRef utility from docker/distribution,
  so we can safely roll back to the latest release for this dependency.
- vendor: kubernetes v1.18.2
  Fix client watch reestablishment handling of client-side timeouts
- Add config flag to default empty seccomp profile

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 09:09:39 +02:00
Sebastiaan van Stijn 0d198fd096 vendor: roll docker/distribution back to latest (v2.7.1) release 
Now that 901bcb2231 was merged in containerd,
we no longer depend on the ParseDockerRef utility from docker/distribution,
so we can safely roll back to the latest release for this dependency.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-10 14:44:19 +02:00
Derek McGowan e9e765d6e5 Use tagged versions in vendor file 
Reverts change from tagged versions to sha.
Removes tag ambiguity on what version a sha points to when multiple tags available.
Makes comparing versions from previous releases more straight forward, without parsing potentially incorrect comment.
Fixes sync issue between tag in comment and sha, the selinux comment was incorrect here.
Updates reflect2 library to correctly tagged version, includes global variable fix.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-05-08 17:11:08 -07:00
Michael Crosby ed261720c8 Update ttrpc/typeurl to v1.0.1 
This updates the two packages to their released versions.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-05-08 14:31:31 -04:00
Sebastiaan van Stijn f212e7d1fe vendor: github.com/pkg/errors v0.9.1 
full diff: https://github.com/pkg/errors/compare/v0.8.1...v0.9.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-07 22:56:05 +02:00
Sebastiaan van Stijn ec12d3042f vendor: sirupsen/logrus v1.6.0 
full diff: https://github.com/sirupsen/logrus/compare/v1.5.0...v1.6.0

- Add flag to disable quotes in TextFormatter
- Revert "fix race conditions on entry"
    - fixes Deadlock during Entry.Infof after upgrade to v1.5.0
    - fixes Deadlock when using WithField inside of hook
    - fixes Overly-aggressive mutex locks

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-03 19:06:42 +02:00
Wei Fu ae7cdc814b vendor: update containerd/cri 
Commit ID: 65830369b6 from master

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-05-03 10:44:49 +08:00
Davanum Srinivas c1096864a7 Update to latest hcsshim - 0.8.9 
Switch to ad tagged version of hcsshim. Context here:
https://github.com/kubernetes/kubernetes/issues/87420#issuecomment-620837610

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-30 21:42:30 -04:00
Phil Estes 4be98fa28b Merge pull request #4220 from thaJeztah/update_terminal_sequences 
vendor konsorten/go-windows-terminal-sequences v1.0.3
 2020-04-29 09:19:14 -04:00
Phil Estes a10b502568 Merge pull request #4221 from thaJeztah/bump_logrus 
vendor: sirupsen/logrus v1.5.0
 2020-04-29 09:18:27 -04:00
Sebastiaan van Stijn ea182aec8a vendor: sirupsen/logrus v1.5.0 
full diff: https://github.com/sirupsen/logrus/compare/v1.4.1...v1.5.0

- Ability to DisableHTMLEscape when using the JSON formatter
- Support/fixes for go 1.14
- Many many bugfixes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-29 12:21:43 +02:00
Sebastiaan van Stijn 68f1515932 vendor konsorten/go-windows-terminal-sequences v1.0.3 
full diff: https://github.com/konsorten/go-windows-terminal-sequences/compare/v1.0.1...v1.0.3

- Fixes a panic when using logrus on Go 1.14
- Fix compile error on linux and darwin

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-29 12:12:03 +02:00
ktock 046a520c91 vendor: update containerd/cri dc7afe8fbe 
full diff: https://github.com/containerd/cri/compare/61b7af7564602234662562a9d37e772f5a54facb...dc7afe8fbe53db06c3f883f6f8c9895a9dfb2314

This commit includes moving up to the latest critools(1.18.0).

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-29 14:49:54 +09:00