dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-08 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,224 Commits 33 Branches 333 Tags
4fe080beaf4f690cb0f57d013fa5ded2bd7d0bbc
Commit Graph
6224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 4fe080beaf Merge pull request #5139 from thaJeztah/1.4.4_fix_release_notes 
[release/1.4] Fix advisory link in release notes for containerd 1.4.4
 2021-03-08 14:11:06 -05:00
Sebastiaan van Stijn 4c2f6a7ab4 Fix advisory link in release notes for containerd 1.4.4 
This was pointing to the wrong advisory. The link has already been
fixed in the release notes on GitHub; this updates the toml file
to match.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-03-08 19:08:10 +01:00
Derek McGowan 05f951a378 Merge pull request from GHSA-6g2q-w5j3-fwh4 
Prepare release notes for 1.4.4
v1.4.4 		2021-03-04 21:45:55 -08:00
Derek McGowan 3ba4a31713 Prepare release notes for 1.4.4 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-03-04 18:18:35 -08:00
Akihiro Suda a22f1f642e Merge pull request #5107 from zhsj/update-cri 2021-03-03 10:57:55 +09:00
Shengjing Zhu cbcb2f57fb vendor: update cri 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-03-03 01:09:16 +08:00
Phil Estes da919aa2af Merge pull request #5103 from AkihiroSuda/cache-vagrant-14 
[release/1.4] CI: cache ~/.vagrant.d/boxes
 2021-03-01 15:04:47 -05:00
Akihiro Suda 633bfb7124 CI: cache ~/.vagrant.d/boxes 
For deflaking `vagrant up`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 4702af9178)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-03-02 00:40:14 +09:00
Michael Crosby 23495ab4a1 Merge pull request #5082 from AkihiroSuda/fix-5077-14 
[release/1.4] CI: fix "ls: cannot access '/etc/cni/net.d': Permission denied"
 2021-02-25 11:29:16 -05:00
Akihiro Suda e7851d743c CI: fix "ls: cannot access '/etc/cni/net.d': Permission denied" 
The CI host was probably updated recently and the permission bits of the
directory was changed.

Fix 5077

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit b4ef1e9dc7)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-02-25 13:28:53 +09: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
Wei Fu 758f076310 Merge pull request #5019 from zhsj/bpo-4808 
[release/1.4] Update continuity
 2021-02-08 17:11:19 +08: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
Akihiro Suda 33d90b72d1 Merge pull request #5010 from thaJeztah/1.4_update_golang 2021-02-06 00:39:10 +09:00
Sebastiaan van Stijn 232cee448f Update to go 1.15.8 
go1.15.8 (released 2021/02/04) includes fixes to the compiler, linker, runtime,
the go command, and the net/http package. See the Go 1.15.8 milestone on the
issue tracker for details.

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

The 1.4 branch was still on Go 1.15.5, so this patch also includes previous
patch updates;

full diff: https://github.com/golang/go/compare/go1.15.5...go1.15.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-02-05 15:29:04 +01:00
Wei Fu 02df14f783 Merge pull request #4993 from Iceber/fix-runc-v2-service-1.4 
[release/1.4] runtime: fix shutdown runc v2 service
 2021-02-03 13:45:43 +08:00
IceberGu f087d78491 runtime: fix shutdown runc v2 service 
Signed-off-by: IceberGu <wei.cai-nat@daocloud.io>
(cherry picked from commit b458583b76)
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-02-03 11:26:35 +08:00
Wei Fu 349f7a5ef9 Merge pull request #4971 from payall4u/bugfix/fix-open-shim-fifo-rebase 
[release/1.4] bugfix change flag from RDONLY to RDWR and close the fifo correct
 2021-02-02 12:09:27 +08:00
payall4u edffc830bb change flag from RDONLY to RDWR and close the fifo correct 
Signed-off-by: Zhiyu Li <payall4u@qq.com>
(cherry picked from commit 957fa3379d)
 2021-02-01 22:56:12 +08:00
Phil Estes c36f12a271 Merge pull request #4942 from zhsj/cherry-pick-4854 
[release/v1.4] pusher: add missing authentication support for requests
 2021-01-14 13:51:09 -05:00
Maksym Pavlenko 86f5704c69 Merge pull request #4941 from zhsj/cherry-pick-4855 
[release/v1.4] docker: avoid concurrent map access panic
 2021-01-14 10:35:43 -08:00
Tonis Tiigi e7cd2030e1 pusher: add missing authentication support for requests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 4dfec7fa01)
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-01-15 01:44:24 +08:00
Tonis Tiigi ec752e8ba1 docker: avoid concurrent map access panic 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit bf323c5bdd)
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-01-15 01:17:59 +08:00
Phil Estes 00f5ffa45d Merge pull request #4929 from fuweid/cherry-pick-1.4-846cb963c 
[release/1.4] runtime/v2: should use defer ctx to cleanup
 2021-01-12 09:33:02 -05:00
Wei Fu b73052d34a runtime/v2: should use defer ctx to cleanup 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 846cb963cc)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-01-12 20:15:38 +08:00
Phil Estes ed8ec97490 Merge pull request #4872 from masters-of-cats/pr-process-not-found-err-14 
[release/1.4 backport] Return GRPC not found error instead of plain one
 2020-12-23 08:09:55 -05:00
Phil Estes d5c1444afa Merge pull request #4874 from johnathanmdell/release/1.4 
[release/1.4] cherry-pick: Add bounds on max oom_score_adj value for AdjustOOMScore
 2020-12-22 07:34:04 -05:00
Danail Branekov 8cff6b3753 [release/1.4 backport] Return GRPC not found error instead of plain one 
When the shim returns a plain error when a process does not exist,
the server is unable to recognise its GRPC status code and assumes
UnknownError. This is awkward for containerd client users as they are
unable to recognise the actual reason for the error.

When the shim returns a NotFound GRPC error, it is properly translated
by the server and clients receive a proper NotFound error instead of
Unknown

Co-authored-by: Danail Branekov <danailster@gmail.com>
Co-authored-by: Georgi Sabev <georgethebeatle@gmail.com>

Signed-off-by: Danail Branekov <danailster@gmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
(cherry picked from commit 7451dd1ed1)
 2020-12-22 09:55:13 +02:00
Simon Kaegi a6f6eb00c2 Add bounds on max oom_score_adj value for AdjustOOMScore 
oom_score_adj must be in the range -1000 to 1000. In AdjustOOMScore if containerd's score is already at the maximum value we should set that value for the shim instead of trying to set 1001 which is invalid.

Signed-off-by: Simon Kaegi <simon_kaegi@ca.ibm.com>
(cherry picked from commit da2fd657ab)
 2020-12-22 08:25:02 +02:00
Derek McGowan 269548fa27 Merge pull request from GHSA-36xw-fx78-c5r4 
[release/1.4 backport] Use path based unix socket for shims
v1.4.3 		2020-11-30 10:32:18 -08:00
Derek McGowan 727e1728d8 Prepare 1.4.3 release notes 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-30 10:08:44 -08:00
Samuel Karp ae3a64aa10 containerd-shim: use path-based unix socket 
This allows filesystem-based ACLs for configuring access to the socket
of a shim.

Ported from Michael Crosby's similar patch for v2 shims.

Signed-off-by: Samuel Karp <skarp@amazon.com>
 2020-11-30 10:07:17 -08:00
Michael CrosbyandSamuel Karp 428f10fd27 Use path based unix socket for shims 
This allows filesystem based ACLs for configuring access to the socket of a
shim.

Co-authored-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Michael Crosby <michael@thepasture.io>
Signed-off-by: Michael Crosby <michael.crosby@apple.com>
 2020-11-30 10:07:17 -08:00
Derek McGowan b321d358e6 Merge pull request #4768 from dmcgowan/prepare-1.4.2 
[release/1.4] Prepare 1.4.2 release
v1.4.2 		2020-11-26 00:13:20 -08:00
Derek McGowan f2e4291b6c Prepare 1.4.2 release 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-25 21:36:34 -08:00
Derek McGowan 76f3d19551 Update mailmap for 1.4.2 release 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-25 17:25:29 -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
Phil Estes 21baf71093 Merge pull request #4767 from dmcgowan/update-1.4-cri 
[release/1.4] Update cri plugin
 2020-11-25 11:18:17 -05:00
Phil Estes 3458984bb8 Merge pull request #4766 from dmcgowan/backport-4765 
[release/1.4] Fix Windows service panic file to not be read-only
 2020-11-25 11:17:09 -05:00
Derek McGowan 0b97c62041 Update cri plugin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-24 17:52:10 -08:00
Kevin Parsons c0f1add3c9 Fix Windows service panic file to not be read-only 
Go 1.14 introduced a change to os.OpenFile (and syscall.Open) on Windows
that uses the permissions passed to determine if the file should be
created read-only or not. If the user-write bit (0200) is not set, then
FILE_ATTRIBUTE_READONLY is set on the underlying CreateFile call.

This is a significant change for any Windows code which created new
files and set the permissions to 0 (previously the permissions had no
affect, so some code didn't set them at all).

This change fixes the issue for the Windows service panic file. It will
now properly be created as a non-read-only file on Go 1.14+.

I have looked over the rest of the containerd code and didn't see other
places where this seems like an issue.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
(cherry picked from commit b2420ebcd1)
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-11-24 17:45:29 -08:00
Wei Fu 9c24574c99 Merge pull request #4763 from estesp/cp-tests-fix-1.4 
[release/1.4] re-enable unit tests in GitHub Actions environment
 2020-11-24 11:41:21 +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 cbbf257abf Add Go test runs to GitHub Actions CI 
Disable devmapper for now until test issues are fixed.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(cherry picked from commit c11472d31d)
 2020-11-23 18:34:09 -05:00
Phil Estes 19776b75b3 Adjust overlay tests to expect "index=off" 
When running tests on any modern distro, this assumption will work. If
we need to make it work with kernels where we don't append this option
it will require some more involved changes.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(cherry picked from commit 85d9fe3e8c)
 2020-11-23 18:29:57 -05:00
Phil Estes 7eb8522146 Allow oom adj test to run in environments with a score 
GitHub Actions process wrapper sets score adj to 500 for any process;
the OOM score adj test expected default adj to be 0 during test.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(cherry picked from commit af2fb4eb77)
 2020-11-23 18:29:31 -05:00
Phil Estes 036ede698d Import crypto for all snapshotters during testsuite 
Fixes runtime panic for testing snapshotters

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(cherry picked from commit 027ee569a3)
 2020-11-23 18:29:13 -05:00
Wei Fu 8d839c4b3b Merge pull request #4751 from amrmahdi/amrh/cherry-pick-cc3785-1.4 
[release/1.4] Improve image pull performance from http 1.1 container registries
 2020-11-20 08:53:03 +08:00
Phil Estes 31bbc1f7d4 Merge pull request #4754 from thaJeztah/1.4_restore_nil_pointer 
[release/1.4 backport] bug fix:#3448: invalid use of nil pointer in container restoring
 2020-11-18 21:30:46 -05:00