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

402 Commits

Author SHA1 Message Date
Kern Walster
5b8dfbd111 Allow proxy plugins to have capabilities 
Signed-off-by: Kern Walster <walster@amazon.com>
 2024-06-13 17:13:57 +00:00
Akihiro Suda
86b8a88241 Remove pkg/seed 
Since Go 1.20, math/rand does not need explicit seeding:
https://go.dev/doc/go1.20#minor_library_changes

Go <= 1.19 is no longer supported due to EOL.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-06-13 08:50:28 +09:00
Derek McGowan
2ac2b9c909 Make api a Go sub-module 
Allow the api to stay at the same v1 go package name and keep using a
1.x version number. This indicates the API is still at 1.x and allows
sharing proto types with containerd 1.6 and 1.7 releases.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-05-02 11:03:00 -07:00
Derek McGowan
e1b94c0e7d Move protobuf package under pkg 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-05-02 10:52:03 -07:00
Derek McGowan
4a45507772 Move runc options to api directory 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-05-02 10:52:00 -07:00
Maksym Pavlenko
c3dc7209f4 Merge pull request #9892 from dmcgowan/move-nri-packages 
Move nri packages to plugin and internal
 2024-03-05 01:31:52 +00:00
Derek McGowan
347346e3cf Add ttrpc support to content proxy 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-03-01 14:27:27 -08:00
Derek McGowan
9128ee0a91 Move nri packages to plugin and internal 
NRI is still newer and mostly used by CRI plugin. Keep the package in
internal to allow for interfaces as the project matures.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-02-29 21:37:36 -08:00
Derek McGowan
72f21833b1 Move events to plugins and core 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-02-27 22:09:20 -08:00
Danny Canter
6a21c96b55 Replace go-grpc-prometheus with go-grpc-middleware/providers/prometheus 
Fixes #9806

go-grpc-prometheus is deprecated. The new location it was moved to also introduced
an entirely new api, but afaict this matches what we have at the moment.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2024-02-20 02:01:57 -08:00
Phil Estes
1641c7571f Merge pull request #9809 from dereknola/urfave_v2 
Migrate Urfave CLI from v1 to v2
 2024-02-16 16:13:37 +00:00
Derek McGowan
d346aeebdf Merge pull request #9746 from neoaggelos/fix/config-glob 
Fix config import relative path glob
 2024-02-16 06:08:17 +00:00
Derek Nola
132485adb0 Convert CLI to urfave v2 
Followed the Migration Guide at https://cli.urfave.org/migrate-v1-to-v2/
The major changes not pointed out in the migration guide are:
- context.Args() no longer produces a []slice, so context.Args().Slice()
  in substitued
- All cli.Global***** are deprecated (the migration guide is somewhat
  unclear on this)

Signed-off-by: Derek Nola <derek.nola@suse.com>

Vendor in urfave cli/v2

Signed-off-by: Derek Nola <derek.nola@suse.com>

Fix NewStringSlice calls

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-02-15 09:48:04 -08:00
Derek McGowan
a086125ae3 Move config version to version package 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-02-14 21:09:44 -08:00
Angelos Kolaitis
256637249b Fix config import relative path glob 
Previously, resolveImports would apply a glob filter if
the path contained any '*', or otherwise convert relative
paths to absolute. This meant that it was impossible to
specify globs with paths relative to the main config file.

This commit first resolves relative to absolute paths, then
applies the glob filter (if any). A test case is added to ensure
that this now works as expected.

Signed-off-by: Angelos Kolaitis <neoaggelos@gmail.com>
 2024-02-03 21:03:11 +02:00
Derek McGowan
58ff9d368d Move cri plugin to plugins subpackage 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-28 20:57:19 -08:00
Derek McGowan
9795677fe9 Move cri base plugin to CRI runtime service 
Create new plugin type for CRI runtime and image services.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-28 20:57:18 -08:00
Derek McGowan
fb9b59a843 Switch to new errdefs package 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-25 22:18:45 -08: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
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
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
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
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
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
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
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
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