github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,763 Commits 3 Branches 4 Tags
040fcf85f0a7d88ef3d55720d9821c9cb127c81c
Commit Graph

11763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fu Wei
040fcf85f0 Merge pull request #8091 from dcantah/mirror-generic-toml-change 2023-02-12 11:23:34 +08:00
Fu Wei
a453e92f26 Merge pull request #8092 from AkihiroSuda/typeurl-v2 2023-02-12 11:17:37 +08:00
Akihiro Suda
b61988670c go.mod: github.com/containerd/typeurl/v2 v2.1.0 
Changes: https://github.com/containerd/typeurl/compare/7f6e6d160d67...v2.1.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-02-11 23:39:52 +09:00
Danny Canter
74b371b98a CRI: Mirror generic toml runtime config under server 
In https://github.com/containerd/containerd/pull/7764 it was made
so that generic runtime options in the containerd toml config file
would get passed to shims regardless of if containerd knew of the
type beforehand and could supply the struct. However, this was only
added for the sandbox server fork here and not the regular ol' CRI
server. This change just mirrors the parts that need to be plopped in
pkg/cri/server

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-02-11 05:18:52 -08:00
Fu Wei
cf7b705dcd Merge pull request #8086 from neersighted/apparmor_parser_regression 
Revert `apparmor_parser` regression
 2023-02-11 09:27:53 +08:00
Fu Wei
362ba2c743 Merge pull request #7981 from dmcgowan/sandbox-controller-interface-refactor 
[sandbox] refactor controller interface
 2023-02-11 09:22:36 +08:00
Phil Estes
024a748c09 Merge pull request #7933 from AkihiroSuda/drop-libbtrfs 
btrfs: depend on kernel UAPI instead of libbtrfs
 2023-02-10 16:13:19 -05:00
Bjorn Neergaard
d33a43cc23 pkg/apparmor: clarify Godoc 
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-02-10 10:23:59 -07:00
Bjorn Neergaard
a3265102d9 Revert "Don't check for apparmor_parser to be present" 
This reverts commit 1acca8bba3.

As stated in the Godoc, this function is intended to check for presence
of `apparmor_parser`. Changing this regressed the public API of
containerd, and directly contradicts the way that this function is
consumed inside of containerd itself:
* fdfdc9bfc0/pkg/apparmor/apparmor.go (L20)
* fdfdc9bfc0/pkg/cri/sbserver/helpers_linux.go (L85)
* fdfdc9bfc0/pkg/cri/server/helpers_linux.go (L144)

This has lead to a number of painful regressions and attempted fixes in
Moby:
* https://github.com/moby/moby/issues/44900
* https://github.com/moby/moby/pull/44902
* https://github.com/moby/moby/issues/44970

While reverting this late into the life of 1.6 and at the start of the
life of 1.7 is likely painful, I think this is ultimately the best path
to take, as containerd is subject to the same failure to start
containers with an AppArmor kernel when `apparmor_parser` is missing as
Moby.

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-02-10 10:05:56 -07:00
Derek McGowan
fdfdc9bfc0 Merge pull request #8082 from AkihiroSuda/ci-skip-on-fork 
CI: skip some jobs when `repo != containerd/containerd`
 2023-02-10 08:35:51 -08:00
Fu Wei
4c44ec702f Merge pull request #8078 from Fish-pro/chore/package 2023-02-10 17:35:10 +08:00
Akihiro Suda
fe0116ec2a CI: skip some jobs when repo != containerd/containerd 
For running CI in a non-upstream repo

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-02-10 18:12:08 +09:00
Zechun Chen
b944b108df Clean up repeated package import 
Signed-off-by: Zechun Chen <zechun.chen@daocloud.io>
 2023-02-10 16:21:55 +08:00
Fu Wei
218b1a335e Merge pull request #8076 from cpuguy83/use_data_in_descriptor 
fetch: Use data from descriptor when available.
 2023-02-10 15:50:17 +08:00
Maksym Pavlenko
195eca1d6c Merge pull request #8077 from Fish-pro/chore/httpvar 
chore: use http constants instead of string
 2023-02-09 23:32:17 -08:00
Derek McGowan
676b942fef Merge pull request #8075 from swagatbora90/removeIntermediate 
Fix retry logic within devmapper device deactivation
 2023-02-09 22:21:49 -08:00
Fish-pro
76a62e52ae Use http constants instead of string 
Signed-off-by: Fish-pro <zechun.chen@daocloud.io>
 2023-02-10 14:01:48 +08:00
Akihiro Suda
a6f3cbe0ad Merge pull request #8071 from mxpv/cleanup 
Clean CI yaml
 2023-02-10 11:34:18 +09:00
Brian Goff
13652e081e fetch: Use data from descriptor when available. 
OCI added support for a `data` field in a descriptor.
This field is expected to contain the content being pointed to by the
descriptor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2023-02-10 01:12:40 +00:00
Akihiro Suda
52f82acb7b btrfs: depend on kernel UAPI instead of libbtrfs 
See containerd/btrfs PR 40 and moby/moby PR 44761. (Thanks to [@]neersighted.)

The containerd/btrfs library now requires headers from kernel 4.12 or newer:
- https://github.com/torvalds/linux/blob/master/include/uapi/linux/btrfs.h
- https://github.com/torvalds/linux/blob/master/include/uapi/linux/btrfs_tree.h

These files are licensed under the GPL-2.0 WITH Linux-syscall-note, so it should be compatible with the Apache License 2.0.
https://spdx.org/licenses/Linux-syscall-note.html

The dependency on the kernel headers only affects users building from source.
Users on older kernels may opt to not compile this library (`BUILDTAGS=no_btfs`),
or to provide headers from a newer kernel.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-02-10 10:07:34 +09:00
Swagat Bora
6ae3e5df6a Fix retry logic within devmapper device deactivation 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2023-02-09 23:40:18 +00:00
Maksym Pavlenko
6adb6a727e Rename release CI job 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-09 15:30:52 -08:00
Maksym Pavlenko
aed3b0a70b Clean CI file 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-09 15:30:52 -08:00
Samuel Karp
26509fa765 Merge pull request #8074 from kzys/fix-8073 
Fixes https://github.com/containerd/containerd/issues/8073
 2023-02-09 15:28:32 -08:00
Kazuyoshi Kato
617c66dcc7 Add critest.exe in $PATH 
The binary location was moved since
https://github.com/kubernetes-sigs/cri-tools/pull/1085.

Fixes #8073.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2023-02-09 22:23:01 +00:00
Derek McGowan
b0e97c0f9b Use multierror for cleanup error 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-02-07 11:06:14 -08:00
Phil Estes
97480afdac Merge pull request #7976 from yulng/lowercase 
keep the uppercase letter for flag info
 2023-02-07 09:54:38 +00:00
Derek McGowan
34314717b0 Remove sandox store and controller service type 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-02-06 22:05:26 -08:00
Derek McGowan
a788f6c799 Move local sandbox controller under plugins package 
Add options to sandbox controller interface.
Update sandbox controller interface to fully utilize sandbox controller
interface.
Move grpc error conversion to service.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-02-06 22:04:45 -08:00
Derek McGowan
2717685dad Refactor sandbox controller interface 
Update the sandbox controller interface to use local types rather than
using the API types.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-02-06 21:39:30 -08:00
Fu Wei
20de989afc Merge pull request #8049 from kiashok/updateShimTag 
go.mod: Bump hcsshim to v0.10.0-rc.5
 2023-02-06 22:24:33 +08:00
yulng
757b8f702b keep the uppercase letter for flag info 
Signed-off-by: yulng <wei.yang@daocloud.io>
 2023-02-06 16:37:24 +08:00
Maksym Pavlenko
94934e1a47 Merge pull request #8045 from mxpv/sb 
Fix sandbox exit monitor
 2023-02-03 11:31:43 -08:00
Kirtana Ashok
e5c57f2422 update hcsshim tag to v0.10.0-rc.5 and revendor 
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
 2023-02-03 10:50:56 -08:00
Maksym Pavlenko
1f35b03369 Fix sandbox exit monitor 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 14:02:52 -08:00
Maksym Pavlenko
3d32da8f60 Merge pull request #7979 from mxpv/grpc 
Generate GRPC contracts for runtime APIs
 2023-02-02 11:49:32 -08:00
Maksym Pavlenko
d1cd9757eb Generate GRPC for runtime task service 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 09:58:43 -08:00
Maksym Pavlenko
86c238c873 Generate GRPC for runtime sandbox API 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 09:58:43 -08:00
Maksym Pavlenko
99580e0aad Update TTRPC and Protobuild dependencies 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 09:58:43 -08:00
Phil Estes
60363db5bc Merge pull request #8035 from ktock/fixunmount 
Make argument validation of `mount.UnmountRecursive` compatible to `mount.UnmountAll`
 2023-02-02 11:55:24 -05:00
Phil Estes
6116820aeb Merge pull request #8036 from ktock/remotesnlabel 
Export remote snapshotter label handler
 2023-02-02 11:53:43 -05:00
Fu Wei
6ed24c88ed Merge pull request #7989 from mohitsharma-in/topic/directory-install-runhcs-shim 
Adding support to run install hcsshim from local clone
 2023-02-02 10:38:43 +08:00
Akihiro Suda
e6b515d463 Merge pull request #8040 from thaJeztah/update_urfave_cli 
go.mod: github.com/urfave/cli v1.22.12
 2023-02-02 08:26:05 +09:00
Phil Estes
eda079259d Merge pull request #8039 from yankay/cleanup-useless-IntToInt32Array-func 
cmd/ctr/commands: clean up the func IntToInt32Array in utils.go
 2023-02-01 11:19:17 -05:00
Mohit Sharma
b9b44ed5c5 Removing end of line for last line 
Signed-off-by: Mohit Sharma <mohit94614@gmail.com>
 2023-02-01 20:44:23 +05:30
Kohei Tokunaga
dbf384a5a8 Export remote snapshotter label handler 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-02-01 23:03:23 +09:00
Sebastiaan van Stijn
d6070f8a74 go.mod: github.com/urfave/cli v1.22.12 
full diff: https://github.com/urfave/cli/compare/v1.22.10...v1.22.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-02-01 12:42:03 +01:00
Kay Yan
2f1aad03af cleanup useless IntToInt32Array func 
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
 2023-02-01 12:14:46 +08:00
Phil Estes
0181b103ea Merge pull request #8037 from AkihiroSuda/epoch-drop-timezone 
pkg/epoch: drop timezone
 2023-01-31 17:04:50 -05:00
Phil Estes
58ad67caee Merge pull request #8034 from klihub/deps/update-nri 
go.mod: update github.com/containerd/nri.
 2023-01-31 17:03:57 -05:00