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

12543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kazuyoshi Kato
81bc6ce6e9
Merge pull request #8740 from djdongjin/platform-parseall 
Add a platform.ParseAll helper
 2023-06-28 08:01:12 -07:00
Kazuyoshi Kato
5d4504c196
Merge pull request #8758 from djdongjin/ginkgo 
Update ginkgo to match cri-tools' version
 2023-06-28 07:58:34 -07:00
Kazuyoshi Kato
a3c9ed7092
Merge pull request #8752 from neersighted/name_to_handle_at 
seccomp: always allow name_to_handle_at
 2023-06-28 07:58:07 -07:00
Jin Dong
4df27fd774 Update ginkgo to match cri-tools' version 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-28 13:14:22 +00:00
Bjorn Neergaard
9a202e342b
seccomp: always allow name_to_handle_at 
This syscall is used by systemd to request unique internal names for
paths in the cgroup hierarchy from the kernel, and is overall innocuous.

Due to [previous][1] [mistakes][2] in moby/moby, it ended up attached to
`CAP_SYS_ADMIN`; however, it should not be filtered at all.

An in-depth analysis is available [at moby/moby][3].

  [1]: a01c4dc8f8 (diff-6c0d906dbef148d2060ed71a7461907e5601fea78866e4183835c60e5d2ff01aR1627-R1639)
  [2]: c1ca124682
  [3]: https://github.com/moby/moby/pull/45766#pullrequestreview-1493908145

Co-authored-by: Vitor Anjos <bartier@users.noreply.github.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-06-28 05:50:24 -06:00
Danny Canter
55a8102ec1 mount: Add From/ToProto helpers 
Helpers to convert from containerd's [Mount] to its protobuf structure for
[Mount] and vice-versa appear three times. It seems sane to just expose
this facility in /mount.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-28 04:03:18 -07:00
Danny Canter
e85352183e integration/client: Rework withBytesBuffers 
All of the tests using this didn't need stdin/err (one of them not even
stdout), so we can just leave them "empty" and change to a withStdout
naming to make it more obvious.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-27 23:47:14 -07:00
Cardy.Tang
50376ec9ff remotes: allow FetchByDigest client to pass mediatype as header 
accept mediatype header is required for some layers, add additional field for client.

Signed-off-by: Cardy.Tang <zuniorone@gmail.com>
 2023-06-27 16:36:01 +08:00
Jin Dong
0a92661e69 Add a platform.ParseAll helper 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-26 20:34:37 +00:00
Kazuyoshi Kato
9b4ed8acc2
Merge pull request #8696 from fuweid/deflaky-blockfile 
chore: deflake the blockfile testsuite
 2023-06-26 09:54:33 -07:00
Fu Wei
b6abda73b8
Merge pull request #8728 from dcantah/rm-hcsshim-todo 
Makefile: Remove hcsshim related TODO
 2023-06-25 15:18:36 +08:00
Fu Wei
43ae9c26b8
Merge pull request #8729 from dcantah/integration-empty-windows 
Integration: Align empty IO func on Windows
 2023-06-25 15:17:23 +08:00
Fu Wei
e350c8ca94
Merge pull request #8711 from djdongjin/sb-metadata 
Minor changes to sandbox metadata
 2023-06-25 15:16:43 +08:00
Fu Wei
ef61125871
Merge pull request #8719 from alexcb/log-expired-leases 
log when a lease expires
 2023-06-25 14:09:04 +08:00
Phil Estes
1a5eaa9ad0
Merge pull request #8732 from thaJeztah/epoch_export_parse 
pkg/epoch: extract parsing SOURCE_DATE_EPOCH to a function
 2023-06-23 17:06:21 -04:00
Phil Estes
753e6d2f8e
Merge pull request #8731 from dcantah/rm-windows-file-todo 
Reword Windows file related TODO
 2023-06-23 16:59:27 -04:00
Sebastiaan van Stijn
8760b87174
pkg/epoch: extract parsing SOURCE_DATE_EPOCH to a function 
This introduces a ParseSourceDateEpoch function, which can be used
to parse "SOURCE_DATE_EPOCH" values for situations where those
values are not passed through an env-var (or the env-var has been
read through other means).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-23 17:32:02 +02:00
Sebastiaan van Stijn
9924e56f42
pkg/epoch: fix tests on macOS 
These tests were failing on my macOS; could be the precision issue (like on
Windows), or just because they're "too fast".

    === RUN   TestSourceDateEpoch/WithoutSourceDateEpoch
        epoch_test.go:51:
                Error Trace:	/Users/thajeztah/go/src/github.com/containerd/containerd/pkg/epoch/epoch_test.go:51
                Error:      	Should be true
                Test:       	TestSourceDateEpoch/WithoutSourceDateEpoch
                Messages:   	now: 2023-06-23 11:47:09.93118 +0000 UTC, v: 2023-06-23 11:47:09.93118 +0000 UTC

This patch:

- updates the rightAfter utility to allow the timestamps to be "equal"
- updates the asserts to provide some details about the timestamps
- uses UTC for the value we're comparing to, to match the timestamps
  that are generated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-23 17:29:55 +02:00
Danny Canter
dfd7ad8b37 Reword Windows file related TODO 
https://github.com/golang/go/issues/32088 was never accepted or implemented
in 1.14.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-23 05:42:44 -07:00
Sebastiaan van Stijn
44e2b26a87
pkg/epoch: replace some fmt.Sprintfs with strconv 
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-23 13:10:58 +02:00
Danny Canter
f82d9b7991 Integration: Align empty IO func on Windows 
I think NullIO is fine on Windows now. We have it as an option in ctr
and it's used for the pod sandbox container in CRI. Lets see if CI agrees..

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-22 20:05:34 -07:00
Phil Estes
13498a3258
Merge pull request #8726 from djdongjin/write-content 
Remove duplicated `writeIndex` func
 2023-06-22 21:33:22 -04:00
Danny Canter
f3124d5693 Makefile: Remove hcsshim related TODO 
There was a todo for the windows variant of dependency installation that
hinted at making an install-hcsshim.sh script, however Windows today doesn't
rely on a standalone OCI runtime binary that gets invoked by the shim. Rather,
container creation/management is all handled by the shim itself in-proc. Due to
this, `make` or `make binaries` basically fulfills that purpose as it
clones hcsshim and builds the shim along with containerd.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-06-22 17:53:09 -07:00
Jin Dong
2aeac9a8f6 Remove duplicated writeIndex func 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-22 22:48:24 +00:00
Phil Estes
2353574aa9
Merge pull request #8708 from marquiz/devel/cri-cleanup 
cri: drop unused arg from generateRuntimeOptions
 2023-06-22 15:12:48 -04:00
Phil Estes
733070b96a
Merge pull request #8717 from djdongjin/dedup-manifest-platform 
Dedup config platform helper
 2023-06-22 15:12:22 -04:00
Jin Dong
7601dd9a9e Dedup manifest config platform helper 
It also removes a duplicated digest validate call

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-22 01:36:58 +00:00
Alex Couture-Beil
f3df7f7391
log when a lease expires 
This makes it easier to debug GC-related issues, where a reference is
unexpectedly released.

Signed-off-by: Alex Couture-Beil <alex@mofo.ca>
 2023-06-21 16:00:02 -07:00
Jin Dong
a01118bbed Minor changes to sandbox metadata 
1. Reduce one bucket.Bucket call.
2. Use update helper instead of db.Update as in other functions.

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-20 20:41:17 +00:00
Kazuyoshi Kato
ad9d1a82f1
Merge pull request #8701 from djdongjin/gc 
Remove unnecessary label bucket loop
 2023-06-20 11:20:20 -07:00
Markus Lehtonen
f60a4a2718 cri: drop unused arg from generateRuntimeOptions 
Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
 2023-06-19 16:11:36 +03:00
Jin Dong
1fb835f042 Remove unnecessary label bucket loop 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-17 19:26:29 +00:00
Wei Fu
a207b430e3 snapshots/blockfile: fix lint issue 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-06-17 08:42:02 +08:00
Wei Fu
59b0b39af0 vendor: update github.com/containerd/continuity 
Pin it with 1e0d26eb2381594984ee80989c9c229dbd930d9f

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-06-17 08:36:45 +08:00
Phil Estes
96de54db43
Merge pull request #8667 from djdongjin/premarshal-empty-resp 
Save marshalled empty response in streaming service
 2023-06-16 17:05:24 -04:00
Phil Estes
b8bd27a14e
Merge pull request #8697 from upodroid/fix-unbound-variable 
Fix unbound variable used by Prow
 2023-06-16 10:46:18 -04:00
upodroid
d358f1680f fix unbound variable 
Signed-off-by: upodroid <cy@borg.dev>
 2023-06-15 21:18:20 +01:00
Wei Fu
7de95cbc4c snapshots/blockfile: deflaky the testsuite 
* Use direct-io mode to reduce IO.

* Add testViewHook helper to recovery the backing file since the ext4
  might need writable permission to handle recovery. If the backing file
  needs recovery and it's for View snapshot, the readonly mount will
  cause error.

* Use 8 MiB as capacity to reduce the IO.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-06-15 23:54:06 +08:00
Wei Fu
6dfb16f99a snapshots|pkg: umount without DETACH and nosync after umount 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-06-15 23:53:47 +08:00
Wei Fu
72b7d16505 mount: support direct-io for loopback device 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-06-15 23:51:46 +08:00
Kazuyoshi Kato
ded713010c
Merge pull request #8617 from corhere/reduce-exec-lock-contention 
runtime/v2/runc: handle early exits w/o big locks
 2023-06-14 15:55:07 -07:00
Derek McGowan
0ae64ebd4e
Merge pull request #8680 from dcantah/sb-metrics 
Sandbox: Add SandboxMetrics rpc
 2023-06-14 18:11:18 +00:00
Derek McGowan
70f30b2e09
Merge pull request #8692 from mxpv/merge-queues 
Don't run CI on push
 2023-06-14 18:11:04 +00:00
Maksym Pavlenko
437f134107 Don't run CI on push 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-06-14 11:04:07 -07:00
Jin Dong
e26c97cb8b Save marshalled empty response in streaming service 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-14 18:02:58 +00:00
Maksym Pavlenko
3065aa2aae
Merge pull request #8684 from djdongjin/nsmap-rwmutex 
Use RWMutex in NSMap and reduce lock area
 2023-06-14 17:52:39 +00:00
Jin Dong
9e09bfb590 Use RWMutex in NSMap and reduce lock area 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2023-06-14 17:50:54 +00:00
Derek McGowan
78b4af74a4
Merge pull request #8685 from estesp/no-nondistributable-layers 
No more nondistributable layers in MS registry
 2023-06-14 17:46:21 +00:00
Phil Estes
38b0f970f0
No more nondistributable layers in MS registry 
Microsoft announced the removal of nondistributable layers from their
images today. This makes the convert test fail since it assumes the
first layer is nondistributable on Windows during the test.

Signed-off-by: Phil Estes <estesp@amazon.com>
 2023-06-13 16:34:44 -04:00
Kazuyoshi Kato
0f6a70d970
Merge pull request #8676 from dmcgowan/overlay-options 
[overlay] add configurable mount options to overlay snapshotter
 2023-06-13 09:55:24 -07:00