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

12824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fu Wei
bce8fe60df
Merge pull request #9183 from dcantah/cri-snapshotter-platform 2023-10-04 11:40:33 +08:00
Derek McGowan
5b097a0817
Merge pull request #9187 from vvoland/remotes-docker-mounted-fix 
remotes/docker: Fix MountedFrom prefixed with target repository
 2023-10-03 09:33:35 -07:00
Derek McGowan
59134b5b3a
Merge pull request #8924 from polarathene/fix/use-implicit-nofile-limit 
fix: Remove `LimitNOFILE` from `containerd.service`
 2023-10-03 09:08:32 -07:00
Phil Estes
cffe399e89
Merge pull request #9184 from Kern--/xnet013 
Bump x/net to 0.13
 2023-10-03 10:41:57 -04:00
Phil Estes
3a154647d3
Merge pull request #9186 from ktock/golangci-lint-v1.54.2 
Bump up golangci-lint to v1.54.2
 2023-10-03 10:41:41 -04:00
Phil Estes
399c9d8326
Merge pull request #8861 from jedevc/docker-resolver-relevant-error 
docker: return most relevant error from docker resolution
 2023-10-03 10:40:52 -04:00
Paweł Gronowski
859c2651e5
remotes/docker: Fix MountedFrom prefixed with target repository 
`MountedFrom` was prefixed with the whole target repository instead of
just the registry hostname.

Also adjust the test cases to use the registry hostname.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2023-10-03 16:40:10 +02:00
Derek McGowan
e8770b1716
Merge pull request #9155 from neersighted/image_cleanup_2 
Use mediatype helpers in more places
 2023-10-03 07:11:12 -07:00
Kohei Tokunaga
c85b1d1e4e
Bump up golangci-lint to v1.54.2 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-10-03 21:57:07 +09:00
Kohei Tokunaga
6169433b6b
Fix linter issues for golangci-lint 1.54.2 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-10-03 21:56:47 +09:00
Danny Canter
e3cb7471a6 CRI: Snapshotter per runtime handler adjustments 
Pass the passed in context into some nested function calls, wrap
errors instead of %+v, and change some tests to strictly just test
for an error and not an exact error.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2023-10-03 02:05:34 -07:00
Fu Wei
28fa2751f2
Merge pull request #9182 from dmcgowan/localhost-http-fallback 
remotes: always try to establish tls connection when tls configured
 2023-10-03 16:11:48 +08:00
Kern Walster
42dc8faba8 Bump x/net to 0.13 
This silences govulncheck detecting
https://pkg.go.dev/vuln/GO-2023-1988.

containerd does not directly use x/net

Signed-off-by: Kern Walster <walster@amazon.com>
 2023-10-03 04:41:35 +00:00
Derek McGowan
79772a0dd4
remotes: always try to establish tls connection when tls configured 
When a endpoint is configured for http and has a tls configuration,
always try to the tls connection and fallback to http when the tls
connections fails from receiving an http response. This fixes an issue
with default localhost endpoints which get defaulted to http with
insecure tls also configured but are using tls.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-02 15:29:11 -07:00
Phil Estes
e1655fe915
Merge pull request #9179 from henry118/test-assertion 
Fix some assertions for integ tests
 2023-10-02 14:51:12 -04:00
Henry Wang
0d76fe5c1d Fix some assertions for integ tests 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2023-10-02 17:14:27 +00:00
Derek McGowan
3a3d5dee15
Merge pull request #9178 from fuweid/fixci 
ci-fix: pin the mingw version 12.2.0.3042023
 2023-10-02 10:02:37 -07:00
Wei Fu
1dced31c36 ci-fix: pin the mingw version 12.2.0.3042023 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-10-02 22:10:52 +08:00
Fu Wei
02c9520d38
Merge pull request #9173 from charles-chenzz/main 
update gitignore
 2023-10-02 19:35:39 +08:00
charles-chenzz
aae71aa8e8 update gitignore to indicate that where contributors can use global gitignore 
Signed-off-by: zefeng chen <Rekles666@gmail.com>
 2023-10-02 19:00:04 +08:00
Fu Wei
1f0caa11c7
Merge pull request #9158 from AkihiroSuda/reword-cri-disable_cgroup 2023-09-30 01:22:56 +08:00
Derek McGowan
350a648581
Merge pull request #9164 from AkihiroSuda/fix-9163 
cri: call RegisterReadiness after NewCRIService
 2023-09-29 09:50:39 -07:00
Akihiro Suda
8ffb03d689
cri: stop recommending disable_cgroup 
Disabling cgroup is no longer needed since cgroup v2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-09-29 23:08:00 +09:00
Akihiro Suda
5365f4b29e
cri: call RegisterReadiness after NewCRIService 
`NewCRIService()` may easily fail and its error has to be ignored
unless the CRI plugin is in the `required_plugins` list.

Now this has to be called before `RegisterReadiness()`, as
PR 9153 "Require plugins to succeed after registering readiness"
was merged on 2023-09-29.

Fix issue 9163: `[Regression in main (2023-09-29)]: containerd-rootless.sh doesn't start up`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-09-29 23:06:36 +09:00
Phil Estes
c5ce2a5f75
Merge pull request #9153 from dmcgowan/require-readiness-plugins 
Require plugins to succeed after registering readiness
 2023-09-28 11:23:45 -04:00
Maksym Pavlenko
e62cacc4d6
Merge pull request #9147 from bryantbiggs/docs/transfer-service 
docs: Update `transfer` service docs to reflect completed implementations for `1.7`
 2023-09-27 12:30:44 -07:00
Bjorn Neergaard
5518a50260
remotes: simplify mediatype logic 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:56 -06:00
Bjorn Neergaard
8b105984b5
pkg/transfer/local: simplify mediatype logic 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:55 -06:00
Bjorn Neergaard
79acce4621
integration: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:54 -06:00
Bjorn Neergaard
0ba5b4b62c
oci: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:52 -06:00
Bjorn Neergaard
cdba61603c
remotes: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:51 -06:00
Bjorn Neergaard
69034f7558
pkg/display: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:50 -06:00
Bjorn Neergaard
5ab04ac5a1
pkg/unpack: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:49 -06:00
Bjorn Neergaard
da11969793
pkg/snapshotters: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:48 -06:00
Bjorn Neergaard
f1cbc5f90c
containerd: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:47 -06:00
Akihiro Suda
9ca6fd9e6e
Merge pull request #9117 from kinvolk/rata/userns-chown-opt-in 
Require opt-in for rootfs chown when idmap mounts is not supported
 2023-09-28 02:34:41 +09:00
Akihiro Suda
719fa3d3f7
Merge pull request #9114 from thaJeztah/remove_libcontainer 
remove github.com/opencontainers/runc dependency
 2023-09-28 02:17:02 +09:00
Phil Estes
61a8905012
Merge pull request #9154 from neersighted/image_cleanup 
images: use mediatype helpers
 2023-09-27 12:33:29 -04:00
Sebastiaan van Stijn
4b1bb1293e
remove github.com/opencontainers/runc dependency 
This migrates uses of github.com/opencontainers/runc/libcontainer/user
to the new github.com/moby/sys/user module, which was extracted from
runc at commit [opencontainers/runc@a3a0ec48c4].

This is the initial release of the module, which is a straight copy, but
some changes may be made in the next release (such as fixing camel-casing
in some fields and functions (Uid -> UID).

[opencontainers/runc@a3a0ec48c4]: a3a0ec48c4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-27 17:34:28 +02:00
Bjorn Neergaard
62f621a344
images: simplify mediatype logic 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 09:29:57 -06:00
Bjorn Neergaard
377c5ca9cd
images/archive: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 09:29:56 -06:00
Bjorn Neergaard
bb8a472f24
images: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 09:29:54 -06:00
Derek McGowan
e7254406c9
Require plugins to succeed after registering readiness 
When readiness is registered on initialization, the plugin must not
fail. When such a plugin fails, containerd will hang on the readiness
condition.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-26 17:10:55 -07:00
Akihiro Suda
9ffb34ac49
Merge pull request #9054 from macOScontainers/canonicalize-filter-mount-path 
Fix usages of `mountinfo.PrefixFilter`
 2023-09-27 05:10:27 +09:00
Bryant Biggs
bf4fbe4e87 docs: Update transfer service docs to reflect completed implementations for 1.7 
Signed-off-by: Bryant Biggs <bryantbiggs@gmail.com>
 2023-09-26 12:31:19 -04:00
Phil Estes
bcd658c76c
Merge pull request #9146 from thaJeztah/nil_error 
images: Config: explicitly return nil-error
 2023-09-26 12:27:00 -04:00
Phil Estes
5444dae0d4
Merge pull request #9120 from dmcgowan/image-usage-test 
Image usage test
 2023-09-26 11:59:31 -04:00
Phil Estes
9fded7ca7d
Merge pull request #9143 from dmcgowan/plugin-config-unknown-fields 
Add warning for plugin configs with unknown fields
 2023-09-26 11:55:39 -04:00
Sebastiaan van Stijn
b40e95e0ea
images: Config: explicitly return nil-error 
just a minor nit :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-26 13:20:41 +02:00
Derek McGowan
36c2222d3f
Add usage calculation test 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-25 20:18:13 -07:00