Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.21] Bump containerd/containerd to latest release #4380

Open
wants to merge 1 commit into
base: release-0.21
Choose a base branch
from
+19 −24
Open

[release-0.21] Bump containerd/containerd to latest release #4380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions UPSTREAM_PROJECTS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ projects:
repos:
- name: containerd
versions:
- tag: v1.7.25
go_version: "1.22"
- tag: v1.7.26
go_version: "1.23"
- org: distribution
repos:
- name: distribution
Expand Down
16 changes: 8 additions & 8 deletions projects/containerd/containerd/ATTRIBUTION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ https://github.com/containerd/cgroups/v3
** github.com/containerd/console; version v1.0.3 --
https://github.com/containerd/console

** github.com/containerd/containerd; version v1.7.25 --
** github.com/containerd/containerd; version v1.7.26 --
https://github.com/containerd/containerd

** github.com/containerd/containerd/api; version v1.8.0 --
Expand All @@ -41,13 +41,13 @@ https://github.com/containerd/imgcrypt
** github.com/containerd/log; version v0.1.0 --
https://github.com/containerd/log

** github.com/containerd/nri; version v0.6.1 --
** github.com/containerd/nri; version v0.8.0 --
https://github.com/containerd/nri

** github.com/containerd/platforms; version v0.2.1 --
https://github.com/containerd/platforms

** github.com/containerd/ttrpc; version v1.2.5 --
** github.com/containerd/ttrpc; version v1.2.7 --
https://github.com/containerd/ttrpc

** github.com/containerd/typeurl; version v1.0.2 --
Expand Down Expand Up @@ -86,7 +86,7 @@ https://github.com/docker/go-units
** github.com/go-jose/go-jose/v3; version v3.0.3 --
https://github.com/go-jose/go-jose/v3

** github.com/go-logr/logr; version v1.3.0 --
** github.com/go-logr/logr; version v1.4.2 --
https://github.com/go-logr/logr

** github.com/go-logr/stdr; version v1.2.2 --
Expand Down Expand Up @@ -1130,15 +1130,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** golang.org/go; version go1.22.12 --
** golang.org/go; version go1.23.6 --
https://github.com/golang/go

** golang.org/x/mod/semver; version v0.17.0 --
https://golang.org/x/mod

** golang.org/x/net; version v0.25.0 --
https://golang.org/x/net

** golang.org/x/oauth2; version v0.11.0 --
https://golang.org/x/oauth2

Expand Down Expand Up @@ -1181,6 +1178,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
** golang.org/x/crypto; version v0.31.0 --
https://golang.org/x/crypto

** golang.org/x/net; version v0.33.0 --
https://golang.org/x/net

** golang.org/x/sync; version v0.10.0 --
https://golang.org/x/sync

Expand Down
15 changes: 5 additions & 10 deletions projects/containerd/containerd/CHECKSUMS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
10bf7e6f88a54087f43803a94ee525e1a1af1f2e2b4e74055402adc6d63232e2 _output/bin/containerd/linux-arm64/containerd
497a4c843b7865f39f9c865f904d46d159ece6d4ff57cdd87bb9ab916b093536 _output/bin/containerd/linux-arm64/containerd-shim
7579a2d0900cf82f0bc98890ff4398307ba18a4ccd38aae241b71e2b41bdaf93 _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
f6f8ea99959a8ef826925109ec138e7ab4d248393c344ad5b1037ac9bd2441fc _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
9c49dcec6dbef20c9bab135e9d3166bc38b60e7a8b497245cf36d85d981dbb42 _output/bin/containerd/linux-arm64/ctr
00cc1780fbdd4f31a6a8a2a7af52b405da988e697561ca6030bd9816dd67d21e _output/bin/containerd/linux-amd64/containerd
438bdb2dd697474cc0a2f4b2118bf6818c238ce952e220fc8115e86143f9e96e _output/bin/containerd/linux-amd64/containerd-shim
bbdbcc29f6e895bd424dfb8083b083044fc2e9e789603e0dfba304a0b89b990b _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
ef2b37eb17611367fabcec77e3bcfaaf4ab7f647b4522315235c07758b1a7ba2 _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
5db777887e338eb701901571f8eea01a3212eb1e85ff395c52a158014852fd15 _output/bin/containerd/linux-amd64/ctr
57d081bce13afca4537dd16a3609f4a92c1c889f4a086592af9aa502f377c5b2 _output/bin/containerd/linux-amd64/containerd
1056dd9906b6b908f1160f1ecd733cd573c612429265d52c129c0bc476897081 _output/bin/containerd/linux-amd64/containerd-shim
3b0b135f5abdc5e00f4a8e93955e1b4ffd7df2e6287f69d2c31ef837f27388ef _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
16fab8d8bae458e67f43003d507f9be9a0a49ab4703b89550ea67bb5f6b09858 _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
2e0355f4acdd119241eec68a880ec46615d866d760c8c5216ea674f50306356e _output/bin/containerd/linux-amd64/ctr
2 changes: 1 addition & 1 deletion projects/containerd/containerd/GIT_TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.7.25
v1.7.26
2 changes: 1 addition & 1 deletion projects/containerd/containerd/GOLANG_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.22
1.23
4 changes: 2 additions & 2 deletions projects/containerd/containerd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **containerd**
![Version](https://img.shields.io/badge/version-v1.7.25-blue)
![Version](https://img.shields.io/badge/version-v1.7.26-blue)
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTWhoMS9lejNIZmxuZzB2NThxU1N5VXNoVVR3MlNWYVBqajA4M3QwN3BERHRjN3oxSGxCcmk4R3pqVVU0aVVHYVVsRnVReU5pdnRRQ1FGQ2djT0pmbjVzPSIsIml2UGFyYW1ldGVyU3BlYyI6ImpGdnQ4d05CL21Lbjdsa0oiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)

[containerd](https://github.com/containerd/containerd) is available as a daemon for Linux and Windows. It manages the complete container lifecycle of its host system, from image transfer and storage to container execution and supervision to low-level storage to network attachments and beyond.
Expand All @@ -10,7 +10,7 @@
[repo](https://github.com/containerd/containerd) and decide on new version.
1. Update the `GIT_TAG` file to have the new desired version based on the upstream release tags.
1. Compare the old tag to the new, looking specifically for Makefile changes.
ex: [1.6.20 compared to 1.6.21](https://github.com/containerd/containerd/compare/v1.6.20...v1.7.25). Check the release [dockerfile](https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile)
ex: [1.6.20 compared to 1.6.21](https://github.com/containerd/containerd/compare/v1.6.20...v1.7.26). Check the release [dockerfile](https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile)
and [Makefile](https://github.com/containerd/containerd/blob/main/Makefile#L99) for any build flag changes, tag changes, dependencies, etc.
1. Verify the golang version has not changed. The version specified in the release github [action](https://github.com/containerd/containerd/blob/main/.github/workflows/release.yml#L16)
should be considered the source of truth.
Expand Down