Bump containerd/containerd to latest release (#2999)

* Bump containerd/containerd to latest release * Update checksums for containerd/containerd --------- Co-authored-by: Abhay Krishna Arunachalam <[email protected]>
aws · Mar 13, 2024 · 08c3f06 · 08c3f06
1 parent 85f8c31
commit 08c3f06
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -73,8 +73,8 @@ projects:
     repos:
       - name: containerd
         versions:
-          - tag: v1.7.13
-            go_version: "1.20"
+          - tag: v1.7.14
+            go_version: "1.21"
   - 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.13 --
+** github.com/containerd/containerd; version v1.7.14 --
 https://github.com/containerd/containerd
 
 ** github.com/containerd/continuity; version v0.4.2 --
@@ -35,10 +35,10 @@ https://github.com/containerd/imgcrypt
 ** github.com/containerd/log; version v0.1.0 --
 https://github.com/containerd/log
 
-** github.com/containerd/nri; version v0.4.0 --
+** github.com/containerd/nri; version v0.6.0 --
 https://github.com/containerd/nri
 
-** github.com/containerd/ttrpc; version v1.2.2 --
+** github.com/containerd/ttrpc; version v1.2.3 --
 https://github.com/containerd/ttrpc
 
 ** github.com/containerd/typeurl; version v1.0.2 --
@@ -197,7 +197,7 @@ https://github.com/open-telemetry/opentelemetry-proto-go
 ** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20230711160842-782d3b101e98 --
 https://github.com/googleapis/go-genproto
 
-** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20230711160842-782d3b101e98 --
+** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20230731190214-cbb8c96f2d6d --
 https://github.com/googleapis/go-genproto
 
 ** google.golang.org/genproto/protobuf/field_mask; version v0.0.0-20230711160842-782d3b101e98 --
@@ -1079,7 +1079,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** golang.org/go; version go1.20.14 --
+** golang.org/go; version go1.21.8 --
 https://github.com/golang/go
 
 ** golang.org/x/crypto; version v0.14.0 --

diff --git a/projects/containerd/containerd/CHECKSUMS b/projects/containerd/containerd/CHECKSUMS
@@ -1,10 +1,10 @@
-8c1c22ad150fb86757830c873945693898bd1020f6fbf2986211137f48abeeeb  _output/bin/containerd/linux-amd64/containerd
-d202a4f8de1df4f001c601e70290bd2d4d1b94056016739f89d94904fa84ed06  _output/bin/containerd/linux-amd64/containerd-shim
-ba9d6c0e5da85da7eab84cdbaa4558a9874145dd86e63de07127df24adf25caa  _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
-b9fb1288c67766736e78b7a7a9d7121010e32a4b4f82c034acaae869d4ce1080  _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
-4183b7b99a7ef55396640c010a44be80fb6553fd220fcf9215e8423033cfe55c  _output/bin/containerd/linux-amd64/ctr
-cf2822460122d18072e7de32688bad928ef1e73376077dfb1a31a0284e1fe085  _output/bin/containerd/linux-arm64/containerd
-4e42a40c8f3916a37da34a674cd96379fc64bccd14c06643ceca12cb957c393b  _output/bin/containerd/linux-arm64/containerd-shim
-0010589ce10e24013900c6a1eef17e3f44fe23b5d68dee16a74396a38ff79eda  _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
-3f2a5e82a65c7ff107ad42d48f30bb0ee18c1669c9cc9cac3eff450c40df2c9e  _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
-9b6fa8cf894fd1c708742dbf9a0ed1d0150dafbbce4670add569a858f5acc83f  _output/bin/containerd/linux-arm64/ctr
+7d402165ea90d53581b12569586ebe202f9b00a75b824aa93587d84cbb326415  _output/bin/containerd/linux-amd64/containerd
+ae56d07271d24139eeb021d55667bcb841282e93f976e4c97afd26be6b71122a  _output/bin/containerd/linux-amd64/containerd-shim
+9db2d6592eec200fb441c5e6562f7a840fdda198b20a2953624f91de93b21036  _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
+744f667fe559118cc82fef0e9fdc51a8554917c76529b60bb01b4eb29527ef74  _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
+eb916bb32ab8041c0c77d79152c6c240f2a183f33f633e8699db8e9df46f16c7  _output/bin/containerd/linux-amd64/ctr
+16baec827ffaca0e10587aa351be7ec8cbd439e1cfe7ad878ff1e6819825b2be  _output/bin/containerd/linux-arm64/containerd
+1401aea94df72a0b75a19b41c56a5468edf0fe21e4ed459d25f6900a38f90944  _output/bin/containerd/linux-arm64/containerd-shim
+dfd3bfa63cc0fae041c4dfe370fcaf97d3f4914e825066d725cf748ad7933e76  _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
+2b83589fd369dd86580ee731b5a6e4adb09581cd4c965fac24458d67c198ae39  _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
+2cdae54a5ea34ec45e6a1dabaabf4b8ec6ada3b26779cd7f0bd19cf54d9fcac5  _output/bin/containerd/linux-arm64/ctr
diff --git a/projects/containerd/containerd/GIT_TAG b/projects/containerd/containerd/GIT_TAG
@@ -1 +1 @@
-v1.7.13
+v1.7.14
diff --git a/projects/containerd/containerd/GOLANG_VERSION b/projects/containerd/containerd/GOLANG_VERSION
@@ -1 +1 @@
-1.20
+1.21
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.13-blue)
+![Version](https://img.shields.io/badge/version-v1.7.14-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.13). 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.14). 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.