github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,800 Commits 3 Branches 2 Tags 112 MiB
93690baf4e
Commit Graph

1492 Commits

Author SHA1 Message Date
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
Akihiro Suda
a2472c0b5a
transfer: add OCI descriptors to Progress structure 
The index media type and the digest are now shown in `ctr images pull --local=false`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-01-11 23:56:13 +09:00
Kirtana Ashok
f261969507 Move certain debug logs to trace logs 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2024-01-10 14:43:54 -08:00
roman-kiselenko
a3c62e698d add label flags to ctr import, add integration tests 
Signed-off-by: roman-kiselenko <roman.kiselenko.dev@gmail.com>
 2024-01-06 11:11:10 +03:00
Rodrigo Campos
8bbce8d37f pkg/process: Check using idmap mount options too 
The runtime-spec just merged this PR:
	https://github.com/opencontainers/runtime-spec/pull/1224

This means that it is now possible to request idmap mounts by specifying
"idmap" or "ridmap" in the mount options, without any mappings.

Let's add a check to see if they are requested in that way too.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
 2023-12-04 15:17:59 +01:00
Akihiro Suda
8e567aa581
mv pkg/process cmd/containerd-shim-runc-v2/process 
The package is quite specific to runc and only imported by
containerd-shim-runc-v2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-11-30 21:50:04 +09:00
Yibo Zhuang
c384e37177 containerd-stress: use config address for CRI test 
This change removes the hard-coded containerd endpoint
for CRI test and use the address in the config which would
honor the CLI flag.

Signed-off-by: Yibo Zhuang <yibzhuang@gmail.com>
 2023-11-27 17:51:02 -08:00
rokkiter
1b65fe2646 fix ticker leak 
Signed-off-by: rokkiter <yongen.pan@daocloud.io>
 2023-11-17 10:21:57 +08:00
Maksym Pavlenko
7d65a45639
Move runc shim implementation to cmd 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-11-14 10:13:32 -08:00
Sebastiaan van Stijn
2af6db672e
switch back from golang.org/x/sys/execabs to os/exec (go1.19) 
This is effectively a revert of 2ac9968401, which
switched from os/exec to the golang.org/x/sys/execabs package to mitigate
security issues (mainly on Windows) with lookups resolving to binaries in the
current directory.

from the go1.19 release notes https://go.dev/doc/go1.19#os-exec-path

> ## PATH lookups
>
> Command and LookPath no longer allow results from a PATH search to be found
> relative to the current directory. This removes a common source of security
> problems but may also break existing programs that depend on using, say,
> exec.Command("prog") to run a binary named prog (or, on Windows, prog.exe) in
> the current directory. See the os/exec package documentation for information
> about how best to update such programs.
>
> On Windows, Command and LookPath now respect the NoDefaultCurrentDirectoryInExePath
> environment variable, making it possible to disable the default implicit search
> of “.” in PATH lookups on Windows systems.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-11-02 21:15:40 +01:00
Derek McGowan
9db21401c4
Switch to github.com/containerd/plugin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-11-01 23:01:42 -07:00
Derek McGowan
b85df264ef
Rename opt to avoid stutter 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-11-01 10:39:54 -07:00
Derek McGowan
261e01c2ac
Move client to subpackage 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-11-01 10:37:00 -07:00
Akihiro Suda
19ff94b701
Merge pull request #9306 from dmcgowan/containerd-v2-module 
Containerd v2 module
 2023-11-01 15:20:35 +00:00
Alex Rodriguez
124d3a20a6
Sync ops.md, update CLI --help output to be consistent in descriptions 
Signed-off-by: Alex Rodriguez <alexrodriguez@ibm.com>
 2023-10-30 08:54:29 -07:00
Derek McGowan
5fdf55e493
Update go module to github.com/containerd/containerd/v2 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-29 20:52:21 -07:00
Samuel Karp
3fff8b4f62
ctr: new deprecations command 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-10-24 22:38:33 -07:00
Samuel Karp
240733ce2f
warning: new service for deprecations 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-10-24 22:38:31 -07:00
Samuel Karp
8ed0255f1b
Merge pull request #9205 from lengrongfu/feat/add-cpu-burst 2023-10-12 23:55:00 -07:00
Derek McGowan
7b2a918213
Generalize the plugin package 
Remove containerd specific parts of the plugin package to prepare its
move out of the main repository. Separate the plugin registration
singleton into a separate package.

Separating out the plugin package and registration makes it easier to
implement external plugins without creating a dependency loop.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-12 21:22:32 -07:00
Derek McGowan
a80606bc2d
Move plugin type definitions to containerd plugins package 
The plugins packages defines the plugins used by containerd.
Move all the types and properties to this package.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-12 20:52:56 -07:00
Derek McGowan
cb969085f5
Temporarily remove zfs as built in plugin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-12 20:39:22 -07:00
Samuel Karp
420503072e
Merge pull request #9027 from akhilerm/fix-ctr-forbidden-characters 2023-10-11 17:29:55 -07:00
rongfu.leng
8f3d1c9d9b add cpu-burst param to ctr command 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
 2023-10-09 21:51:24 +08:00
Akhil Mohan
4b59d67dd4
add a new flag "skip-reference-check" to skip reference name check 
Signed-off-by: Akhil Mohan <makhil@vmware.com>
 2023-10-06 17:57:04 +05:30
Derek McGowan
62f273d508
Add migrate subcommand to config command 
Allows applying migration to existing configurations

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-26 16:54:24 -07:00
Derek McGowan
f58158e2d3
Add config migration and bump config version 
Allows plugins to migrate from older configurations

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-26 16:53:33 -07:00
Derek McGowan
4c344f2fa5
Add warning for plugin configs with unknown fields 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-25 16:09:15 -07:00
Derek McGowan
650148313c
Add warning log for unknown config fields 
Add error log for failure to parse toml

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-24 20:50:54 -07:00
Derek McGowan
b5615caf11
Update go-toml to v2 
Updates host file parsing to use new v2 method rather than the removed
toml.Tree.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-22 15:35:12 -07:00
Derek McGowan
508aa3a1ef
Move to use github.com/containerd/log 
Add github.com/containerd/log to go.mod

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-22 07:53:23 -07:00
Derek McGowan
31b6cdfd10
Merge pull request #8493 from DataDog/image-verifier-bindir-plugin 
Add image verifier transfer service plugin system based on a binary directory
 2023-09-14 06:37:17 -07:00
Sebastiaan van Stijn
f7089ba225
leases: add WithLabel 
This adds a new WithLabel function, which allows to set a single label on
a lease, without having to first construct an intermediate map[string]string.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-11 21:03:40 +02:00
Ethan Lowman
ac1d556b92
Add image verifier transfer service plugin system based on a binary directory 
Signed-off-by: Ethan Lowman <ethan.lowman@datadoghq.com>
 2023-09-07 18:45:02 -04:00
Maksym Pavlenko
c13f47a3ae
Merge pull request #9029 from dmcgowan/push-inherit-distribution-sources 
push: inherit distribution sources from parent
 2023-09-07 12:46:18 -07:00
Akhil Mohan
6ec0d4a3ad
prevent ctr from creating tags with forbidden characters 
check if the target tag that is to be created using ctr image tag
is valid and does not contain any forbidden characters.

Signed-off-by: Akhil Mohan <makhil@vmware.com>
 2023-09-06 15:47:52 +05:30
Akihiro Suda
0ee2433c94
Merge pull request #5890 from artqzn/idmapped_mounts 
RFC: Initial support of idmapped mount points
 2023-09-05 20:41:05 +09:00
Ilya Hanov
1555a31bf6 mount: support idmapped mount points 
This patch introduces idmapped mounts support for
container rootfs.

The idmapped mounts support was merged in Linux kernel 5.12
torvalds/linux@7d6beb7.
This functionality allows to address chown overhead for containers that
use user namespace.

The changes are based on experimental patchset published by
Mauricio Vásquez #4734.
Current version reiplements support of idmapped mounts using Golang.

Performance measurement results:
Image           idmapped mount  recursive chown
BusyBox         00.135          04.964
Ubuntu          00.171          15.713
Fedora          00.143          38.799

Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
Signed-off-by: Artem Kuzin <artem.kuzin@huawei.com>
Signed-off-by: Alexey Perevalov <alexey.perevalov@huawei.com>
Signed-off-by: Ilya Hanov <ilya.hanov@huawei-partners.com>
 2023-09-05 01:23:30 +03:00
Derek McGowan
b32638e21b
ctr: pull or fetch image metadata by default 
The metadata is small and useful for viewing all platforms
for an image and enabling push back to the same registry.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-08-31 11:07:52 -07:00
Jin Dong
fc45365fa1 Remove most logrus 
Signed-off-by: Jin Dong <jin.dong@databricks.com>
 2023-08-26 14:31:53 -04:00
Maksym Pavlenko
871a94a465
Merge pull request #8565 from samuelkarp/ctr-override-mounts 
ctr: allow run to override mounts
 2023-08-25 10:01:11 -07:00
Phil Estes
8e7a25856b
Merge pull request #8998 from dmcgowan/image-inspect 
ctr: images inspect
 2023-08-23 14:12:56 -04:00
Sebastiaan van Stijn
b76cd4d9fd
replace some fmt.Sprintfs with strconv 
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-08-23 16:43:02 +02:00
Derek McGowan
bbdbf7ab6c
Add inspect image commands 
Outputs the image structure as a tree with an option to show content
and related labels for the image.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-08-23 06:52:35 -07:00
Derek McGowan
55c877297a
Merge pull request #8556 from Wang99998/main 
Update default platform matcher when ctr import
 2023-08-22 16:53:42 -07:00
Derek McGowan
bc15df7231
Merge pull request #8894 from thaJeztah/log_improve 
log: cleanups and improvements to decouple more from logrus
 2023-08-21 15:08:18 -07:00
Enrico Weigelt, metux IT consult
1571a5aa07 ctr: metrics: drop unused retval from printWindowsStats() 
The error return value is always nil, so we don't need it at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
 2023-08-19 15:33:40 +02:00
Enrico Weigelt, metux IT consult
60b2cb143f cmd: containerd: allow building w/o systemd notify 
Make the rather obscure systemd notification build-time optional by
setting 'no_systemd' tag and so skip dependencies on around 9kLoC
vendor code.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
 2023-08-18 13:24:08 +02:00
Kirtana Ashok
a645ff2e68 Update dependencies after protobuf update in hcsshim 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit d129b6f890bceb56b050bbb23ad330bb5699f78c)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2023-08-09 11:56:45 -07:00
Wang Xinwen
710d987d29
Fix default platform matcher when ctr import 
Signed-off-by: Wang Xinwen <wxw0504@outlook.com>
 2023-07-31 22:17:25 +08:00
Sebastiaan van Stijn
dd67240f1b
log: define OutputFormat type 
Strong-type the format.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-30 22:36:00 +02:00
Fu Wei
6eb90a63e0
Merge pull request #8837 from anmaxvl/fix-ctr-images-check-quiet 
fix: `ctr images check -q` outputs not unpacked images
 2023-07-24 10:39:43 +08:00
Akihiro Suda
0498acefb9
go.mod: github.com/.../container-device-interface v0.6.0 
https://github.com/container-orchestrated-devices/container-device-interface/compare/v0.5.4...v0.6.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-07-23 03:07:59 +09:00
Maksim An
90ecb8104e fix: ctr images check outputs not unpacked images in quite mode 
`ctr images check -q` shouldn't output images which were not
unpacked.

Signed-off-by: Maksim An <maksiman@microsoft.com>
 2023-07-18 10:16:54 -07:00
Marat Radchenko
9e34b8b441 Uncopypaste parsing of OCI Bundle spec file 
Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
 2023-07-11 14:41:15 +03:00
Fu Wei
e7276fe35a
Merge pull request #8744 from cardyok/bugfix_remote_fetch_mediatype 2023-07-04 21:58:35 +08:00
Cardy.Tang
50376ec9ff remotes: allow FetchByDigest client to pass mediatype as header 
accept mediatype header is required for some layers, add additional field for client.

Signed-off-by: Cardy.Tang <zuniorone@gmail.com>
 2023-06-27 16:36:01 +08:00
Jin Dong
0a92661e69 Add a platform.ParseAll helper 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-26 20:34:37 +00: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
Samuel Karp
f92e576f6b
Merge pull request #8609 from samuelkarp/issue-8607 2023-06-05 10:31:45 -07:00
Samuel Karp
ab53652228
ctr: update WritePidFile to use atomicfile 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-06-02 16:56:34 -07:00
Kazuyoshi Kato
659a41fd85
Merge pull request #8174 from Iceber/fix_ctr_run 
ctr: fix the cleanup of task
 2023-05-31 10:01:12 -07:00
Evan Lezar
d3887b2e62 Support CDI devices in ctr --device flag 
This change adds support for CDI devices to the ctr --device flag.
If a fully-qualified CDI device name is specified, this is injected
into the OCI specification before creating the container.

Note that the CDI specifications and the devices that they represent
are local and mirror the behaviour of linux devices in the ctr command.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-31 16:14:01 +02:00
Peteris Rudzusiks
f2bc737825 Add cpuset-mems flag to 'ctr run' command 
This flag allows cpuset.mems to be specified when running a container. If
provided, the container will use only the defined memory nodes.

Signed-off-by: Peteris Rudzusiks <rye@stripe.com>
 2023-05-30 17:56:18 +02:00
Peteris Rudzusiks
f642c0a5f5 ctr: add cpuset-cpus flag to 'ctr run' command 
This flag allows cpuset.cpus to be specified when starting a container. If
provided, the container will use only the defined CPU cores.

Signed-off-by: Peteris Rudzusiks <rye@stripe.com>
 2023-05-30 17:50:33 +02:00