github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
12,869 Commits 3 Branches 4 Tags
a80606bc2da5cb83ad80421cf52c19062d7a711a
Commit Graph

758 Commits

Author SHA1 Message Date
Derek McGowan
a80606bc2d Move plugin type definitions to containerd plugins package 
The plugins packages defines the plugins used by containerd.
Move all the types and properties to this package.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-12 20:52:56 -07:00
Derek McGowan
cb969085f5 Temporarily remove zfs as built in plugin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-12 20:39:22 -07:00
Maksym Pavlenko
1b31993240 Rename sbserver to server 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-10-12 15:46:57 -07:00
Maksym Pavlenko
c5c94dc86c Fix CRI tests panic on CI 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-10-12 14:35:27 -07:00
Maksym Pavlenko
a3c2c1e4da Clean shell scripts 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-10-12 10:30:46 -07:00
Maksym Pavlenko
fa1d3a9ccb Fix dependencies after remove 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-10-12 10:30:46 -07:00
Fu Wei
8db0d39c68 Merge pull request #9104 from cyyzero/fix-deadlock 2023-10-10 07:36:29 +08:00
Phil Estes
3bb46b62c4 Merge pull request #9191 from ktock/compress-v1.17.0 
go.mod: Bump up github.com/klauspost/compress v1.16.7 to v1.17.0
 2023-10-04 08:52:49 -04:00
Kohei Tokunaga
39478eeec4 go.mod: Bump up github.com/klauspost/compress v1.16.7 to v1.17.0 
- release: https://github.com/klauspost/compress/releases/tag/v1.17.0
- diff: https://github.com/klauspost/compress/compare/v1.16.7...v1.17.0

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-10-04 10:01:50 +09: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
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
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
Wei Fu
11a7751af5 *: add runc-fp as runc wrapper to inject failpoint 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-10-02 17:44:41 +00: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
Bjorn Neergaard
79acce4621 integration: use mediatype helpers 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
 2023-09-27 13:12:54 -06: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
Derek McGowan
4c344f2fa5 Add warning for plugin configs with unknown fields 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-25 16:09:15 -07:00
Derek McGowan
650148313c Add warning log for unknown config fields 
Add error log for failure to parse toml

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-24 20:50:54 -07:00
Derek McGowan
b5615caf11 Update go-toml to v2 
Updates host file parsing to use new v2 method rather than the removed
toml.Tree.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-22 15:35:12 -07:00
Derek McGowan
2f1b92710a Update zfs library to use new log repository 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-22 07:53:23 -07:00
Derek McGowan
508aa3a1ef Move to use github.com/containerd/log 
Add github.com/containerd/log to go.mod

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-09-22 07:53:23 -07:00
Sebastiaan van Stijn
d69ae811d6 alias log package to github.com/containerd/log v0.1.0 
This "soft" deprecates the package, but keeps the local uses of the package,
which can make backporting this to release-branches easier (we can
still move all uses in those branches as well though).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-19 08:44:10 +02:00
Sebastiaan van Stijn
8cbb4ea5d3 vendor: github.com/containerd/nri v0.5.0 
This version no longer has a dependency on containerd, cutting
down the number of circular dependencies.

full diff: https://github.com/containerd/nri/compare/v0.4.0...v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-16 10:40:21 +02:00
Fu Wei
fe17f65159 Merge pull request #8287 from kinvolk/rata/userns-stateless-idmap 
Add support for userns in stateless and stateful pods with idmap mounts (KEP-127, k8s >= 1.27)
 2023-09-14 18:14:02 +08:00
Rodrigo Campos
2e13d39546 pkg/process: Only use idmap mounts if runc supports it 
runc, as mandated by the runtime-spec, ignores unknown fields in the
config.json. This is unfortunate for cases where we _must_ enable that
feature or fail.

For example, if we want to start a container with user namespaces and
volumes, using the uidMappings/gidMappings field is needed so the
UID/GIDs in the volume don't end up with garbage. However, if we don't
fail when runc will ignore these fields (because they are unknown to
runc), we will just start a container without using the mappings and the
UID/GIDs the container will persist to volumes the hostUID/GID, that can
change if the container is re-scheduled by Kubernetes.

This will end up in volumes having "garbage" and unmapped UIDs that the
container can no longer change. So, let's avoid this entirely by just
checking that runc supports idmap mounts if the container we are about
to create needs them.

Please note that the "runc features" subcommand is only run when we are
using idmap mounts. If idmap mounts are not used, the subcommand is not
run and therefore this should not affect containers that don't use idmap
mounts in any way.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
 2023-09-13 16:44:54 +02:00
Rodrigo Campos
fce1b95076 go.mod: Update runtime spec to include features.MountExtensions 
Future patches will use that field.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
 2023-09-13 16:44:54 +02:00
Rodrigo Campos
e832605a80 integration: Simplify WithVolumeMount() 
Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
 2023-09-13 16:44:54 +02:00
Rodrigo Campos
24aa808fe2 integration: Add userns test with volumes 
Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
 2023-09-13 16:44:54 +02:00
Phil Estes
0f52935a53 Merge pull request #9088 from samuelkarp/nri 
vendor: update github.com/containerd/nri@v0.4.0
 2023-09-13 10:26:02 -04:00
Samuel Karp
39804bc3f0 Merge pull request #8909 from liggitt/fieldmask 2023-09-13 00:33:44 -07:00
Samuel Karp
9656b8c0d0 nri: update mock plugin handlers 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-09-12 17:51:27 -07:00
Samuel Karp
6f9de91efc vendor: update github.com/containerd/nri@v0.4.0 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2023-09-12 16:41:05 -07:00
Sebastiaan van Stijn
05093d7c07 vendor: github.com/cncf-tags/container-device-interface v0.6.1 
Removes uses of the github.com/opencontainers/runc/libcontainer/devices
package.

full diff: https://github.com/cncf-tags/container-device-interface/compare/v0.6.0...v0.6.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-08 13:53:43 +02:00
Jordan Liggitt
55b2df560f go.mod: github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 
Signed-off-by: Jordan Liggitt <liggitt@google.com>
 2023-09-07 16:53:10 -04:00
Derek McGowan
b11439fc4b Merge pull request #9034 from thaJeztah/replace_reference 
replace reference/docker for github.com/distribution/reference v0.5.0
 2023-09-05 06:52:29 -07:00
Akihiro Suda
0ee2433c94 Merge pull request #5890 from artqzn/idmapped_mounts 
RFC: Initial support of idmapped mount points
 2023-09-05 20:41:05 +09:00
Akihiro Suda
e30a40eb65 Merge pull request #9016 from djdongjin/remove-most-logrus 
Remove most logrus import
 2023-09-05 16:09:12 +09:00
Ilya Hanov
9d01ed1c32 integration: add test for idmapped mounts 
Signed-off-by: Alexey Perevalov <alexey.perevalov@huawei.com>
Signed-off-by: Ilya Hanov <ilya.hanov@huawei-partners.com>
 2023-09-05 01:23:30 +03:00
Sebastiaan van Stijn
9bc6441c21 vendor: github.com/google/uuid v1.3.1 
Contains some performance improvements:

full diff: https://github.com/google/uuid/compare/v1.3.0...v1.3.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-01 11:49:50 +02:00
Sebastiaan van Stijn
4923470902 replace reference/docker for github.com/distribution/reference v0.5.0 
The reference/docker package was a fork of github.com/distribution/distribution,
which could not easily be used as a direct dependency, as it brought many other
dependencies with it.

The "reference' package has now moved to a separate repository, which means
we can replace the local fork, and use the upstream implementation again.

The new module was extracted from the distribution repository at commit:
b9b19409cf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-08-31 15:54:50 +02:00
Kirtana Ashok
fd5d92a7f5 Update hcsshim tag versioning to v0.12.0-rc.0 
hcsshim tags v0.10.* is deprecated, so using the new
v0.12.0-rc.* versioning for hcsshim tags on containerd/main

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2023-08-29 17:41:20 -07:00
Jin Dong
fc45365fa1 Remove most logrus 
Signed-off-by: Jin Dong <jin.dong@databricks.com>
 2023-08-26 14:31:53 -04:00
Akihiro Suda
490905be6f go.mod: github.com/containerd/continuity v0.4.2 
https://github.com/containerd/continuity/compare/1e0d26eb2381...v0.4.2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-08-25 16:39:55 +09:00
Akihiro Suda
f48bbef193 Merge pull request #8994 from mxpv/cri 
Use sandboxed CRI by default
 2023-08-24 13:42:58 +09:00
Maksym Pavlenko
c3f3cad287 Use sandboxed CRI by default 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-08-23 08:50:40 -07:00
Sebastiaan van Stijn
b76cd4d9fd 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-08-23 16:43:02 +02:00
James Sturtevant
8399a4ee71 Remove temporary replace 
Signed-off-by: James Sturtevant <jstur@microsoft.com>
 2023-08-21 16:29:18 +00:00
Derek McGowan
465c04c289 Merge pull request #8946 from lengrongfu/feat/bump-client-go 
bump client-go v0.26.4
 2023-08-18 16:35:24 -07:00
Samuel Karp
3b32d3c6f2 Merge pull request #8922 from lengrongfu/feat/sync-image-action 
feat: replace mcr.microsoft.com registry to ghcr.io/containerd registry
 2023-08-17 00:59:46 -07:00
Fu Wei
ba852faf41 Merge pull request #8954 from fuweid/fix-shim-leak 2023-08-17 08:16:20 +08:00