Bump containerd/containerd to latest release (#3674)

* Bump containerd/containerd to latest release * Update ARM64 checksums for containerd/containerd --------- Co-authored-by: Abhay Krishna Arunachalam <[email protected]>
aws · Aug 29, 2024 · 0bcbe35 · 0bcbe35
1 parent c6c8658
commit 0bcbe35
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 19 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -73,8 +73,8 @@ projects:
     repos:
       - name: containerd
         versions:
-          - tag: v1.7.20
-            go_version: "1.21"
+          - tag: v1.7.21
+            go_version: "1.22"
   - org: distribution
     repos:
       - name: distribution

diff --git a/projects/containerd/containerd/ATTRIBUTION.txt b/projects/containerd/containerd/ATTRIBUTION.txt
@@ -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.20 --
+** github.com/containerd/containerd; version v1.7.21 --
 https://github.com/containerd/containerd
 
 ** github.com/containerd/containerd/api; version v1.7.19 --
@@ -131,9 +131,12 @@ https://github.com/moby/sys/signal
 ** github.com/moby/sys/symlink; version v0.2.0 --
 https://github.com/moby/sys/symlink
 
-** github.com/moby/sys/user; version v0.1.0 --
+** github.com/moby/sys/user; version v0.3.0 --
 https://github.com/moby/sys/user
 
+** github.com/moby/sys/userns; version v0.1.0 --
+https://github.com/moby/sys/userns
+
 ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd --
 https://github.com/modern-go/concurrent
 
@@ -1127,7 +1130,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** golang.org/go; version go1.21.13 --
+** golang.org/go; version go1.22.6 --
 https://github.com/golang/go
 
 ** golang.org/x/crypto; version v0.21.0 --

diff --git a/projects/containerd/containerd/CHECKSUMS b/projects/containerd/containerd/CHECKSUMS
@@ -1,10 +1,10 @@
-25e5042250f257a2fa7b0d0db91ad0bfc3d4ff184f829503871075c7fef89aa3  _output/bin/containerd/linux-amd64/containerd
-72bac2b2c3794783b09991dccb90e314d95ca5c2d80d824eb1ed9c76980e4139  _output/bin/containerd/linux-amd64/containerd-shim
-aeea6a6e640d97826ea57fe030b8c99bd5d217ae03847083ea758d1e05004e0d  _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
-8d0405cbf7e39447adfb266de307275aabdf7bbd39c6b3c523f216ea7813d9e9  _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
-5af1ac19658c0fe44bcef960978075b9c38c8d72ec80818605eb737e86103769  _output/bin/containerd/linux-amd64/ctr
-071e4890d090fb2e18f211f6d4ce262d66390b8bcb01b3ec876c31009beff746  _output/bin/containerd/linux-arm64/containerd
-edc79e170e2d7200c7467bd3a6eb302a9e7d375899e81b093c642b22a729c36d  _output/bin/containerd/linux-arm64/containerd-shim
-a29c4e08fb707b7a3173d82cd41b82fb81452e0e17577caa58942b627239858d  _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
-0f9f88123accc6a47c0614c2ca934cfb7961e45f032adae50b9f57f235c607bd  _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
-f1a0da729e74c2d423b154bbb8a757d560d0d96a1cdf16e04f7d321c9543da35  _output/bin/containerd/linux-arm64/ctr
+9e0b4dcc201e124db03cab679077ddfb9aafe495b9c62f780c78c815a022b345  _output/bin/containerd/linux-amd64/containerd
+c4d1181ba713bea024450d7a90233d0af9a558f0ec926ecc4fe2ed37324a8ca8  _output/bin/containerd/linux-amd64/containerd-shim
+202045959f38c10f7acb039a6e938d102e9179191e66c95926582f0b439db107  _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
+4d71a6a71dec03e2e6fb88d3846ef984b3a9540812182730b6a8449067d59dc7  _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
+f23e2cfb020273124316c93eea8bc9f531da959c39f71c55cb76faf435f3d403  _output/bin/containerd/linux-amd64/ctr
+7490dc4956e5a66bee2e3effd651318e75ddbae8849b1775452d849828f49e6b  _output/bin/containerd/linux-arm64/containerd
+3bdd97769ec8c4717564f683cdff4a0fbb6d5a2656b65113fc463554e1f17539  _output/bin/containerd/linux-arm64/containerd-shim
+15618a1526807ce7c25effd141ec5d7a262c6e3803462a627cceee2bdfb0ef6d  _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
+b3994dd32a070f53eb578927a15481d83e47067dda4658acd0acf76f7f5e3978  _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
+88866958ea1b943f25d8e81ec5d9cd2aaa4a937cb5a0d7dd7d141acce6186068  _output/bin/containerd/linux-arm64/ctr
diff --git a/projects/containerd/containerd/GIT_TAG b/projects/containerd/containerd/GIT_TAG
@@ -1 +1 @@
-v1.7.20
+v1.7.21
diff --git a/projects/containerd/containerd/GOLANG_VERSION b/projects/containerd/containerd/GOLANG_VERSION
@@ -1 +1 @@
-1.21
+1.22
diff --git a/projects/containerd/containerd/README.md b/projects/containerd/containerd/README.md
@@ -1,5 +1,5 @@
 ## **containerd**
-![Version](https://img.shields.io/badge/version-v1.7.20-blue)
+![Version](https://img.shields.io/badge/version-v1.7.21-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.
@@ -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.20). 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.21). 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.