dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-11 09:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,638 Commits 29 Branches 313 Tags
6ff3e09d201c82839be50f176895656d2bbcffec
Commit Graph

729 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
6ff3e09d20 migrate platforms package to github.com/containerd/platforms 
This updates the platforms package to be an alias for the new platforms module.
This helps transitioning consumers to the new module, and makes sure that
containerd v2 and v1 use the same definitions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-13 00:58:28 +02:00
Akihiro Suda
327a3ac61d go.mod: github.com/klauspost/compress v1.16.7 
https://github.com/imdario/mergo/compare/v0.3.13...v1.0.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 1f2216cc78)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-12 22:57:30 +02:00
Sebastiaan van Stijn
d0d1264a65 vendor: github.com/klauspost/compress v1.16.5 
partial backport of 56d80f81a2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-12 22:57:27 +02:00
Akihiro Suda
e26c152b78 Merge pull request #10316 from thaJeztah/1.7_backport_replace_reference 
[release/1.7 backport] replace reference/docker for github.com/distribution/reference v0.6.0
 2024-06-11 16:19:46 +09:00
dependabot[bot]
97abbe9cba build(deps): bump github.com/distribution/reference from 0.5.0 to 0.6.0 
Bumps [github.com/distribution/reference](https://github.com/distribution/reference) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/distribution/reference/releases)
- [Commits](https://github.com/distribution/reference/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/distribution/reference
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 362fcf2d27)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 18:33:30 +02:00
Sebastiaan van Stijn
b38c0f2ef8 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>
(cherry picked from commit 4923470902)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 18:26:31 +02:00
dependabot[bot]
fef432bfeb build(deps): bump go.etcd.io/bbolt from 1.3.9 to 1.3.10 
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.9 to 1.3.10.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.9...v1.3.10)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit a6e417dc63)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 15:40:50 +02:00
Sebastiaan van Stijn
487c61bfbb vendor: go.etcd.io/bbolt v1.3.9 
full diff: https://github.com/etcd-io/bbolt/compare/v1.3.8...v1.3.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 154ed26a77)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 15:37:50 +02:00
dependabot[bot]
7211f87c48 build(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0 
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0.
- [Commits](https://github.com/golang/sync/compare/v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit db43e3d1f7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 15:37:40 +02:00
Sebastiaan van Stijn
e908c3e6fc vendor: golang.org/x/sync v0.4.0 
no changes in vendored code

full diff: https://github.com/golang/sync/compare/v0.3.0...v0.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 15:35:09 +02:00
dependabot[bot]
d814be5ce8 build(deps): bump go.etcd.io/bbolt from 1.3.7 to 1.3.8 
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.7...v1.3.8)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 39ba0347ee)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-08 15:28:52 +02:00
Sebastiaan van Stijn
0af6825b1e migrate logs imports to github.com/containerd/log module 
Import the log module directly, instead of using the aliases that are
provided in the log package. This helps find code-paths that still depend
on the old location, and that haven't migrated yet to the new module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-05-27 14:38:51 +02:00
Sebastiaan van Stijn
308341a446 replace uses of github.com/containerd/containerd/errdefs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-05-26 13:21:40 +02:00
Sebastiaan van Stijn
47ff8cfce0 migrate errdefs package to github.com/containerd/errdefs module 
This updates the errdefs package to be an alias for the new errdefs module.
This helps transitioning consumers to the new module, and makes sure that
containerd v2 and v1 use the same definitions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-05-26 13:19:16 +02:00
Derek McGowan
a3c0f2f61e Merge pull request #10232 from kiashok/update-shim-0.11.4 
[release/1.7] Update hcsshim tag to v0.11.5
 2024-05-15 13:38:14 -07:00
Kirtana Ashok
5a03a3aeee Update hcsshim tag to v0.11.5 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2024-05-15 10:54:10 -07:00
Kirtana Ashok
9a1eda40f8 update ttrpc tag to 1.2.4 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2024-05-14 13:51:22 -07:00
Austin Vazquez
a5d13689b9 vendor: github.com/containerd/imgcrypt@v1.1.8 
This change vendors containerd/imgcrypt@v1.1.8 which updates its
dependency on square/go-jose/v2 (deprecated) to go-jose/go-jose/v3
(recommended) to resolve warnings for https://pkg.go.dev/vuln/GO-2024-2631.

With 638b474c81, containerd/imgcrypt was
temporarily removed in main, so there would not be a commit to
cherry-pick for this change.

full diff:
https://github.com/containerd/imgcrypt/compare/v1.1.7...v1.1.8

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 15:13:22 +00:00
dependabot[bot]
f853bc1292 vendor: golang.org/x/net@v0.23.0 
Partial cherry-pick of 1040c7b98e which
updates golang.org/x/net from v0.21.0 to v0.23.0, golang/x/crypto
from v0.19.0 to v0.21.0, and golang.org/x/term from v0.17.0 to v0.18.0.

full diff:
- https://github.com/golang/net/compare/v0.21.0...v0.23.0
- https://github.com/golang/crypto/compare/v0.19.0...v0.21.0
- https://github.com/golang/term/compare/v0.17.0...v0.18.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 1040c7b98e)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 13:40:02 +00:00
dependabot[bot]
837972979f vendor: golang.org/x/net@v0.21.0 
Partial cherry-pick of 3a5b47d736 which
updates golang.org/x/net from v0.20.0 to v0.21.0 and golang/x/crypto
from v0.18.0 to v0.19.0

full diff:
- https://github.com/golang/net/compare/v0.20.0...v0.21.0
- https://github.com/golang/crypto/compare/v0.18.0...v0.19.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 3a5b47d736)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 13:33:34 +00:00
dependabot[bot]
56aa877926 vendor: golang.org/x/net@v0.20.0 
Partial cherry-pick of 5e3e12d2ab which
updates golang.org/x/net from v0.19.0 to v0.20.0.

full diff: https://github.com/golang/net/compare/v0.19.0...v0.20.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 5e3e12d2ab)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 13:30:04 +00:00
Bryant Biggs
4e6335ebdf vendor: golang.org/x/net@v0.19.0 
Partial cherry-pick of 78421616e0 which
updates golang.org/x/net from v0.17.0 to v0.19.0.

full diff: https://github.com/golang/net/compare/v0.17.0...v0.19.0

Signed-off-by: Bryant Biggs <bryantbiggs@gmail.com>
(cherry picked from commit 78421616e0)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 13:30:04 +00:00
dependabot[bot]
1c6c745c60 vendor: golang.org/x/term@v0.17.0 
Partial cherry-pick of 228aa42a60 which
updates golang.org/x/term from v0.16.0 to v0.17.0.

full diff: https://github.com/golang/term/compare/v0.16.0...v0.17.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 228aa42a60)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 13:29:32 +00:00
dependabot[bot]
1077d38c9f vendor: golang.org/x/sys@v0.18.0 
Partial cherry-pick of 00d714e90a which
updates golang.org/x/sys from v0.16.0 to v0.18.0.

full diff: https://github.com/golang/sys/compare/v0.16.0...v0.18.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 00d714e90a)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-13 13:29:31 +00:00
Austin Vazquez
4b52104f0c vendor: golang.org/x/crypto@v0.18.0 
imgcrypt and transitively golang.org/x/crypto was removed in
d69ae811d6 in mainline to resolve a
circular dependency issue, so there would not be an update to
cherry-pick from mainline.

full diff: https://github.com/golang/crypto/compare/v0.14.0...v0.18.0

Resolves warnings for https://pkg.go.dev/vuln/GO-2023-2402

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-10 15:37:04 +00:00
dependabot[bot]
2f65c83b0b vendor: golang.org/x/term@v0.16.0 
partial cherry-pick of 5e3e12d2ab which
updates golang.org/x/term from v0.15.0 to v0.16.0

full diff: https://github.com/golang/term/compare/v0.15.0...v0.16.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 5e3e12d2ab)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-10 15:35:28 +00:00
dependabot[bot]
8a76171f76 vendor: golang.org/x/sys@v0.16.0 
partial cherry-pick of dfb1753800

full diff: https://github.com/golang/sys/compare/v0.15.0...v0.16.0

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit dfb1753800)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-10 15:14:27 +00:00
Bryant Biggs
d45778523c vendor: golang.org/x/term@v0.15.0, golang.org/x/text@v0.14.0 
parital cherry-pick of 78421616e0 which
updated golang.org/x/term from v0.13.0 to v0.15.0 and golang.org/x/text
from v0.13.0 to v0.14.0.

full diff: https://github.com/golang/term/compare/v0.13.0...v0.15.0
full diff: https://github.com/golang/text/compare/v0.13.0...v0.14.0

Signed-off-by: Bryant Biggs <bryantbiggs@gmail.com>
(cherry picked from commit 78421616e0)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-10 15:12:58 +00:00
Kohei Tokunaga
24038de8c1 vendor: golang.org/x/sys@v0.15.0 
partial cherry-pick of 9937909693 which
updated golang.org/x/sys from v0.13.0 to v0.15.0

full diff: https://github.com/golang/sys/compare/v0.13.0...v0.15.0

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
(cherry picked from commit 9937909693)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2024-05-10 15:08:29 +00:00
Derek McGowan
24dd403abb Update image-spec to v1.1.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-05-06 17:16:20 -07:00
Akihiro Suda
189b69e247 go.mod: github.com/opencontainers/image-spec v1.1.0-rc3 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 4347fc8bc2)
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-05-06 17:12:52 -07:00
Derek McGowan
388fb336b0 Update grpc to v1.59.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-05-06 17:10:50 -07:00
Samuel Karp
395a319015 mod: bump github.com/containerd/nri@v0.6.1 
Fixes https://github.com/containerd/containerd/issues/10085

Signed-off-by: Samuel Karp <samuelkarp@google.com>
(cherry picked from commit a153b2cd32)
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2024-04-18 16:18:15 -07:00
Evan Lezar
7a2f49f70f Bump tags.cncf.io/container-device-interface to v0.7.2 
This includes migrating from cdi.GetRegistry() to cdi.Configure() and
using top-level cdi Refresh and InjectDevices functions as applicable.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2024-04-18 16:42:04 +02:00
Kirtana Ashok
8c76e79482 Use different containerd sock address in tests 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit 5b6ae0f796)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2024-04-09 20:26:35 -07:00
Sebastiaan van Stijn
e6d91d843f vendor: github.com/golang/protobuf v1.5.4 
commit 10c7f03b3b updated google.golang.org/protobuf
to v1.33.0, which addresses CVE-2024-24786, however a follow-up post on the
Golang security list issued a warning that the v1.33.0 update introduced a
breaking change, causing compatibility with github.com/golang/protobuf to be
broken;

> A small correction: This vulnerability applies when the UnmarshalOptions.DiscardUnknown
> option is set (as well as when unmarshaling into any message which contains a
> google.protobuf.Any). There is no UnmarshalUnknown option.
>
> In addition, version 1.33.0 of google.golang.org/protobuf inadvertently
> introduced an incompatibility with the older github.com/golang/protobuf
> module. (https://github.com/golang/protobuf/issues/1596) Users of the older
> module should update to github.com/golang/protobuf@v1.5.4.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 45e425ccce)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-03-20 10:25:31 +01:00
dependabot[bot]
2d136c5f5e build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 
Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 10c7f03b3b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-03-20 10:24:23 +01:00
dependabot[bot]
a1a7af7a39 build(deps): bump google.golang.org/protobuf from 1.31.0 to 1.32.0 
Bumps google.golang.org/protobuf from 1.31.0 to 1.32.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 7fe038e4a5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-03-20 10:22:18 +01:00
Kirtana Ashok
753422ac11 Drop go 1.20 and build against 1.22 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit 87aa9e8008)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
 2024-03-04 18:13:55 +05:30
Kohei Tokunaga
6620d6bfd7 ci: bump up golangci-lint to v1.55.2 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
(cherry picked from commit 9fc407d8cf)
Signed-off-by: Akhil Mohan <akhil.mohan@broadcom.com>
 2024-03-01 14:47:31 +05:30
Phil Estes
8e86a0b50d Merge pull request #9784 from henry118/release/1.7 
[release/1.7] bug fix: make sure cri image is pinned when it is pulled outside cri
 2024-02-09 17:39:10 +00:00
Henry Wang
26c057423c bug fix: make sure cri image is pinned when it is pulled outside cri 
Signed-off-by: Henry Wang <henwang@amazon.com>
(cherry picked from commit 1eaf0c1f04)
 2024-02-07 21:24:23 +00:00
Krisztian Litkey
d3e9975563 go.{mod,sum}: update NRI dependency, re-vendor. 
Pull in latest NRI fixing a potential fd double close error.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
 2024-02-07 19:25:42 +02:00
Evan Lezar
14628d4aaa Update container-device-interface to v0.6.2 
This includes migrating from the github.com/container-orchestrated-devices
repo to tags.cncf.io.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2024-01-24 14:51:15 +01:00
Fu Wei
5a675f2f5f Merge pull request #9602 from thaJeztah/1.7_backport_no_execabs 
[release/1.7 backport] switch back from golang.org/x/sys/execabs to os/exec (go1.19)
 2024-01-08 20:37:23 +08:00
Sebastiaan van Stijn
9251072f78 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>
(cherry picked from commit 4b1bb1293e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-05 14:21:49 +01:00
Sebastiaan van Stijn
4e67213d4f 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>
(cherry picked from commit 05093d7c07)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-05 14:18:57 +01:00
Akihiro Suda
e0ee0be0df go.mod: github.com/opencontainers/runtime-spec v1.1.0 
https://github.com/opencontainers/runtime-spec/compare/v1.1.0-rc.2...v1.1.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 235a4452df)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-05 14:17:19 +01:00
Akihiro Suda
02be2236a2 go.mod: github.com/.../container-device-interface v0.6.0 
https://github.com/container-orchestrated-devices/container-device-interface/compare/v0.5.4...v0.6.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 0498acefb9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-05 14:15:34 +01:00
Akihiro Suda
91f953bb47 go.mod: github.com/opencontainers/runtime-spec v1.1.0-rc.2 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 5e054ee631)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-01-05 14:15:29 +01:00