Commit Graph

11956 Commits

Author SHA1 Message Date
Phil Estes
de4e2e11d4
Merge pull request #7149 from AkihiroSuda/seccomp-clock_settime64
seccomp: allow clock_settime64 when CAP_SYS_TIME is added
2022-07-11 11:52:17 -04:00
Gavin Inglis
174b013446 update some devmapper docs
Updated some documentation for devmapper snapshotter plugin.
Made consistent use of "thin-pool", "Device Mapper" when referring to
the volume management framework, and "devmapper" when referring to the
snapshotter plugin itself.

Also added some additional resources / reorg.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
2022-07-11 15:49:54 +00:00
Akihiro Suda
575095fcd6
seccomp: allow clock_settime64 when CAP_SYS_TIME is added
Port moby/moby PR 43775

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-07-11 10:04:13 +09:00
Derek McGowan
681aaf68b7
Merge pull request #7123 from kzys/fuzz
Copy fuzzers from github.com/cncf/cncf-fuzzing
2022-07-06 14:52:28 -07:00
Kazuyoshi Kato
bfb316cb86
Merge pull request #6847 from zhanghe9702/pr/fix-content-edit
fix can't edit object by using ctr content edit command
2022-07-06 10:33:14 -07:00
Kazuyoshi Kato
a0da9edd98
Merge pull request #7130 from eltociear/patch-1
integration/client: fix typo in export_test.go
2022-07-06 09:49:02 -07:00
Kazuyoshi Kato
e9e33f847d Copy fuzzers from github.com/cncf/cncf-fuzzing
This commit copies the fuzzers from the repository except for
containerd_import_structured_fuzzer.go.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-07-06 15:21:48 +00:00
Kazuyoshi Kato
b316318596 Upgrade github.com/AdaLogics/go-fuzz-headers
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-07-06 15:21:45 +00:00
Ikko Ashimine
6d4b61007b integration/client: fix typo in export_test.go
Seet -> Seek
begining -> beginning

Signed-off-by: Ikko Ashimine <eltociear@gmail.com>
2022-07-06 11:14:45 +09:00
Phil Estes
c4b1b368ad
Merge pull request #7126 from kzys/fix-auth-param
Fix WWW-Authenticate parsing
2022-07-05 11:20:35 -04:00
Ye Sijun
ccd1d22ad1
fix incorrect namespace of event when create/update namespace
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-07-05 12:13:26 +08:00
zhanghe9702
b8bb33b92d fix can't edit object by using ctr content edit command
Signed-off-by: zhang he <zhanghe9702@163.com>
2022-07-04 11:44:44 +08:00
Kazuyoshi Kato
548c9c317b Fix WWW-Authenticate parsing
According to RFC 9110, quoted-string could be "".

https://datatracker.ietf.org/doc/html/rfc9110#section-11.6.1
https://datatracker.ietf.org/doc/html/rfc9110#appendix-A

Fixes #6376.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-07-01 20:26:39 +00:00
Phil Estes
7eae7f206c
Merge pull request #7112 from dcantah/lcow-notimpl
LCOW differ return ErrNotImplemented for wrong mount type
2022-06-30 10:52:36 -04:00
Rodrigo Campos
b8403d2e15 Update k8s.io/cri-api to v0.25.0-alpha2
This version contains the CRI changes for user namespaces support.
Future patches will use the new fields in the CRI.

Updating the module without using the new fields doesn't cause any
behaviour change.

Updates: #7063

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
2022-06-30 12:09:08 +02:00
Fu Wei
42d6923fe8
Merge pull request #7117 from estesp/update-restful 2022-06-30 08:02:14 +08:00
Derek McGowan
aee50aeac2
Merge pull request #7108 from fuweid/refactor-cri-api
pkg/cri: use marshal wrapper for version convertor
2022-06-29 13:58:15 -07:00
Phil Estes
a44cabf517
Update go-restful/v3 to latest release
Signed-off-by: Phil Estes <estesp@amazon.com>
2022-06-29 15:23:10 -04:00
Wei Fu
c2703c08c9 pkg/cri: use marshal wrapper for version convertor
Use wrapper for ReopenContainerLog v1alpha proto.

Ref: #5619

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-06-29 22:20:47 +08:00
Daniel Canter
d2588b3fa4 LCOW differ return ErrNotImplemented for wrong mount type
On Windows the two differs we register by default are the "windows" and
"windows-lcow" differs. The diff service checks if Apply returns
ErrNotImplemented and will move on to the next differ in the line.
The Windows differ makes use of this to fallback to LCOW if it's
determined the mount type passed is incorrect, but the LCOW differ
does not return ErrNotImplemented for the same scenario. This puts
a strict ordering requirement on the default differ entries in the config,
namely that ["windows", "windows-lcow"] will work, as windows will correctly
fall back to the lcow differ, but ["windows-lcow", "windows"] won't as
the diff services Apply will just return the error directly.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-06-28 17:19:04 -07:00
Kazuyoshi Kato
78c4d3de72
Merge pull request #7087 from kzys/fuzz-less-hacks
Remove hacks around contrib/fuzz
2022-06-28 09:24:37 -07:00
Phil Estes
36bd4a5178
Merge pull request #7107 from wzshiming/fix/close-http-body
Fix missing closed HTTP Body
2022-06-28 08:54:02 -04:00
Shiming Zhang
0a240ff811 Fix missing closed HTTP Body
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2022-06-28 14:49:27 +08:00
Derek McGowan
b76544b8f5
Merge pull request #7105 from mxpv/cleanup
Cleanup metadata tests
2022-06-27 16:23:24 -07:00
Kazuyoshi Kato
f7de1c8f90 Do not hardcode fuzzers
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-06-27 22:54:25 +00:00
Kazuyoshi Kato
2b60770c4b Move container_fuzzer.go under integration/client/
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-06-27 22:54:25 +00:00
Kazuyoshi Kato
66cc0fc879 Copy FuzzCRI from cncf/cncf-fuzzing
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-06-27 22:54:25 +00:00
Kazuyoshi Kato
ca5637104b Remove mainfuzz package and StartDaemonForFuzzing
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-06-27 22:54:25 +00:00
Kazuyoshi Kato
17f9c3a0ef Move builtins_*.go to cmd/containerd/builtins to make the files reusable
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-06-27 22:54:25 +00:00
Maksym Pavlenko
d97b754a5b Cleanup metadata tests
This commit replaces func returns with t.Cleanup,
which makes API and tests slightly easier to maintain.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-06-27 14:42:22 -07:00
Phil Estes
813780e443
Merge pull request #7106 from gabriel-samfira/force-downgrade-mingw
Downgrade MinGW to version 10.2.0
2022-06-27 17:40:07 -04:00
Gabriel Adrian Samfira
1ef4bda433
Downgrade MinGW to version 10.2.0
There is currently an issue in the race detector in Go on Windows when
used with a newer version of GCC. The issue was first reported here:

https://github.com/golang/go/issues/46099

Fixes #7104

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2022-06-27 22:40:08 +03:00
Phil Estes
8fe779faa9
Merge pull request #7098 from ktock/ctr-create-reordering
ctr: Fix `ctr c create` fails to parse arguments
2022-06-27 15:33:50 -04:00
Derek McGowan
281c2b8f90
Merge pull request #7103 from 2000yeshu/fix-doc
Fix Documentation Issue
2022-06-27 10:58:12 -07:00
Derek McGowan
555dc62e9e
Merge pull request #7100 from junnplus/spec-opts
refactor: reduce duplicate code
2022-06-27 10:50:37 -07:00
Ye Sijun
1ab42be15d
refactor: reduce duplicate code
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-06-25 18:55:03 +08:00
Yakul Garg
47ad5f70e7 Fix Doc:
since containerd doesn't have GenerateSpec method any longer, spec has to be generated with WithNewSpec.

Signed-off-by: Yakul Garg <2000yeshu@gmail.com>
2022-06-25 12:09:30 +05:30
Samuel Karp
279f4069fe
Merge pull request #7094 from junnplus/xattr 2022-06-24 22:11:28 -07:00
Fu Wei
84ec0796f8
Merge pull request #7096 from dmcgowan/metadata-plugin-registration 2022-06-25 11:59:45 +08:00
Kohei Tokunaga
fb5b6612a3 ctr: Fix ctr c create fails to parse arguments
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-06-23 21:52:53 +09:00
Ye Sijun
68a55fe8bd
make xattr EPERM non-fatal in createTarFile
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-06-23 15:17:30 +08:00
Derek McGowan
99e210c50a
Move metadata plugin registration to seperate package
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-06-22 17:38:41 -07:00
Maksym Pavlenko
e3298cf127
Merge pull request #7092 from junnplus/doc-devmapper
fix: missing sudo for devmapper doc
2022-06-22 10:58:41 -07:00
Ye Sijun
4f0ea7831b
fix: missing sudo for devmapper doc
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-06-22 22:56:11 +08:00
Phil Estes
a43dfdf4c0
Merge pull request #7085 from aznashwan/main
Ensure Windows Periodic workflow errors out while still uploading results.
2022-06-22 10:03:58 -04:00
Fu Wei
28384cfd1f
Merge pull request #7084 from dmcgowan/snapshot-event-snapshotter 2022-06-22 18:42:40 +08:00
Fu Wei
a860e6680e
Merge pull request #7072 from junnplus/test-specopts 2022-06-22 15:12:00 +08:00
Kevin Parsons
0fac756b64
Merge pull request #7086 from jterry75/main
Forward ctr snapshotter flags on Windows
2022-06-21 12:21:44 -07:00
Derek McGowan
94fe150b87
Merge pull request #7070 from junnplus/additional-gids
add WithAppendAdditionalGroups helper
2022-06-21 12:17:27 -07:00
Ye Sijun
72b87ad004
add WithAdditionalGIDs test
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-06-21 23:58:19 +08:00