Commit Graph

12497 Commits

Author SHA1 Message Date
Danny Canter
7274e33e38 CRI: Make stats respect sandbox's platform
To further some ongoing work in containerd to make as much code as possible
able to be used on any platform (to handle runtimes that can virtualize/emulate
a variety of different OSes), this change makes stats able to be handled on
any of the supported stat types (just linux and windows). To accomplish this,
we use the platform the sandbox returns from its `Platform` rpc to decide
what format the containers in a given sandbox are returning metrics in, then
we can typecast/marshal accordingly.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-05-23 01:32:36 -07:00
Fu Wei
773874caea Merge pull request #8547 from zhaojizhuang/bolt
[sandbox] Optimize metadata Schema notes to correctly match metadata structures
2023-05-23 15:32:47 +08:00
Derek McGowan
65c7c92792 Merge pull request #8534 from gabriel-samfira/fix-image-workflow
Fix image workflow
2023-05-22 19:20:36 -07:00
Derek McGowan
44df496d75 Merge pull request #8542 from cardyok/feat_overlay_sync_remove
feat: make overlay sync removal configurable
2023-05-22 17:29:45 -07:00
Derek McGowan
ca5d6b6bad Merge pull request #8531 from cardyok/bugfix_mount_path_symlink
bugfix: resolve symlink when looking up mountpoint
2023-05-22 17:06:16 -07:00
zhaojizhuang
82deabf9db Optimize metadata Schema notes to correctly match metadata structures
1. Add sandboxes object
2. Optimize indentation of parent and child objects

Signed-off-by: zhaojizhuang <571130360@qq.com>
2023-05-22 16:18:58 +08:00
Cardy.Tang
a6cd5e3f4f bugfix: resolve symlink when looking up mountpoint
Signed-off-by: Cardy.Tang <zuniorone@gmail.com>
2023-05-22 11:03:51 +08:00
Cardy.Tang
b9f2e48e37 feat: make overlay sync removal configurable
Signed-off-by: Cardy.Tang <zuniorone@gmail.com>
2023-05-19 16:32:10 +08:00
Gabriel Adrian Samfira
becf04a59a Update to docker/login-action V2
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2023-05-19 00:13:08 +03:00
Gabriel Adrian Samfira
79709a2058 disable provenance
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2023-05-19 00:01:05 +03: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
1be571b14f Add sync before unmount on snapshotter layer test
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-05-17 14:25:27 -07:00
Derek McGowan
b729962e3e Add blockfile snapshotter to snapshotters doc
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-05-17 14:25:27 -07: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
Derek McGowan
0c386e2ebd Add blockfile snapshotter
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-05-17 14:25:27 -07:00
Phil Estes
1498a6dde9 Merge pull request #8526 from fuweid/fuweid/chore-update-comment
chore: update comment for NetworkPluginSetupSerially
2023-05-17 13:11:14 -04:00
Derek McGowan
44eb8f3466 Merge pull request #8524 from gabriel-samfira/update-volume-copy-up
Update volume-copy-up
2023-05-17 09:28:40 -07:00
Fu Wei
8b6889b8e2 Merge pull request #8522 from AkihiroSuda/continuity-v0.4.0 2023-05-17 23:07:10 +08:00
Wei Fu
d280cb83b6 chore: update comment for NetworkPluginSetupSerially
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-05-17 22:39:10 +08:00
Gabriel Adrian Samfira
f8907ab872 Update volume-copy-up
Add new test cases for volumes on both Linux and Windows. These new
volumes will be used to test that we don't accidentally mangle volume
paths on Linux and that non-C volume mounts work properly when defined
in an image on Windows.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2023-05-17 14:20:37 +03:00
Akihiro Suda
f35a105cf0 Merge pull request #8521 from AkihiroSuda/go-runc-v1.1.0
go.mod: github.com/containerd/go-runc v1.1.0
2023-05-17 20:02:36 +09:00
Akihiro Suda
811456b314 go.mod: github.com/containerd/continuity v0.4.0
https://github.com/containerd/continuity/compare/72c70feb3081...v0.4.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-05-17 19:50:20 +09:00
Akihiro Suda
6f715ab101 go.mod: github.com/containerd/go-runc v1.1.0
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-05-17 13:45:37 +09:00
Fu Wei
8c21759d7c Merge pull request #8401 from Iceber/fix_checkpoint_config_content 2023-05-17 10:04:49 +08:00
Phil Estes
7a5a4ecfed Merge pull request #8518 from dims/bump-seccomp-version-to-be-the-same-as-one-in-runc-repo
Bump seccomp version to be the same as one in runc repo
2023-05-16 09:04:31 -07:00
Samuel Karp
c60ba138b6 Merge pull request #8502 from mstmdev/fix-typos 2023-05-16 08:41:02 -07:00
Davanum Srinivas
85cf9a09e8 Bump seccomp version to be the same as one in runc repo
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2023-05-16 09:33:26 -04:00
mstmdev
cdaa4025e9 Fix some typos
Signed-off-by: Pan Yibo <mstmdev@gmail.com>
2023-05-16 10:12:50 +08:00
Akihiro Suda
8eea15f891 Merge pull request #8464 from dcantah/user-nonlinux
CRI: Support Linux username for !linux platforms
2023-05-14 22:28:51 +09: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
Fu Wei
e52fbfd5c1 Merge pull request #8507 from AkihiroSuda/test-rename-fuse-overlayfs
snapshots/testsuite: Rename: fix fuse-overlayfs incompatibility
2023-05-12 07:33:19 +08:00
Danny Canter
66307d0b4e CRI: Support Linux usernames for !linux platforms
The oci.WithUser option was being applied in container_create_linux.go
instead of the cross plat buildLinuxSpec method. There's been recent
work to try and make every spec option that can be applied on any platform
able to do so, and this falls under that. However, WithUser on linux platforms
relies on the containers SnapshotKey being filled out, which means the spec
option needs to be applied during container creation.

To make this a little more generic, I've created a new platformSpecOpts
method that handles any spec opts that rely on runtime state (rootfs mounted
for example) for some platforms, or just platform options that we still don't
have workarounds for to be able to specify them for other platforms
(apparmor, seccomp etc.) by internally calling the already existing
containerSpecOpts method.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-05-11 12:32:24 -07: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
Akihiro Suda
5dbae38191 snapshots/testsuite: Rename: fix fuse-overlayfs incompatibility
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-05-11 16:59:53 +09:00
Phil Estes
f84b2b47b0 Merge pull request #8488 from helen-frank/feature/cacheDiffIDs
cache image diffIDs
2023-05-10 15:23:09 -07:00
Derek McGowan
14d22efccc Merge pull request #8254 from gabriel-samfira/fix-access-denied-on-vhdx-mount
Fix access denied on mounted vhdx root
2023-05-10 08:39:36 -07:00
Fu Wei
dc60137467 Merge pull request #8252 from bart0sh/PR008-CDI-use-CRI-field
CDI: Use CRI Config.CDIDevices field for CDI injection
2023-05-10 21:16:49 +08:00
Akihiro Suda
18eb99029b Merge pull request #8498 from AkihiroSuda/image-spec-v1.1.0-rc.3
go.mod: github.com/opencontainers/image-spec v1.1.0-rc3
2023-05-10 20:44:00 +09:00
Derek McGowan
49029b75ba Merge pull request #7316 from thaJeztah/plugin_less_restrictive
plugin: remove go < 1.8 stub, enable on windows and arm64
2023-05-09 22:29:44 -07:00
Fu Wei
bd185813ac Merge pull request #8504 from dcantah/close-f-early
Simplify closing bundle dir fd
2023-05-10 10:09:01 +08:00
Derek McGowan
b0f587d65d Merge pull request #8487 from samuelkarp/setup-go-v4-disable-cache
.github: disable cache for actions/setup-go@v4
2023-05-09 17:30:30 -07:00
Danny Canter
df65e321ee Simplify closing bundle dir fd
Follow-up to #8489. We don't need to call Close in the err and success
cases, we can just do it after Readdirnames returns.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-05-09 17:22:04 -07:00
Derek McGowan
a28606ec1b Merge pull request #8503 from fahedouch/improve-Task-comment
improve container Task comment
2023-05-09 16:49:55 -07:00
Phil Estes
25ae976de3 Merge pull request #8497 from dmcgowan/update-ttrpc-1.2.2 2023-05-09 16:44:57 -07:00
Derek McGowan
718250b6ba Update ttrpc to v1.2.2
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-05-09 13:08:46 -07:00
Phil Estes
c6d7e45c14 Merge pull request #8496 from ktock/golangci-lint-1.52.2
Bump up golangci-lint to v1.52.2
2023-05-09 13:03:06 -07:00
fahed dorgaa
7e42dc34d4 improve container Task comment
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
2023-05-09 20:15:53 +02:00
Phil Estes
43bbffba37 Merge pull request #8500 from AkihiroSuda/runtime-spec-v1.1.0-rc.2
go.mod: github.com/opencontainers/runtime-spec v1.1.0-rc.2
2023-05-09 10:42:53 -07:00
Akihiro Suda
4347fc8bc2 go.mod: github.com/opencontainers/image-spec v1.1.0-rc3
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-05-09 23:35:58 +09:00
Akihiro Suda
5e054ee631 go.mod: github.com/opencontainers/runtime-spec v1.1.0-rc.2
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-05-09 22:26:37 +09:00