github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,652 Commits 3 Branches 2 Tags 112 MiB
ac72483e87
Commit Graph

11652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fish-pro
ac72483e87 Fix syntax errors in the document 
Signed-off-by: Fish-pro <zechun.chen@daocloud.io>
 2023-01-18 09:59:41 +08:00
Derek McGowan
412ca496dc
Merge pull request #7963 from henry118/gc-bug 
use local variable for rt when iterating collectors
 2023-01-13 15:19:27 -08:00
Henry Wang
b9bd10c14e use local variable for rt when iterating collectors 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2023-01-13 21:50:04 +00:00
Akihiro Suda
60443133da
Merge pull request #7960 from mxpv/darwin 
Add basic spec and mounts for Darwin
 2023-01-13 17:27:50 +09:00
Phil Estes
76585e12f5
Merge pull request #7810 from kiashok/updateShimTag 
go.mod: Bump hcsshim to v0.10.0-rc.4
 2023-01-12 21:46:50 -05:00
Maksym Pavlenko
1ade777c24 Add basic spec and mounts for Darwin 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-12 17:00:40 -08:00
Derek McGowan
a43d719ce2
Merge pull request #7958 from mxpv/oci 
Use specs Platform instead of generated API
 2023-01-12 14:31:42 -08:00
Kirtana Ashok
66eeee0439 Update hcsshim tag to v0.10.0-rc.4 
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
 2023-01-12 11:29:01 -08:00
Maksym Pavlenko
3c8469a782 Use Platform instead of generated API 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-12 10:30:42 -08:00
Derek McGowan
d0893daf09
Merge pull request #7928 from mxpv/opts 
Make OCI options cross-platform
 2023-01-12 10:11:12 -08:00
Fu Wei
bbcfbf2189
Merge pull request #7948 from yanggangtony/go-version 
update to go1.19.5, go1.18.10
 2023-01-12 09:58:06 +08:00
Samuel Karp
7d14e6cf25
Merge pull request #7957 from AdamKorcz/fuzzjan23 2023-01-11 17:12:06 -08:00
AdamKorcz
802c6c5c0d fuzzing: improve archive fuzzer 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2023-01-11 23:32:45 +00:00
Kazuyoshi Kato
f82ae8a922
Merge pull request #7943 from samuelkarp/shim-delete-warning 
shim: enable debug logging for delete
 2023-01-11 13:48:23 -08:00
Maksym Pavlenko
40be96efa9 Have separate spec builder for each platform 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:12:25 -08:00
Maksym Pavlenko
fdfa3519a3 Remove unused params from platformSpec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Maksym Pavlenko
1c1d8fb057 Update OCI spec tests for generic platform 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Maksym Pavlenko
f43d8924e4 Move most of OCI spec options to common builder 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Maksym Pavlenko
21338d2777 Add stub to build common OCI spec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Maksym Pavlenko
f318e5630b Update sandbox API to return target platform 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Maksym Pavlenko
dd22a3a806 Move WithMounts to specs 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:59 -08:00
Maksym Pavlenko
0ae0399b16 Make OCI spec opts available on all platforms 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-01-11 13:03:58 -08:00
Akihiro Suda
61617211bf
Merge pull request #7946 from mqasimsarfraz/fix-swap-tests 
cri: Fix TestUpdateOCILinuxResource for host w/o swap controller
 2023-01-11 18:10:09 +09:00
Samuel Karp
5f1a42543c
shim: move reap log line to debug 
Fixes https://github.com/containerd/containerd/issues/7941

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-01-10 16:39:39 -08:00
Samuel Karp
515d68099b
shim: enable debug logging for delete 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-01-10 16:39:38 -08:00
yanggang
c8f4ab3b0d
update to go1.19.5, go1.18.10 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2023-01-11 06:41:43 +08:00
Qasim Sarfraz
9c8c4508ec cri: Fix TestUpdateOCILinuxResource for host w/o swap controller 
Tested on Ubuntu 20.04 w/o swap controller:
```
$ stat -fc %T /sys/fs/cgroup/
tmpfs
$ la -la /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes
ls: cannot access '/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes': No such file or directory
$  go test -v ./pkg/cri/sbserver/ -run TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_update_each_resource
=== RUN   TestUpdateOCILinuxResource/should_skip_empty_fields
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields
--- PASS: TestUpdateOCILinuxResource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_update_each_resource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_skip_empty_fields (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields (0.00s)
PASS
ok      github.com/containerd/containerd/pkg/cri/sbserver       (cached)
$ go test -v ./pkg/cri/server/ -run TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_update_each_resource
=== RUN   TestUpdateOCILinuxResource/should_skip_empty_fields
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map
--- PASS: TestUpdateOCILinuxResource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_update_each_resource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_skip_empty_fields (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map (0.00s)
PASS
ok      github.com/containerd/containerd/pkg/cri/server (cached)
```

Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
 2023-01-10 15:41:04 +01:00
Phil Estes
54ec1919f3
Merge pull request #7929 from Iceber/ctr_run 
ctr/run: flags --detach and --rm cannot be specified together
 2023-01-09 14:37:51 -05:00
Fu Wei
da163ef3b8
Merge pull request #7935 from fangn2/fix-TestContainerConsumedStats 
Fix Flaky Windows CRI Integration test on TestContainerConsumedStats
 2023-01-09 21:18:59 +08:00
Fu Wei
fd1a4a2e71
Merge pull request #7917 from iyear/refactor-tx 
Refactor snapshotters metastore transaction
 2023-01-09 21:14:32 +08:00
Tony Fang
82d6c2f931 Revert container_stats_test.go change which caused Windows CRI integration test failure 
PR #7892 which supposed to fix issue on Linux introduced random failure
on Windows, this commit is to revert that change for Windows platform

Signed-off-by: Tony Fang <nenghui.fang@gmail.com>
 2023-01-09 05:22:25 +00:00
Akihiro Suda
5e7baa2eb3
Merge pull request #7932 from samuelkarp/upgrade-go-toml 
mod: update github.com/pelletier/go-toml@v1.9.5
 2023-01-07 13:44:44 +09: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
Samuel Karp
6f9936e305
mod: update github.com/pelletier/go-toml@v1.9.5 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-01-06 13:11:07 -08:00
Maksym Pavlenko
9bfe1d911c
Merge pull request #7927 from AkihiroSuda/improve-TestSourceDateEpoch 
archive: improve TestSourceDateEpoch
 2023-01-06 12:01:36 -08:00
Akihiro Suda
f0917fb6e0
archive: improve TestSourceDateEpoch 
The previous test wasn't highly meaningful because 5 * (100 * Millisecond)
is smaller than a second.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-01-06 11:22:14 +09:00
Derek McGowan
5ef8bd4f87
Merge pull request #7883 from fangn2/add-tracing-plugin-tests 
Add tracing plugin test
 2023-01-05 13:33:10 -08:00
Derek McGowan
70eada1fa3
Merge pull request #7925 from Iceber/content-flow 
docs/content-flow: update the description of the content labels
 2023-01-05 12:58:03 -08:00
iyear
9df5a1714d snapshots: refactor metastore transaction 
Signed-off-by: Junyu Liu <ljyngup@gmail.com>
 2023-01-05 15:53:23 +08:00
Iceber Gu
f9a702105d docs/content-flow: update the description of the content labels 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-01-05 14:03:31 +08:00
Iceber Gu
fc905324a6 docs/content-flow: update the digests of the redis:5.0.9 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-01-05 14:03:20 +08:00
Fu Wei
5fc727224e
Merge pull request #7861 from dmcgowan/cleanup-context 
Add cleanup package for context management during cleanup
 2023-01-05 13:18:31 +08:00
Tony Fang
0de12cf7e5 Add tracing plugin test 
Add tracing related plugins to the registration test

Signed-off-by: Tony Fang <nenghui.fang@gmail.com>
 2023-01-05 00:25:10 +00:00
Phil Estes
72e5ddb516
Merge pull request #7886 from dmcgowan/fix-transfer-register-ordering 
Fix race between stream registration and use
 2023-01-04 14:49:28 -05:00
Derek McGowan
b550526ccd
Use cleanup.Background instead of context.Background for cleanup 
Use the cleanup context to re-use values from the original context

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-01-04 11:22:24 -08:00
Derek McGowan
ef9c2a689a
Merge pull request #7903 from dmcgowan/prepare-1.7.0-beta.2 
Prepare release notes for v1.7.0-beta.2
 2023-01-04 10:46:21 -08:00
Fu Wei
28e8e247b9
Merge pull request #7892 from AkihiroSuda/cri-integration-cgroup2 
Cirrus CI (Fedora 37, Rocky 8): enable cri-integration
 2023-01-04 20:21:14 +08:00
Derek McGowan
38159694fc
Prepare release notes for v1.7.0-beta.2 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-01-03 22:45:07 -08:00
Maksym Pavlenko
b7b0ee060c
Merge pull request #7891 from AkihiroSuda/integration-in-docker 
contrib/Dockerfile.test: add "integration", "cri-integration", "critest" stages
 2023-01-03 20:27:43 -08:00
Maksym Pavlenko
0d6e61a609
Merge pull request #7914 from changweige/fix-tracing-doc-typo 
docs: fix a typo in tracing documentation
 2023-01-03 20:26:51 -08:00