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

1403 Commits

Author SHA1 Message Date
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
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
Samuel Karp
3d7522b7f2
ctr: allow run to override mounts 
If a mount destination is specified both in the default spec and in a
--mount option, remove the default mount before adding new mounts.  This
allows overriding the default sysfs mount, for example.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-05-24 13:54:40 -07:00
Akihiro Suda
878132923d
Merge pull request #8511 from dmcgowan/blockfile-snapshotter 
Add blockfile snapshotter
 2023-05-18 11:52:37 +09:00
Derek McGowan
798dba9faa
Add blockfile as a builtin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-05-17 14:25:27 -07:00
Samuel Karp
c60ba138b6
Merge pull request #8502 from mstmdev/fix-typos 2023-05-16 08:41:02 -07:00
mstmdev
cdaa4025e9 Fix some typos 
Signed-off-by: Pan Yibo <mstmdev@gmail.com>
 2023-05-16 10:12:50 +08:00
Iceber Gu
3d9dd2022d ctr: fix the cleanup of task 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-05-12 18:28:47 +08:00
Akihiro Suda
2eeb4b6238
Merge pull request #8373 from Iceber/shim_run 
runtime/shim: rename RunManager to Run and remove `runc/v2/services` package
 2023-05-12 00:46:46 +09:00
Maksym Pavlenko
6f34da5f80 Cleanup logrus imports 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-05-05 11:54:14 -07:00
Maksym Pavlenko
370be0c18f Move logrus setup code to log package 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-04-24 10:14:13 -07:00
Danny Canter
519457e3e0 ctr: Add sandbox flag to ctr run 
Add a flag to be able to run a container in a given sandbox.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-04-19 19:40:59 -07:00
Iceber Gu
b71f4b7518 runtime/shim: rename RunManager to Run 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-04-14 11:42:21 +08:00
Fu Wei
f7f2be7321
Merge pull request #8302 from Iceber/fix_ctr_task_metrics 
ctr/tasks: fix unmarshal the task metrics for cgroup v1
 2023-03-24 20:26:05 +08:00
Iceber Gu
1be08b10f7 ctr/tasks: fix unmarshal the task metrics for cgroups v1 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-03-23 14:42:24 +08:00
Fu Wei
e208c24256
Merge pull request #8175 from Iceber/fix_cni_metadata 
adding cni metadata to the container in the `ctr run --config`
 2023-03-16 23:29:48 +08:00
Iceber Gu
5fdca538d0 adding cni metadata to the container in the ctr run --config 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-03-16 18:01:53 +08:00
Maksym Pavlenko
07c2ae12e1 Remove v1 runctypes 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-03-15 09:18:16 -07:00
Maksym Pavlenko
ef516a1507 Remove runtime v1 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-03-15 09:18:14 -07:00
Derek McGowan
fe3cd1781b
Merge pull request #8267 from helen-frank/feature/OptimizationcheckBinarySizes 
Optimization containerd-stress
 2023-03-14 17:16:20 -07:00
helen
08337f3563 Pre-splice strings and determine whether it is a file and check criCleanup err. 
Signed-off-by: helen <haitao.zhang@daocloud.io>
 2023-03-14 23:15:46 +08:00
Akihiro Suda
86fc1ccab4
Remove aufs snapshotter (deprecated since v1.5) 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-03-14 14:37:13 +09:00
panguicai008
5c9c630c33 use uppercase letters for flag usage 
Signed-off-by: panguicai008 <guicai.pan@daocloud.io>
 2023-03-08 14:28:06 +08:00
Jian Zeng
f706576500
feat: tag image using Transfer api 
Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
 2023-03-05 23:22:17 +08:00
Derek McGowan
13bf5565eb
[transfer] update export to use image store references 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-03-02 11:14:32 -08:00
Jian Zeng
f6491b0049
feat: export images using Transfer api 
Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
 2023-03-02 09:04:25 -08:00
Iceber Gu
b91f42a146 ctr/tasks: support remapped UID/GID 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-03-02 14:02:14 +08:00
Tony Fang
8a47c6910f Add a leading space after the comment sign 
Fix coding standards

Signed-off-by: Tony Fang <nhfang@amazon.com>
 2023-02-26 17:49:15 +00:00
Tony Fang
47305392c6 Add configuration options to local transfer service 
Signed-off-by: Tony Fang <nhfang@amazon.com>
 2023-02-25 03:40:06 +00: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
Maksym Pavlenko
24cf85f5a3
Merge pull request #8103 from AkihiroSuda/go-1.20 
Go 1.20.1
 2023-02-15 20:09:28 -08:00
Derek McGowan
fa5752ba92
Merge pull request #8096 from helen-frank/feature/ctrVersionAddArgsCheck 
ctr version: add args check
 2023-02-15 15:29:01 -08:00
Akihiro Suda
d8b68e3ccc
Stop using math/rand.Read and rand.Seed (deprecated in Go 1.20) 
From golangci-lint:

> SA1019: rand.Read has been deprecated since Go 1.20 because it
>shouldn't be used: For almost all use cases, crypto/rand.Read is more
>appropriate. (staticcheck)

> SA1019: rand.Seed has been deprecated since Go 1.20 and an alternative
>has been available since Go 1.0: Programs that call Seed and then expect
>a specific sequence of results from the global random source (using
>functions such as Int) can be broken when a dependency changes how
>much it consumes from the global random source. To avoid such breakages,
>programs that need a specific result sequence should use
>NewRand(NewSource(seed)) to obtain a random generator that other
>packages cannot access. (staticcheck)

See also:

- https://pkg.go.dev/math/rand@go1.20#Read
- https://pkg.go.dev/math/rand@go1.20#Seed

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-02-16 03:50:23 +09:00
Akihiro Suda
a9ac5f9cb5
lint: remove //nolint:dupword that are no longer needed 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-02-16 03:50:23 +09: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
Wei Fu
e855a59984 cmd/ctr/commands/images: support usage subcommand 
The `ctr image usage` can display the usage of snapshots with a given
image ref. It's easy for user to get chain snapshot IDs and unpack
usage. And according to the [discuss][1], this subcommand can be used to
ensure if snapshot's pagecache has been discarded in a unexpected
reboot.

How to use it:

```bash
$ bin/ctr image usage --snapshotter native docker.io/library/golang:1.19.3
ctr: image docker.io/library/golang:1.19.3 isn't unpacked in snapshotter native

$ bin/ctr image usage --snapshotter overlayfs docker.io/library/golang:1.19.3
KEY                                                                     SIZE      INODES
sha256:28114d8403bac6352c3e09cb23e37208138a0cd9d309edf3df38e57be8075a1d 16.0 KiB  4
sha256:f162c02ce6b9b594757cd76eda1c1dd119b88e69e882cb645bf7ad528b54f0d2 476.2 MiB 13660
sha256:a5b9faceaa495819b9ba7011b7276c4ffaffe6c7b9de0889e11abc1113f7b5ca 225.5 MiB 3683
sha256:412b2615d27d6b0090558d25b201b60a7dff2a40892a7e7ca868b80bf5e5de41 159.8 MiB 6196
sha256:dbce1593502d39c344ce089f98187999f294de5182a7106dcb6c9d04ce0c7265 19.4 MiB  502
sha256:8953bf5d24149e9b2236abc76bd0aa14b73828f1b63e816cb4b457249f6125bc 12.2 MiB  958
sha256:ccba29d6937047c719a6c048a7038d3907590fbb8556418d119469b2ad4f95bc 134.7 MiB 7245

$ bin/ctr image usage --snapshotter overlayfs docker.io/library/golang:1.19
ctr: failed to ensure if image docker.io/library/golang:1.19 exists: image "docker.io/library/golang:1.19": not found
```

[1]: <https://github.com/containerd/containerd/issues/5854#issuecomment-1415915765>

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-02-14 23:24:10 +08:00
Akihiro Suda
4e2eb8ba4e
Merge pull request #7964 from dmcgowan/transfer-image-store-references 
[transfer] update imagestore interface to support multiple references
 2023-02-14 11:22:27 +09:00
Derek McGowan
081601f521
Update imagestore interface to support multiple references 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-02-13 13:58:33 -08:00
helen
a8bb1ad2a0 loadConfig pre-inspection in advance 
Signed-off-by: helen <haitao.zhang@daocloud.io>
 2023-02-13 20:11:30 +08:00
helen
36e7dbdcbd ctr version: add args check, prohibit incoming args 
Signed-off-by: helen <haitao.zhang@daocloud.io>
 2023-02-13 17:20:18 +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
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
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
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
Kay Yan
2f1aad03af
cleanup useless IntToInt32Array func 
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
 2023-02-01 12:14:46 +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
Iceber Gu
0b9313c426 ctr/run: flags --detach and --rm cannot be specified together 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-01-07 10:18:43 +08:00
Akihiro Suda
c6aa1db8e6
Merge pull request #7911 from mxpv/dupword 
Enable dupword linter
 2023-01-04 07:38:36 +09:00
Samuel Karp
f15563c26d
Merge pull request #7905 from dcantah/ctr-ocispec-plat 2023-01-03 14:33:06 -08:00
Maksym Pavlenko
06bfcd658c Enable dupword linter 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-03 12:47:16 -08:00
Danny Canter
0abc2f160c ctr: Add platform flag to 'oci spec' command 
This adds in a simple flag to control what platform the spec it generates
is for. Useful to easily get a glance at whats the default across platforms.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-01-03 12:44:26 -08: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
Iceber Gu
6b333fd210 ctr contents ls sorts the labels of the content 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2022-12-30 15:58:47 +08:00
Iceber Gu
a2df12d1a3 fix ctr tasks kill does not remove cni network under windows 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2022-12-23 14:51:49 +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
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
Phil Estes
133ddce7cf
Merge pull request #7651 from AkihiroSuda/custom-image-createdat 
images: support specifying SourceDateEpoch via ctx
 2022-12-12 12:59:38 -05:00
calvin0327
f219f7d1ea fix sdNotify func when debug level 
Signed-off-by: wen chen <wen.chen@daocloud.io>
 2022-12-12 10:06:35 +08:00
Akihiro Suda
dc48349248
epoch: propagate SOURCE_DATE_EPOCH via ctx 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-12-12 09:02:35 +09:00
Phil Estes
a7428f4473
Merge pull request #7732 from AkihiroSuda/sha256-simd 
digest: use github.com/minio/sha256-simd
 2022-12-09 09:37:37 -05:00
Maksym Pavlenko
e14753fc54 Respect no_cri constraint 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-08 09:36:23 -08:00
Maksym Pavlenko
3bc8fc4d30 Cleanup build constraints 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-08 09:36:20 -08:00
Maksym Pavlenko
c040f83825 Fix default config for Darwin 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-08 07:49:14 -08:00
Akihiro Suda
cde9490779
digest: use github.com/minio/sha256-simd 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-12-08 18:50:00 +09:00
Akihiro Suda
698622b89a
Merge pull request #7673 from turan18/ctr-restore 
Refactor ctr restore to allow for tty allocation
 2022-12-06 17:55:19 +09:00
yanggang
b0dd506553
fix panic when containerd-stress density --count 0 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-12-03 09:25:51 +08:00
Derek McGowan
42eedc0bc7
Update ctr to make local the default for distribution 
Disable using transfer service by default for now

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:57 -08:00
Derek McGowan
ef61e13a6e
Update import cli to use transfer service 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:56 -08:00
Derek McGowan
b991c71e90
Update pull command to use filter arguments 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:56 -08:00
Derek McGowan
0aca4bb1f2
Update ctr commands to use transfer interface 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:54 -08:00
Derek McGowan
e506cd103f
Implement client interface for transfer service 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:53 -08:00
Derek McGowan
6f64cb8598
Transfer interface and plugin work in progress 
Signed-off-by: Derek McGowan <derek@mcg.dev>

Transfer service implementation

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:50 -08:00
Derek McGowan
dcf5687cab
Add streaming service 
Adds a service capable of streaming Any objects bi-directionally.
This can be used by services to send data, received data, or to
initiate requests from server to client.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:55:56 -08:00
Derek McGowan
c469f67a2b
Merge pull request #6019 from klihub/pr/proto/nri 
NRI: add support for NRI with extended scope.
 2022-11-30 10:42:17 -08:00
Derek McGowan
763d4e1261
Merge pull request #7730 from djdongjin/ctr-prune 
Add ctr image prune command
 2022-11-29 15:39:42 -08:00
Derek McGowan
6f7ed272e8
Merge pull request #7694 from AkihiroSuda/introspection-pid 
introspection: expose the daemon's PID and PIDNS
 2022-11-29 11:41:14 -08:00
Jin Dong
8e0a3c51a5 Add ctr image prune 
Signed-off-by: Jin Dong <jindon@amazon.com>
 2022-11-29 18:11:34 +00:00
Krisztian Litkey
43704ca888 nri: add experimental NRI plugin. 
Add a common NRI 'service' plugin. It takes care of relaying
requests and respones to and from NRI (external NRI plugins)
and the high-level containerd namespace-independent logic of
applying NRI container adjustments and updates to actual CRI
and other containers.

The namespace-dependent details of the necessary container
manipulation operations are to be implemented by namespace-
specific adaptations. This NRI plugin defines the API which
such adaptations need to implement.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
 2022-11-28 21:51:06 +02:00
Fu Wei
24020812bb
Merge pull request #7669 from yanggangtony/status-clean 
make status more readable and update easy.
 2022-11-27 23:12:23 +08:00
Akihiro Suda
661aaae3bb
introspection: expose the daemon's PID and PIDNS 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-11-18 17:14:26 +09:00
Derek McGowan
223f67ccdb
Merge pull request #7601 from kzys/cgroups-upgrade 
Upgrade github.com/containerd/cgroups from v1 to v3
 2022-11-17 21:55:03 -08:00
Yasin Turan
5d0457df90 Refactored ctr to allow for tty allocation when container has {terminal:true} within Spec 
Signed-off-by: Yasin Turan <turyasin@amazon.com>
 2022-11-16 21:15:03 +00:00
Phil Estes
344da9edb2
Merge pull request #7670 from yanggangtony/fix-desc-for-containerd 
complement sub-command note for containerd-main
 2022-11-16 10:16:56 -05:00
yanggang
405024db0a
complement sub-command note for containerd-main 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-11-15 17:04:02 +08:00
yanggang
e38e2c8a4d
make status more readable and update easy. 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-11-15 15:48:01 +08:00
yanggang
3abcfb5c07
keep the lower case letter for flag info 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-11-15 14:09:55 +08:00
Kazuyoshi Kato
8bb5999738 Remove the outdated comment 
While containerd/cgroups is only for Linux, the metrics subcommand works
on Windows.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-11-14 21:07:48 +00:00
Kazuyoshi Kato
dd86128e0d Convert hcsshim's stats to cgroups' stats 
Since hcsshim still uses containerd/cgroups 1.x which uses
gogo/protobuf.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-11-14 21:07:48 +00:00