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

88 Commits

Author SHA1 Message Date
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
e59f64792b Move oci to pkg/oci 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:55:48 -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
b0c3d00e98 Move cio to pkg/cio 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-01-17 09:54:27 -08:00
Derek McGowan
261e01c2ac Move client to subpackage 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-11-01 10:37:00 -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
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
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
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
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
Maksym Pavlenko
6f34da5f80 Cleanup logrus imports 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-05-05 11:54:14 -07: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
Maksym Pavlenko
07c2ae12e1 Remove v1 runctypes 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-03-15 09:18:16 -07: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
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
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
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
Maksym Pavlenko
3bc8fc4d30 Cleanup build constraints 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-08 09:36:20 -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
Iceber Gu
48daccb4dd fix the --no-pivot flag being ignored by ctr tasks start 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2022-10-13 11:50:26 +08:00
Kazuyoshi Kato
96b16b447d Use typeurl.Any instead of github.com/gogo/protobuf/types.Any 
This commit upgrades github.com/containerd/typeurl to use typeurl.Any.
The interface hides gogo/protobuf/types.Any from containerd's Go client.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-03-24 20:50:07 +00:00
songjiang han
2a0b2ee9eb fix: ctr run --cni get failed 
when   user  executes ctr run --cni to start a container,it will call cni plugin to create network .But when user kills it,the network won’t be removed. if we run a container with same namespace and name again will trigger a bug. we should remove the network when user kills task if it enables cni plugin.

Fix:#6604

Signed-off-by: SongJiang Han <songjiang.dark@gmail.com>
 2022-03-15 15:46:29 +08:00
ning.a.li
a303d552ad ctr: Unify the delete subcommand alias 
This commit unifies the following sub commands alias for
deleting/removing.
- containers
- tasks
- contents
- leases
- images
- snapshots

Signed-off-by: Ning Li <lining2020x@163.com>
 2022-01-11 16:21:26 +08:00
haoyun
bbe46b8c43 feat: replace github.com/pkg/errors to errors 
Signed-off-by: haoyun <yun.hao@daocloud.io>
Co-authored-by: zounengren <zouyee1989@gmail.com>
 2022-01-07 10:27:03 +08:00
Claudiu Belu
5b222d54ad commands: Enables task metrics for Windows 
The command already contains logic for Windows container
metrics, we just need to enable the command.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-10-05 09:25:12 -07:00
jonyhy
e6ddffc2af fix: make exec-id flag required in exec command 
Signed-off-by: jonyhy <yun.hao@daocloud.io>
 2021-09-28 18:19:32 +08:00
Daniel Canter
27046a9e06 Fix cwd flag for ctr tasks exec 
It seems like the cwd flag isn't used anywhere for ctr tasks exec. This change
just sets the cwd field on the spec for the execed process if a new one was
asked for, otherwise it will continue using whatever was on the containers spec.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-09-02 03:59:56 -07:00
Akihiro Suda
d3aa7ee9f0 Run go fmt with Go 1.17 
The new `go fmt` adds `//go:build` lines (https://golang.org/doc/go1.17#tools).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-08-22 09:31:50 +09:00
Kazuyoshi Kato
1d3d08026d Support SIGRTMIN+n signals 
systemd uses SIGRTMIN+n signals, but containerd didn't support the signals
since Go's sys/unix doesn't support them.

This change introduces SIGRTMIN+n handling by utilizing moby/sys/signal.

Fixes #5402.

https://www.freedesktop.org/software/systemd/man/systemd.html#Signals

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-07-26 09:36:43 -07:00
Samuel Karp
5dec27b6f1 ctr: exec handle pty resize after Start 
Handle initial pty resize after the exec process has started and the pty
is available, consistent with the behavior of ctr run.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
 2021-05-25 00:12:21 -07:00
Samuel Karp
b9378b4529 ctr: exec setup IO with console 
Use cio.WithStreams with explicit console device when --tty is passed,
consistent with how ctr run behaves.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
 2021-05-22 23:19:46 -07:00
acetang
5e94745f26 ctr: add --user for task exec 
set user in exec container

$ ctr t exec --exec-id e1 --user admin container id
uid=500(admin) gid=500(admin) groups=500(admin)

Signed-off-by: chuangxue <chenglong.lcl@alibaba-inc.com>
Signed-off-by: acetang <aceapril@126.com>
 2021-03-25 19:29:30 +08:00
Maksim An
ddb5e1651a Enhance logging driver and ctr tasks to support windows 
Signed-off-by: Maksim An <maksiman@microsoft.com>
 2021-01-21 12:17:32 -08:00
Phil Estes
534be84c5d Merge pull request #4529 from gongguan/creator 
avoid unnecessary NewCreator calls
 2020-09-21 13:33:51 -04:00
Guanjun Gong
0dea724fc0 NewTask avoid unnecessary cio.NewCreator calls 
Signed-off-by: Guanjun Gong <gongguanjun@hotmail.com>
 2020-09-21 11:45:37 +08:00
Li Yuxuan
bdb5b2ce47 ctr: Return error if task.Metrics fails 
Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2020-09-10 16:42:35 +08:00
Prashant Bhutani
35b63c064f Report correct stats for windows containers 
Windows container stats were reporting incorrect metrics for cpu kernel runtime.

Signed-off-by: Prashant Bhutani <prbhutan@microsoft.com>
 2020-08-12 00:51:37 +05:30
Boris Popovschi
49e7039a85 cpu metrics consistency 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 12:30:12 +02:00
Boris Popovschi
659c971cad task metrics fix 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 10:52:37 +02:00
bpopovschi
b98cc79184 Added memory and cpu metrics for cgroupv2 
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
 2019-12-16 16:10:51 +02:00
Michael Crosby
5d93ece758 Merge pull request #3799 from AkihiroSuda/cgroup2 
support cgroup2
 2019-12-12 14:30:19 -05:00
Joakim Roubert
e0011978ff start.go: Improve help text 
Change-Id: I9adfc27868b246fb85823d18c65f95668e3fbc58
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-12-12 11:19:41 +01:00
Akihiro Suda
8f870c233f support cgroup2 
* only shim v2 runc v2 ("io.containerd.runc.v2") is supported
* only PID metrics is implemented. Others should be implemented in separate PRs.
* lots of code duplication in v1 metrics and v2 metrics. Dedupe should be separate PR.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-12-12 02:56:51 +09:00
Justin Terry (VM)
37b56cafc6 Add ctr metrics support for Windows/LCOW containers 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-10-23 13:50:34 -07:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages 
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-01 10:19:56 -04:00
Michael Crosby
f543f2fbcd Call CloseIO when stdin closes in ctr 
Fixes #2439

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-07-26 19:52:03 +00:00
Phil Estes
15b59f9684 Merge pull request #3441 from YLonely/multiple-task-delete 
Update ctr to support deleting multiple tasks at a time
 2019-07-25 14:29:31 -04:00
BoWen Yan
392668d007 ctr:Support deleting multiple tasks at a time 
Signed-off-by: BoWen Yan <loneybw@gmail.com>
 2019-07-25 09:59:15 +08:00
Maksym Pavlenko
46af8ccd2d Check exec log flags compatibility 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-02 09:53:11 -07:00