github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,985 Commits 3 Branches 4 Tags
15887d7efc60e4bde9e65c87a0376d94e9f6eb04
Commit Graph

1506 Commits

Author SHA1 Message Date
Maksym Pavlenko
8d417cbca0 Merge pull request #8890 from AkihiroSuda/follow-up-8744 
remotes: FetchByDigest: propagate media type from config to desc
 2024-01-25 17:00:14 +00:00
Akihiro Suda
22d586e515 api/services/instrospection: add PluginInfo 
The new `PlunginInfo()` call can be used for instrospecting the details
of the runtime plugin.

```console
$ ctr plugins inspect-runtime --runtime=io.containerd.runc.v2 --runc-binary=runc
{
    "Name": "io.containerd.runc.v2",
    "Version": {
        "Version": "v2.0.0-beta.0-XX-gXXXXXXXXX.m",
        "Revision": "v2.0.0-beta.0-XX-gXXXXXXXXX.m"
    },
    "Options": {
        "binary_name": "runc"
    },
    "Features": {
        "ociVersionMin": "1.0.0",
        "ociVersionMax": "1.1.0-rc.2",
        ...,
    },
    "Annotations": null
}
```

The shim binary has to support `-info` flag, see `runtime/v2/README.md`

Replaces PR 8509 (`api/services/task: add RuntimeInfo()`)

Co-authored-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-01-25 10:00:30 +09:00
James Sturtevant
ade80789b1 Remove walker diff plugin for Windows 
Signed-off-by: James Sturtevant <jsturtevant@gmail.com>
 2024-01-23 16:31:34 -08:00
Derek McGowan
f2765617c5 Merge pull request #9662 from dmcgowan/replace-platform-package 
Use github.com/containerd/platforms package
 2024-01-23 19:50:25 +00:00
Derek McGowan
e79ec7a095 Remove deprecated platforms package 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-23 09:14:03 -08:00
Evan Lezar
9dd29b3cf7 Update container-device-interface to v0.6.2 
This includes migrating from the github.com/container-orchestrated-devices
repo to tags.cncf.io.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2024-01-23 11:36:34 +01:00
Derek McGowan
be9336fed1 Merge pull request #9634 from dmcgowan/add-migration-tests 
Add migration tests
 2024-01-20 06:41:55 +00:00
Akihiro Suda
e9f2bba1f2 remotes: FetchByDigest: propagate media type from config to desc 
A media type string passed via `WithMediaType()` was not propagated
to a descriptor returned by `FetchByDigest()`.

Follow-up to PR 8744

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-01-18 23:50:21 +09:00
Derek McGowan
eb9925d88c Update config migrations to decode using the plugin type 
Ensure migration picks up defaults and correct ordering from the plugin
configuration. Ensures that the migration matches the behavior of the
default output and how the configuration will be loaded.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-18 06:46:50 -08:00
Derek McGowan
15713014d6 Update server config slice merge strategy 
Merge slices while checking for equal values rather than always
appending. Remove setting Import to prevent migrations from setting
incorrect configuration Imports.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-18 06:46:49 -08:00
Akihiro Suda
eb123db5fb ctr: use transfer service by default 
Prior to this commit, `--local=false` had to be explicitly specified to
opt-in to the transfer service

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-01-18 23:42:29 +09:00
Derek McGowan
dbc74db6a1 Move runtime to core/runtime 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:58:04 -08:00
Derek McGowan
df9b0a0675 Move metrics to core/metrics 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:57:55 -08:00
Derek McGowan
5e1d9543be Move pkg/hasher to internal/hasher 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:56:52 -08:00
Derek McGowan
8f0eb26311 Move tracing to pkg/tracing 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:56:25 -08:00
Derek McGowan
6be90158cd Move sys to pkg/sys 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:56:16 -08:00
Derek McGowan
de606680b0 Move rootfs to pkg/rootfs 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:56:07 -08:00
Derek McGowan
e59f64792b Move oci to pkg/oci 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:55:48 -08:00
Derek McGowan
fa8cae99d1 Move namespaces to pkg/namespaces 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:55:39 -08:00
Derek McGowan
b76236bb45 Move labels to pkg/labels 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:55:30 -08:00
Derek McGowan
11114b0a9a Move gc/scheduler to plugins/gc 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:55:03 -08:00
Derek McGowan
44a836c9b5 Move errdefs to pkg/errdefs 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:54:45 -08:00
Derek McGowan
70ed2696fa Move events to pkg/events 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:54:36 -08:00
Derek McGowan
b0c3d00e98 Move cio to pkg/cio 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:54:27 -08:00
Derek McGowan
fcd39ccc53 Move snapshots to core/snapshots 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:54:09 -08:00
Derek McGowan
e0fe656daf Move snapshots/windows to plugins/snapshots/windows 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:54:00 -08:00
Derek McGowan
57bdbfba6a Move snapshots/overlay to plugins/snapshots/overlay 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:53:51 -08:00
Derek McGowan
9b8c558f9f Move snapshots/native to plugins/snapshots/native 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:53:42 -08:00
Derek McGowan
5c07d5d361 Move snapshots/lcow to plugins/snapshots/lcow 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:53:33 -08:00
Derek McGowan
8473322f0b Move snapshots/devmapper to plugins/snapshots/devmapper 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:53:24 -08:00
Derek McGowan
7dd96fe346 Move snapshots/btrfs to plugins/snapshots/btrfs 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:53:15 -08:00
Derek McGowan
2909f07f85 Move snapshots/blockfile to plugins/snapshots/blockfile 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:53:06 -08:00
Derek McGowan
92d2a5fc02 Move services to plugins/services 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:52:57 -08:00
Derek McGowan
ce41d1c90a Move services/server to cmd/containerd/server 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:52:48 -08:00
Derek McGowan
d133019c9b Move runtime/restart/monitor to plugins/restart 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:52:30 -08:00
Derek McGowan
0dabf6f154 Move remotes to core/remotes 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:52:21 -08:00
Derek McGowan
6e5408dcec Move mount to core/mount 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:52:12 -08:00
Derek McGowan
18b3cbe4fa Move metadata/plugin to plugins/metadata 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:51:54 -08:00
Derek McGowan
f80760f9ff Move leases to core/leases 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:51:45 -08:00
Derek McGowan
cc6a5c9c69 Move leases/plugin to plugins/leases 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:51:35 -08:00
Derek McGowan
57ea8aef3d Move images to core/images 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:51:26 -08:00
Derek McGowan
913edcd489 Move diff to core/diff 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:51:17 -08:00
Derek McGowan
d14350376e Move diff/windows to plugins/diff/windows 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:51:08 -08:00
Derek McGowan
2d861b6ead Move diff/walking to plugins/diff/walking 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:50:59 -08:00
Derek McGowan
aaf6ac04cb Move diff/lcow to plugins/diff/lcow 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:50:50 -08:00
Derek McGowan
9456048f46 Move containers to core/containers 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:50:40 -08:00
Derek McGowan
21b4f3f0aa Move content to core/content 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:50:32 -08:00
James Jenkins
8aa2551ce0 Move DefaultSnapshotter constants 
Move the DefaultSnapshotter constants to the defaults package.
Fixes issue #8226.

Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
 2024-01-12 13:28:46 -05:00
Fu Wei
0a7c192ca9 Merge pull request #9630 from AkihiroSuda/transfer-desc 
transfer: add OCI descriptors to Progress structure
 2024-01-12 02:40:13 +00:00
Derek McGowan
3baf5edb8b Separate the CRI image config from the main plugin config 
This change simplifies the CRI plugin dependencies by not requiring the
CRI image plugin to depend on any other CRI components. Since other CRI
plugins depend on the image plugin, this allows prevents a dependency
cycle for CRI configurations on a base plugin.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-11 09:55:09 -08:00