github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
10,501 Commits 3 Branches 4 Tags
fe7f0aeef42b9cd8c5b0c45f889bbbf9ad766ab2
Commit Graph

1191 Commits

Author SHA1 Message Date
Fu Wei
fe7f0aeef4 Merge pull request #6827 from mxpv/renames 2022-04-20 14:06:29 +08:00
Maksym Pavlenko
e2fd25f3d8 Move runtime v2 proto 
Move runtime v2 protos to api/runtime package.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-19 17:59:33 -07:00
Kazuyoshi Kato
3742c756e8 Don't generate a Go file, if that would be empty 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 22:15:45 +00:00
Kazuyoshi Kato
5f3b724323 Fix protoc-gen-go-fieldpath 
The generator has to handle nested fields such as
902212651b/api/events/container.proto (L31-L35).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 22:11:03 +00:00
Kazuyoshi Kato
88c0c7201e Consolidate gogo/protobuf dependencies under our own protobuf package 
This would make gogo/protobuf migration easier.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 15:53:36 +00:00
Derek McGowan
be60973a30 Merge pull request #6703 from mxpv/s 
Sandbox API
 2022-04-18 20:55:06 -07:00
Derek McGowan
fe8da6dcaf Move lease manager plugin to separate package 
Create lease plugin type to separate lease manager from services plugin.
This allows other service plugins to depend on the lease manager.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-04-15 11:08:47 -07:00
Maksym Pavlenko
85a49e4ee7 [sandbox] Cleanup interfaces 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-08 13:34:50 -07:00
Maksym Pavlenko
0d165e6544 Restore sandboxes on daemon restart 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-08 13:33:48 -07:00
Maksym Pavlenko
fa02477ca9 [sandbox] Add sandbox shim skeleton 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-08 13:33:48 -07:00
Maksym Pavlenko
17a2aaded3 [sandbox] Add ctr support 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-08 13:33:48 -07:00
Maksym Pavlenko
eaccbf1d03 [sandbox] Add clients 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-08 13:33:47 -07:00
Kazuyoshi Kato
6fdaebde35 Merge pull request #6672 from linxiulei/fix_rel 
Turn paths from cmdline into absolute paths
 2022-04-06 09:20:10 -07:00
Maksym Pavlenko
0b2a95e107 Add no_tracing tag 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-03-31 14:37:11 -07:00
Eric Lin
44a8ac7b0c Turn paths from cmdline into absolute paths 
Snapshotter service returning relative paths confuses the client (i.e.
ctr).

Closes: #6671

Signed-off-by: Eric Lin <linxiulei@gmail.com>
 2022-03-27 17:25:44 +00:00
Phil Estes
3633cae64b Merge pull request #6706 from kzys/typeurl-upgrade 
Use typeurl.Any instead of github.com/gogo/protobuf/types.Any
 2022-03-25 10:38:46 -04:00
Fu Wei
595ad06de7 Merge pull request #6713 from cosmoer/fix-ctr-images-mount-command 
fix: ctr images mount with snapshotter option can't get snapshotter
 2022-03-25 07:37:04 +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
cosmoer
df93940fb2 fix: ctr images mount with snapshotter option can't get snapshotter 
Signed-off-by: Qian Zhang <cosmoer@qq.com>
 2022-03-23 23:12:54 +08:00
Sebastiaan van Stijn
d2013d2c99 runtime: deprecate runc --criu / -criu-path option 
runc option --criu is now ignored (with a warning), and the option will be
removed entirely in a future release. Users who need a non- standard criu
binary should rely on the standard way of looking up binaries in $PATH.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-03-23 14:42:43 +01:00
Michael Crosby
de9344d845 Merge pull request #6670 from snbc/ctr_run_cni 
fix: `ctr run --cni` get failed
 2022-03-16 14:45:00 -04:00
Phil Estes
cf30a39353 Merge pull request #6562 from kzys/fieldpath 
Add protoc-gen-go-fieldpath
 2022-03-15 07:48:30 -07: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
Kazuyoshi Kato
50ca5727b2 Merge pull request #6519 from ginglis13/ctr-runtime-path 
ctr: improve error relative shim path error msg
 2022-03-14 09:49:27 -07:00
Tomoya.Fujita
ba1674389f typo fixes under cmd. 
Signed-off-by: Tomoya.Fujita <Tomoya.Fujita@sony.com>
 2022-03-12 11:32:31 -08:00
Paul "TBBle" Hampson
2a425990cf Implement --device idType://id for ctr run on Windows 
Also fixes the issue that `ctr run` on Windows offered help for the
non-Windows implementation, but was silently ignored.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2022-03-12 08:16:43 +11:00
Phil Estes
b521429b67 Merge pull request #6495 from thaJeztah/improve_versions 
strip path-info from `-v` (version) output, and implement -v flag for containerd-shim
 2022-03-08 13:57:34 -05:00
Gavin Inglis
7b045ea5f0 ctr: improve error relative shim path error msg 
addresses https://github.com/containerd/containerd/issues/6464

Return an error if a runtime provided is relative.

Add context to the usage for `ctr run --runtime` indicating that
absolute path to runtime binary must be provided.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
 2022-03-03 23:28:03 +00:00
Justin Terry
0c79257f59 Add --user support for ctr run Windows 
Adds the ability to override the default user
ContainerUser with a custom user if present in
the image or ContainerAdministrator if needed.

Signed-off-by: Justin Terry <jlterry@amazon.com>
 2022-03-01 15:28:51 -08:00
Kazuyoshi Kato
3febabffeb Add protoc-gen-go-fieldpath 
This command will replace protobuf/plugin/fieldpath when we migrate
off from gogo/protobuf.

See #6564 for the detail.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-02-21 17:36:12 +00:00
Eric Ernst
ac2692d30f containerd-stress: introduce option for specifying image 
allow user to specify what image should be used for containerd-stress.

Signed-off-by: Eric Ernst <eric_ernst@apple.com>
 2022-02-06 09:55:16 -08:00
Eric Ernst
8b9571e348 containerd-stress: start task ctr before starting execs 
For some runtimes, the container is not ready for exec until the
initial container task has been started (as opposed to just having the task created).

More specifically, running containerd-stress with --exec would break
with Kata Container shim, since the sandbox is not created until a
start is issued. By starting the container's primary task before adding
exec's, we can avoid:
```
error="cannot enter container exec-container-1, with err Sandbox not running, impossible to enter the container: unknown"
```

Signed-off-by: Eric Ernst <eric_ernst@apple.com>
 2022-02-04 16:08:44 -08:00
Sebastiaan van Stijn
fdbfde5d81 cmd/containerd-shim: add -v (version) flag 
Unlike the other shims, containerd-shim did not have a -v (version) flag:

    ./bin/containerd-shim-runc-v1 -v
    ./bin/containerd-shim-runc-v1:
    Version: v1.6.0-rc.1
    Revision: ad771115b82a70cfd8018d72ae489c707e63de16.m
    Go version: go1.17.2

    ./bin/containerd-shim -v
    flag provided but not defined: -v
    Usage of ./bin/containerd-shim:

This patch adds a `-v` flag to be consistent with the other shims. The code was
slightly refactored to match the implementation in the other shims, taking the
same approach as 77d53d2d23/runtime/v2/shim/shim.go (L240-L256)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-31 21:09:50 +01:00
Derek McGowan
62f6c8175a Merge pull request #6424 from cpuguy83/nondist-blob-push 
Add support for skipping non-dist blob push
 2022-01-19 19:12:31 -08:00
ningmingxiao
ed0828bb6b delete useless code 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2022-01-18 21:10:20 +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
Brian Goff
d05194f0a7 ctr: flag to toggle non-distributable blob push 
With this flag, ctr will no longer automatically push non-distributable
artifacts by default.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2022-01-11 00:49:40 +00: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
Markus Lehtonen
9e755d12e2 cmd: add --rdt-class command line option 
A new option for setting the RDT class (or CLOS) from the command line.

Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
 2022-01-04 09:27:54 +02:00
Derek McGowan
bf60e2d174 Merge pull request #6304 from lippertmarkus/fix-ctr-cni-windows 
fix(ctr): enable networking for Windows containers
 2022-01-03 10:47:44 -08:00
Markus Lippert
f39b3ac7ea fix(ctr): enable networking for Windows containers 
Signed-off-by: Markus Lippert <lippertmarkus@gmx.de>
 2021-12-21 07:13:39 +01:00
Kazuyoshi Kato
2ee3ce510c Use insecure.NewCredentials instead of grpc.WithInsecure 
grpc.WithInsecure is being deprecated.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-12-16 23:10:06 +00:00
Phil Estes
330961c2d5 Merge pull request #6358 from jonyhy96/feat-error 
refactor: functions for error log and error return
 2021-12-14 10:16:54 -05:00
Fu Wei
d47fa40d1b Merge pull request #6021 from dmcgowan/runc-shim-plugin 2021-12-14 10:19:23 +08:00
Derek McGowan
f83ab813d2 Use task plugin for runc shim 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-12-13 10:37:13 -08:00
haoyun
c0d07094be feat: Errorf usage 
Signed-off-by: haoyun <yun.hao@daocloud.io>
 2021-12-13 14:31:53 +08:00
Maksym Pavlenko
d2f1dda0f1 Include runtime v2 in default builtins 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-12-03 11:30:03 -08:00
Maksym Pavlenko
9e7910ebdc Merge pull request #6271 from fuweid/move_stdout_to_stderr 
ctr/snapshots/diff: show media-type in stderr
 2021-11-28 11:29:21 -08:00
Wei Fu
6681cc4b94 ctr/snapshots/diff: don't show the media-type in output 
By default, diff subcommand will print tar(.gz) on stdout. If we print
the media-type in stdout, the output will create invalid tar(.gz) data.

```
// before
➜  containerd git:(move_stdout_to_stderr) sudo ctr snapshot diff sha256:9f54eef412758095c8079ac465d494a2872e02e90bf1fb5f12a1641c0d1bb78b > /tmp/1.tar
➜  containerd git:(move_stdout_to_stderr) file /tmp/1.tar
/tmp/1.tar: data

// after change
➜  containerd git:(move_stdout_to_stderr) make bin/ctr
+ bin/ctr
➜  containerd git:(move_stdout_to_stderr) sudo bin/ctr snapshot diff sha256:9f54eef412758095c8079ac465d494a2872e02e90bf1fb5f12a1641c0d1bb78b > /tmp/2.tar

➜  containerd git:(move_stdout_to_stderr) file /tmp/2.tar
/tmp/2.tar: gzip compressed data, original size modulo 2^32 75155456
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-11-28 10:38:42 +08:00
Manabu Sugimoto
95b3ab2a4a ctr: Add Linux Capabilities control flags 
This allows Linux Capabilities to be modified via `ctr`.

e.g.
```
$ sudo ./bin/ctr run --cap-add "CAP_SYS_ADMIN" --cap-drop "CAP_NET_RAW" \
--rm docker.io/library/busybox:latest foo cat /proc/self/status | grep Cap
CapInh: 00000000a82405fb
CapPrm: 00000000a82405fb
CapEff: 00000000a82405fb
CapBnd: 00000000a82405fb
CapAmb: 0000000000000000
```

Signed-off-by: Manabu Sugimoto <Manabu.Sugimoto@sony.com>
 2021-11-25 14:50:43 +09:00