github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
12,660 Commits 3 Branches 4 Tags
e2bf34feafc3c36b0bcf9ee013d22a07d40bb93c
Commit Graph

505 Commits

Author SHA1 Message Date
Fu Wei
0f5dea3cc0 Merge pull request #8734 from djdongjin/content-copy-dedup 
Simplify `content.Copy` logic
 2023-08-18 11:05:27 +08:00
Akihiro Suda
3c6ab04203 go.mod: dario.cat/mergo v1.0.0 
https://github.com/imdario/mergo/compare/v0.3.13...v1.0.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-07-23 03:08:00 +09:00
Danny Canter
f3b7436b61 Platforms: Add From/ToProto helpers for types 
Helpers to convert from a slice of platforms to our protobuf representation
and vice-versa appear a couple times. It seems sane to just expose this facility
in the platforms pkg.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-28 19:54:56 -07:00
Danny Canter
b3ab1f26c4 Snapshots: Add From/ToProto helpers for types 
Helpers to convert from snapshot types to their protobuf structures and
vice-versa appear three times. It seems sane to just expose this facility
in the snapshots pkg. From/ToKind weren't used anywhere but doesn't hurt to
round out the types by exposing them.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-28 12:17:52 -07:00
Danny Canter
0a6b8f0ee0 OCI: Add From/ToProto helpers for Descriptor 
Helpers to convert from the OCI image specs [Descriptor] to its protobuf
structure for Descriptor and vice-versa appear three times. It seems sane
to just expose this facility in /oci.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-28 12:16:20 -07:00
Danny Canter
55a8102ec1 mount: Add From/ToProto helpers 
Helpers to convert from containerd's [Mount] to its protobuf structure for
[Mount] and vice-versa appear three times. It seems sane to just expose
this facility in /mount.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-28 04:03:18 -07:00
Jin Dong
54a93c6c52 Make ptypes.Empty a var in contentserver 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-27 11:32:59 +00:00
Phil Estes
96de54db43 Merge pull request #8667 from djdongjin/premarshal-empty-resp 
Save marshalled empty response in streaming service
 2023-06-16 17:05:24 -04:00
Jin Dong
e26c97cb8b Save marshalled empty response in streaming service 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-14 18:02:58 +00:00
Danny Canter
d278d37caa Sandbox: Add Metrics rpc for controller 
As a follow up change to adding a SandboxMetrics rpc to the core
sandbox service, the controller needed a corresponding rpc for CRI
and others to eventually implement.

This leaves the CRI (non-shim mode) controller unimplemented just to
have a change with the API addition to start.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-13 00:24:09 -07:00
Sebastiaan van Stijn
4bb709c018 avoid "any" as variable name 
Avoid shadowing / confusion with Go's "any" built-in type.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-10 13:49:06 +02:00
Derek McGowan
2a60fe5a60 Remove events from init context 
Events from the init context have been replaced by the events plugin

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-05-31 09:35:03 -07:00
Maksym Pavlenko
45dbb4e542 Publish sandbox events 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-05-30 13:54:35 -07:00
Henry Wang
4bfcac85fa notify readiness when registered plugins are ready 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2023-05-26 03:07:40 +00:00
Fu Wei
8c21759d7c Merge pull request #8401 from Iceber/fix_checkpoint_config_content 2023-05-17 10:04:49 +08:00
mstmdev
cdaa4025e9 Fix some typos 
Signed-off-by: Pan Yibo <mstmdev@gmail.com>
 2023-05-16 10:12:50 +08:00
Iceber Gu
8ba285f6b2 fix unable to checkpoint the container more than once 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-04-25 14:36:25 +08:00
Derek McGowan
4e5693938f Add platform config to proxy plugins 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-04-19 17:48:04 -07:00
Derek McGowan
3784c1c917 Add proxy differ 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-04-15 22:37:23 -07:00
Akihiro Suda
a4d33a7848 Remove support for config.toml version = 1 
`version = 1` has been deprecated since containerd v1.5,
and replaced by `version = 2`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-03-16 10:32:33 +09:00
Maksym Pavlenko
07c2ae12e1 Remove v1 runctypes 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-03-15 09:18:16 -07:00
Fu Wei
8cb00f45c9 Merge pull request #8143 from mxpv/log 
Add Fields type alias to log package
 2023-02-21 10:22:23 +08:00
Maksym Pavlenko
06e085c8b5 Add Fields type alias to log package 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-20 17:29:08 -08:00
Zhang Tianyang
56274749c8 sandbox: start sandbox with options 
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
 2023-02-17 17:14:03 +08:00
Zechun Chen
39bac0dbef error strings should not be capitalized 
Signed-off-by: Zechun Chen <zechun.chen@daocloud.io>
 2023-02-15 14:30:36 +08:00
Fu Wei
2654ece1d0 Merge pull request #8066 from fuweid/cleanup-blockio-init 
*: introduce wrapper pkgs for blockio and rdt
 2023-02-13 14:05:32 +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
Wei Fu
62df35df66 *: introduce wrapper pkgs for blockio and rdt 
Before this patch, both the RdtEnabled and BlockIOEnabled are provided
by services/tasks pkg. Since the services/tasks can be pkg plugin which
can be initialized multiple times or concurrently. It will fire data-race
issue as there is no mutex to protect `enable`.

This patch is aimed to provide wrapper pkgs to use intel/{blockio,rdt}
safely.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-02-10 08:21:34 +08: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
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
Edgar Lee
34d5878185 Use mount.Target to specify subdirectory of rootfs mount 
- Add Target to mount.Mount.
- Add UnmountMounts to unmount a list of mounts in reverse order.
- Add UnmountRecursive to unmount deepest mount first for a given target, using
moby/sys/mountinfo.

Signed-off-by: Edgar Lee <edgarhinshunlee@gmail.com>
 2023-01-27 09:51:58 +08:00
Derek McGowan
beabd3d5d1 Merge pull request #7129 from junnplus/namespace-service 
fix incorrect namespace of event when create/update namespace
 2023-01-19 22:49:28 -08:00
Maksym Pavlenko
f318e5630b Update sandbox API to return target platform 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Phil Estes
72e5ddb516 Merge pull request #7886 from dmcgowan/fix-transfer-register-ordering 
Fix race between stream registration and use
 2023-01-04 14:49:28 -05:00
Akihiro Suda
24a255ce96 Merge pull request #7850 from dmcgowan/sandbox-store-local-plugin 
[sandbox] Add sandbox store plugin type
 2023-01-04 00:21:06 +09:00
Fu Wei
9a7c264d25 Merge pull request #5674 from dmcgowan/metadata-snapshot-publish 2023-01-03 09:23:48 +08:00
Derek McGowan
d7ef6cbfa3 [streaming] move response packet after registration 
Prevent a race where a client may attempt to use a stream
before it is registered.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-12-30 21:56:25 -08:00
Wei Fu
6b7e237fc7 chore: use go fix to cleanup old +build buildtag 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2022-12-29 14:25:14 +08:00
Derek McGowan
47fee791f6 Add sandbox store plugin type 
Moves the sandbox store plugin under the plugins packages and adds a
unique plugin type for other plugins to depend on it.
Updates the sandbox controller plugin to depend on the sandbox store
plugin.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-12-20 23:05:14 -08:00
Derek McGowan
2c573de6d3 Move snapshot event publishing into metadata store 
Removes the snapshot event publishing from the snapshot service.

Adds an option to metadata db to add a publisher. Adds event
publishing to prepare, commit, and remove snapshot operations.
Adds remove snapshot event to garbage collection.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-12-19 17:05:28 -08:00
Fu Wei
12f30e6524 Merge pull request #7792 from mxpv/sb-shutdown 2022-12-15 13:37:35 +08:00
Maksym Pavlenko
a4d5c3e5cb Support sandboxed shims shutdown 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-14 18:22:52 -08:00
Akihiro Suda
75b09ac4a7 images: support specifying SourceDateEpoch via ctx 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-12-12 09:02:35 +09:00
Maksym Pavlenko
a113737ccf sbserver bug fixing 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-06 15:32:42 -08:00
Derek McGowan
8a25fa584f Unwrap proto errors in streaming client 
Allows clients to properly detect context cancellation

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-12-02 22:30:54 -08:00
Derek McGowan
51195ad099 Merge pull request #7731 from mxpv/cri 
[Sandbox API] CRI status cleanup
 2022-12-01 13:43:13 -08:00
Derek McGowan
f88162587b Rename transferer to transferrer 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 16:02:09 -08:00
Derek McGowan
fc2754204f Cleanup code comments and lint fixes 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 16:02:09 -08:00