github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
14,496 Commits 3 Branches 2 Tags 112 MiB
30b929ece7
Commit Graph

14496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
6d95132313
go.mod: github.com/containerd/cgroups/v3 v3.0.1 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-03-07 22:06:38 +09:00
Akihiro Suda
da1ffdd757
go.mod: github.com/Microsoft/hcsshim v0.10.0-rc.7 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-03-07 21:48:06 +09:00
Akihiro Suda
c77ddf5381
Merge pull request #8131 from lucacome/bump-k8s.io-deps 
Bump k8s.io deps
 2023-03-07 21:44:13 +09:00
Akihiro Suda
56f629fd9c
Merge pull request #8217 from dmcgowan/update-imgcrypt 
Update imgcrypt to v1.1.7
 2023-03-07 21:40:10 +09:00
Fu Wei
5ae3a7f417
Merge pull request #8198 from kiashok/argsEscapedSupportInCri 
Add ArgsEscaped support for CRI
 2023-03-07 16:12:24 +08:00
Fu Wei
b6c72a02ba
Merge pull request #8204 from dcantah/sandbox-create-cleanup 
Sandbox: Delete shim+shutdown sandbox on create failure
 2023-03-07 16:07:35 +08:00
Fu Wei
d780583a3c
Merge pull request #8205 from knight42/feat/transfer-tag 
[Feature] Transfer tag image
 2023-03-07 16:04:18 +08:00
Derek McGowan
ffc41f1ed5
Merge pull request #8214 from davidhsingyuchen/fix-typo 
docs: fix typo of shim.RunManager's function comment
 2023-03-06 22:30:04 -08:00
Derek McGowan
60738e31d2
Update imgcrypt to v1.1.7 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-03-06 22:22:26 -08:00
Derek McGowan
8a4d409b90
Add release notes for v1.7.0-rc.2 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-03-06 22:14:17 -08:00
Hsing-Yu (David) Chen
d602c9aec7 docs: fix typo of shim.RunManager's function comment 
Signed-off-by: Hsing-Yu (David) Chen <davidhsingyuchen@gmail.com>
 2023-03-06 16:29:15 -08:00
Kevin Parsons
31c9a66385
Merge pull request #7099 from jsturtevant/cri-only-stats-windows 
[cri] Implement CRI Pod and Container stats for Windows
 2023-03-06 09:31:41 -08:00
Justin Chadwell
4065831652 archive: consistently respect value of WithSkipDockerManifest 
It was possible to still export the docker-compatible manifest.json
file, if a single platform image (as a standalone manifest) was
exported, even if the WithSkipDockerManifest option was explicitly set.

To resolve this, we remove all references to skipDockerManifest to,
adding it instead to the point-of-writing, simplifying the earlier logic
and making it clear exactly when this manifest file should be written.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-03-06 16:27:13 +00: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
Danny Canter
f7eb86ef3c Sandbox: Delete shim+shutdown sandbox on create failure 
Currently if create fails the shim will just be kind of stuck in limbo.
This calls shutdown to allow the shim to exit, and then invokes shim
delete.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-03-04 23:09:59 -08:00
Fu Wei
5da7e2c097
Merge pull request #8203 from dcantah/sandbox-errors 
Sandbox: Fix/enhance error messages for Create
 2023-03-04 23:07:20 +08:00
Danny Canter
6b4b6956e3 Sandbox: Fix/enhance error messages for Create 
CreateSandbox states "failed to start sandbox". This is quite confusing
when you're perusing logs and trying to pinpoint how far a shim got in
its execution.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-03-04 01:15:47 -08:00
Akihiro Suda
1e0e909dcc
Merge pull request #8202 from samuelkarp/issue-8200 
epoch: fix unit test when SOURCE_DATE_EPOCH is set
 2023-03-04 13:06:38 +09:00
Samuel Karp
8ce3e4e159
epoch: fix unit test when SOURCE_DATE_EPOCH is set 
Fixes https://github.com/containerd/containerd/issues/8200

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-03-03 15:12:22 -08:00
James Sturtevant
32ed559c86
Add Windows Sandbox Stats (sbserver) 
Signed-off-by: James Sturtevant <jstur@microsoft.com>
 2023-03-03 14:37:39 -08:00
James Sturtevant
08aa576a95
Add Windows Sandbox Stats 
Signed-off-by: James Sturtevant <jstur@microsoft.com>
 2023-03-03 14:37:38 -08:00
Derek McGowan
7a77da2c26
Merge pull request #7832 from fuweid/fix-7802 
pkg/cri: add timeout to drain exec io
 2023-03-03 13:54:53 -08:00
Kirtana Ashok
8137e41c48 Add ArgsEscaped support for CRI 
This commit adds supports for the ArgsEscaped
value for the image got from the dockerfile.
It is used to evaluate and process the image
entrypoint/cmd and container entrypoint/cmd
options got from the podspec.

Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
 2023-03-03 13:38:06 -08:00
Wei Fu
5946c1051e *: fix code style issue 
1. it's easy to check wrong input if using drain_exec_sync_io_timeout in error
2. avoid to use full error message, as part of error generated by go
   stdlib would be changed in the future
3. delete the extra empty line

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 17:51:03 +08:00
Wei Fu
98cb6d7eb8 cri/sbserver: ignore the NOT_FOUND error in exec cleanup 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 12:20:09 +08:00
Wei Fu
01671e9fc5 cri: add config ut for invalid drain io timeout value 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 12:00:19 +08:00
Wei Fu
55e25f1644 integration: add testcase to drain exec IO in time 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 11:59:07 +08:00
Wei Fu
ffebcb1223 cri: disable drain-exec-IO if it is empty timeout 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 11:59:07 +08:00
Wei Fu
791f137a5b *: update drainExecSyncIO docs and validate the timeout 
We should validate the drainExecSyncIO timeout at the beginning and
raise the error for any invalid input.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 11:58:52 +08:00
Derek McGowan
081d81858d
Merge pull request #8192 from dmcgowan/prepare-v1.7.0-rc.1 
Prepare release notes for v1.7.0-rc.1
 2023-03-02 13:03:36 -08:00
Derek McGowan
58d8c3a31d
Merge pull request #8191 from dmcgowan/transfer-export-image 
Transfer export image
 2023-03-02 13:03:18 -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
Derek McGowan
e2283edefb
[transfer] update export API types 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-03-02 09:04:29 -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
Jian Zeng
b9d7eae1ad
feat(api): add fields to ImageExportStream 
Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
 2023-03-02 09:01:53 -08:00
Phil Estes
477df4bd47
Merge pull request #8193 from fangn2/fix-config-dump 
Create config struct to take user input
 2023-03-02 11:37:49 -05:00
Wei Fu
3c18decea7 *: add DrainExecSyncIOTimeout config and disable as by default 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-03 00:21:55 +08:00
Wei Fu
a9cbddd65d *: fix typo and skip exec-io-drain-testcase in win 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-02 21:57:43 +08:00
Fu Wei
fd1db216db
Merge pull request #7864 from Iceber/ctr_tasks 
ctr/tasks: support remapped UID/GID
 2023-03-02 17:23:05 +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
2e96ba95e0 Create config struct to take user input 
Signed-off-by: Tony Fang <nhfang@amazon.com>
 2023-03-02 05:44:25 +00:00
Luca Comellini
f25ec98d0d
Fix linting error sets.String is deprecated 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2023-03-01 21:37:30 -08:00
Luca Comellini
8145b15f08
Bump k8s.io deps 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2023-03-01 21:37:21 -08:00
Wei Fu
04dfd6275e pkg/cri/sbserver: add timeout to drain exec io 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-02 13:06:45 +08:00
Wei Fu
82c0f4ff86 pkg/cri/server: add timeout to drain exec io 
By default, the child processes spawned by exec process will inherit standard
io file descriptors. The shim server creates a pipe as data channel. Both exec
process and its children write data into the write end of the pipe. And the
shim server will read data from the pipe. If the write end is still open, the
shim server will continue to wait for data from pipe.

So, if the exec command is like `bash -c "sleep 365d &"`, the exec process is
bash and quit after create `sleep 365d`. But the `sleep 365d` will hold the
write end of the pipe for a year! It doesn't make senses that CRI plugin
should wait for it.

For this case, we should use timeout to drain exec process's io instead of
waiting for it.

Fixes: #7802

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-02 13:06:45 +08:00
Akihiro Suda
f50dce84f8
Merge pull request #8119 from dmcgowan/add-experimental-features-release 
Add experimental section to RELEASES.md
 2023-03-02 13:45:37 +09:00
Derek McGowan
43d36a2549
Add experimental section to RELEASES.md 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-03-01 17:56:57 -08:00
Akihiro Suda
4ced1fa69e
Merge pull request #8188 from dmcgowan/fix-streaming-gc-deadlock 
Fix streaming manager deadlock on collection
 2023-03-02 10:25:05 +09:00
Derek McGowan
7e93432be0
Merge pull request #8190 from bennett-white/update-cri-guide-link 
Update CRI guide link
 2023-03-01 17:18:15 -08:00
Derek McGowan
cd84f752c7
Prepare release notes for v1.7.0-rc.1 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-03-01 16:59:32 -08:00