Commit Graph

8778 Commits

Author SHA1 Message Date
Derek McGowan
9067796ce4
Merge pull request #4891 from tianon/generic-arm-vector
Refactor platforms.Only with a "platformVector" helper
2020-12-29 09:49:09 -08:00
Tianon Gravi
9072b09145 Refactor platforms.Only with a "platformVector" helper
This improves the hard-coded list of ARM fallbacks in the `platform.Only` implementation (by doing a descending loop over variant numbers instead, which is all the hard-coded list was doing).

Making this a separate function can then more easily be recursive later for handling an `arm64`->`arm` fallback (or similar), but I think it makes the code a lot more clear too (so we're calculating a vector of platforms separately from building a matcher object).

This also makes a minor adjustment in `TestImagePullWithDistSourceLabel` which had an implicit assumption that `platforms.Only` would only ever result in a single suitable manifest, which isn't strictly true (and is likely failing as-is when run on any 32bit `arm` system that's `v6` or higher, which this fixes 😅).

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-12-28 14:11:14 -08:00
Phil Estes
7a2720f5e0
Merge pull request #4879 from tianon/platforms-only-test
Add platforms.Only test
2020-12-28 16:20:51 -05:00
Akihiro Suda
9d98f882b9
Merge pull request #4859 from dcantah/update-hcsshim-winio
Update hcsshim and go-winio vendoring
2020-12-28 22:40:11 +09:00
Phil Estes
cf62a557a8
Merge pull request #4882 from AkihiroSuda/issue-question-guide
add guidance about GitHub Discussions
2020-12-24 13:11:45 -05:00
Akihiro Suda
9a7bb7e40a
add guidance about GitHub Discussions
Add `.github/ISSUE_TEMPLATE/config.yml` to clarify where is the right place (in the most cases) to ask questions.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-24 18:21:04 +09:00
Tianon Gravi
66a3f2cbc7 Add platforms.Only test
This adds a test for `platforms.Only` (previously untested, as far as I can tell).

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-12-23 14:54:16 -08:00
Phil Estes
178e9a1012
Merge pull request #4866 from zhsj/doc-fix
Update BUILDING.md after moving to Go modules and various other small docs update
2020-12-23 08:23:24 -05:00
Phil Estes
ac5ca3a41e
Merge pull request #4841 from AdamKorcz/fuzz1
Add two fuzzers to integrate containerd into OSS-fuzz
2020-12-23 08:03:04 -05:00
Samuel Karp
b624486c84
native: support for FreeBSD
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2020-12-22 21:26:04 -08:00
Samuel Karp
d6baafa75f
mount: basic support for FreeBSD
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2020-12-22 21:26:04 -08:00
Shengjing Zhu
5988bfc1ef docs: Various typo found by codespell
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-22 13:22:16 +08:00
Shengjing Zhu
b4c604692e docs: Move autocomplete distribution section next to install section
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-22 13:22:16 +08:00
Shengjing Zhu
1cc3c7f4a2 docs: Remove appveyor badge
No longer used

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-22 13:22:16 +08:00
Shengjing Zhu
454e540330 docs: Tweak installing btrfs dependency on Debian/Ubuntu
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-22 13:22:16 +08:00
Shengjing Zhu
13917b03dc docs: Update command in BUILDING after moving to go modules
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-22 13:22:16 +08:00
Michael Crosby
dc207b654d
Merge pull request #4860 from masters-of-cats/pr-process-not-found-err
Return GRPC not found error instead of plain one
2020-12-21 10:25:11 -05:00
AdamKorcz
3698bc4ff1 Added 2 fuzzers
Signed-off-by: AdamKorcz <adam@adalogics.com>
2020-12-19 12:59:52 +00:00
Daniel Canter
a551492e99 Update hcsshim and go-winio vendoring
* Update hcsshim to v0.8.14
* Update go-winio to v0.4.16

This brings in some vhd package changes from winio, and the compute storage api bindings for
the shim. This is to facilitate some coming functionality for the windows snapshotter
as well as possibly for future work down the line for the windows differ.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2020-12-18 16:56:29 -08:00
Georgi Sabev
7451dd1ed1 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

Please note that we (CF Garden) would like to have the eventual fix backported to 1.4 as well.

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

Signed-off-by: Danail Branekov <danailster@gmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
2020-12-18 15:33:48 +02:00
Phil Estes
ce7024558f
Merge pull request #4863 from crosbymichael/log-dir
[cri] ensure log dir is created
2020-12-18 07:06:38 -05:00
Phil Estes
070b698449
Merge pull request #4845 from skaegi/oom_score-max
Add bounds on max oom_score_adj value for AdjustOOMScore
2020-12-17 16:22:46 -05:00
Michael Crosby
2e442ea485 [cri] ensure log dir is created
containerd is responsible for creating the log but there is no code to ensure
that the log dir exists.  While kubelet should have created this there can be
times where this is not the case and this can cause stuck tasks.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-12-17 15:04:39 -05:00
Maksym Pavlenko
3cd1c832ef
Merge pull request #4796 from jsj/jsj/4572
Mention built-in CRI support in README
2020-12-16 20:14:13 -08:00
Maksym Pavlenko
a5f9613b83
Merge pull request #3927 from katiewasnothere/snapshotter_check
add check that snapshotter supports the image platform when unpacking
2020-12-16 14:25:08 -08:00
Akihiro Suda
318e34b983
Merge pull request #4855 from tonistiigi/push-concurrent-access
docker: avoid concurrent map access panic
2020-12-16 22:35:33 +09:00
Akihiro Suda
7fa02f3afb
Merge pull request #4854 from tonistiigi/fix-push-auth
pusher: add missing authentication support for requests
2020-12-16 22:35:10 +09:00
Tonis Tiigi
4dfec7fa01 pusher: add missing authentication support for requests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-12-15 22:26:59 -08:00
Tonis Tiigi
bf323c5bdd docker: avoid concurrent map access panic
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-12-15 22:26:26 -08:00
Phil Estes
e922d5553d
Merge pull request #4849 from AkihiroSuda/remove-selinux-tag
remove "selinux" build tag
2020-12-15 14:32:53 -05:00
Phil Estes
0c0ff6efc4
Merge pull request #4850 from wangmaodou/update-runc-doc
Update RUNC.md
2020-12-15 10:51:09 -05:00
maodou
b197a66f40 docs: update RUNC.md
Signed-off-by: maodou <maodou404@gmail.com>
2020-12-15 21:42:36 +08:00
Akihiro Suda
7e6e4c466f
remove "selinux" build tag
The build tag was removed in go-selinux v1.8.0: opencontainers/selinux#132

Related: remove "apparmor" build tag: 0a9147f3aa

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-15 20:05:25 +09:00
Simon Kaegi
da2fd657ab 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>
2020-12-14 15:09:24 -05:00
Michael Crosby
23315f8647
Merge pull request #4840 from AkihiroSuda/with-container-labels-2
container_opts.go: add WithAdditionalContainerLabels
2020-12-14 14:53:03 -05:00
Michael Crosby
a9cc801922
Merge pull request #4821 from mxpv/tests
Enable devmapper tests
2020-12-14 14:52:08 -05:00
Michael Crosby
d1ced4f8ae
Merge pull request #4833 from AkihiroSuda/restart-with-log-uri
restart: allow passing existing log URI object
2020-12-14 14:48:37 -05:00
Michael Crosby
5d147bdc42
Merge pull request #4842 from AkihiroSuda/expose-fs-user-util
oci: expose getUserFromPath and getGIDFromPath
2020-12-14 14:46:54 -05:00
Akihiro Suda
8a57d70a50
oci: expose getUserFromPath and getGIDFromPath
These functions are planned to be used for implementing `nerdctl exec --user`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-14 21:53:17 +09:00
Akihiro Suda
041eb3ac31
container_opts.go: add WithAdditionalContainerLabels
WithAdditionalContainerLabels() preserves the existing entries in c.Labels.
OTOH, WithContainerLabels() clears them.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-14 16:44:47 +09:00
James Jackson
ca292da14b
Requested Changes
* Consolidating and improving language

Signed-off-by: James Jackson <james.sorley.jackson@gmail.com>
2020-12-12 15:22:38 -06:00
James Jackson
09241fd21c
Mention built-in CRI support in README
Signed-off-by: James Jackson <james.sorley.jackson@gmail.com>
2020-12-12 15:22:38 -06:00
Akihiro Suda
0356d5d4b2
restart: allow passing existing log URI object
The new function `WithLogURI(uri *url.URL)` replaces `WithBinaryLogURI(binary string, args map[string]string)`
so as to allow passing an existring URI object.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-12 05:11:03 +09:00
Maksym Pavlenko
004214808a
Merge pull request #4831 from AkihiroSuda/expose-contents-showprogress
ctr/commands/contents: expose ShowProgress
2020-12-11 11:04:49 -08:00
Maksym Pavlenko
c9c1f5cc58
Merge pull request #4832 from AkihiroSuda/expose-apparmor-loaddefault
contrib/apparmor: expose LoadDefaultProfile
2020-12-11 11:04:09 -08:00
Phil Estes
fad0ca2612
Merge pull request #4822 from samuelkarp/freebsd
Build on FreeBSD
2020-12-11 08:30:03 -05:00
Akihiro Suda
7b04b3cbb6
contrib/apparmor: expose LoadDefaultProfile
Expected to be used by nerdctl: 6026ae740a/internal_oci_hook.go (L170-L180)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-11 19:59:51 +09:00
Akihiro Suda
419ad73727
ctr/commands/contents: expose ShowProgress
Expected to be used by nerdctl

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-11 19:53:44 +09:00
Samuel Karp
4bcfbfe663
ci: add cross-compile for FreeBSD
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2020-12-10 21:41:34 -08:00
Kathryn Baldauf
f8992f451c add optional check that snapshotter supports the image platform when unpacking
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-12-10 10:54:22 -08:00