Bump containerd/containerd to latest release

aws · Jan 10, 2025 · a1b041d · a1b041d
1 parent f59cbdd
commit a1b041d
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 36 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -73,7 +73,7 @@ projects:
     repos:
       - name: containerd
         versions:
-          - tag: v1.7.24
+          - tag: v1.7.25
             go_version: "1.22"
   - org: distribution
     repos:

diff --git a/projects/containerd/containerd/ATTRIBUTION.txt b/projects/containerd/containerd/ATTRIBUTION.txt
@@ -14,13 +14,13 @@ 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.24 --
+** github.com/containerd/containerd; version v1.7.25 --
 https://github.com/containerd/containerd
 
-** github.com/containerd/containerd/api; version v1.7.19 --
+** github.com/containerd/containerd/api; version v1.8.0 --
 https://github.com/containerd/containerd/api
 
-** github.com/containerd/continuity; version v0.4.2 --
+** github.com/containerd/continuity; version v0.4.4 --
 https://github.com/containerd/continuity
 
 ** github.com/containerd/errdefs; version v0.3.0 --
@@ -215,7 +215,7 @@ https://github.com/open-telemetry/opentelemetry-proto-go
 ** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20231120223509-83a465c0220f --
 https://github.com/googleapis/go-genproto
 
-** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20231212172506-995d672761c0 --
+** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20240401170217-c3f982113cda --
 https://github.com/googleapis/go-genproto
 
 ** google.golang.org/genproto/protobuf/field_mask; version v0.0.0-20231211222908-989df2bf70f3 --
@@ -1133,30 +1133,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ** golang.org/go; version go1.22.10 --
 https://github.com/golang/go
 
-** golang.org/x/crypto; version v0.21.0 --
-https://golang.org/x/crypto
-
-** golang.org/x/mod/semver; version v0.12.0 --
+** golang.org/x/mod/semver; version v0.17.0 --
 https://golang.org/x/mod
 
-** golang.org/x/net; version v0.23.0 --
+** 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
 
-** golang.org/x/sync; version v0.5.0 --
-https://golang.org/x/sync
-
-** golang.org/x/sys; version v0.18.0 --
-https://golang.org/x/sys
-
-** golang.org/x/term; version v0.18.0 --
-https://golang.org/x/term
-
-** golang.org/x/text; version v0.14.0 --
-https://golang.org/x/text
-
 ** golang.org/x/time/rate; version v0.0.0-20220210224613-90d013bbcef8 --
 https://golang.org/x/time
 
@@ -1193,7 +1178,52 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** google.golang.org/protobuf; version v1.33.0 --
+** golang.org/x/crypto; version v0.31.0 --
+https://golang.org/x/crypto
+
+** golang.org/x/sync; version v0.10.0 --
+https://golang.org/x/sync
+
+** golang.org/x/sys; version v0.28.0 --
+https://golang.org/x/sys
+
+** golang.org/x/term; version v0.27.0 --
+https://golang.org/x/term
+
+** golang.org/x/text; version v0.21.0 --
+https://golang.org/x/text
+
+Copyright 2009 The Go Authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google LLC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------
+
+** google.golang.org/protobuf; version v1.35.2 --
 https://go.googlesource.com/protobuf
 
 Copyright (c) 2018 The Go Authors. All rights reserved.

diff --git a/projects/containerd/containerd/CHECKSUMS b/projects/containerd/containerd/CHECKSUMS
@@ -1,10 +1,5 @@
-a743816a0ccbe85b8196f6ab53dd46df23126a612002c9436759a4367d8eb3b8  _output/bin/containerd/linux-amd64/containerd
-b842670a077ff3819c4d67524222a9b652cbce125e0a42d9188b09900774f451  _output/bin/containerd/linux-amd64/containerd-shim
-541fa7201684ebfb9f7dd9cce0bb6be2b3fdf5656eb1de6396211b560e8a06ca  _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
-e603a818595e0e6e89ec1fb07cfbdfbe5a6cfd8ae12ab6aff133fbdebee5eee3  _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
-0cc6c3eb906379e0d1c1cf0b82405fbc2908b63c396c1079918f199a8f627e66  _output/bin/containerd/linux-amd64/ctr
-8c8c9f46c06731e96007098fcddf17871b958a52adbbea66208fcbebb23f2e7d  _output/bin/containerd/linux-arm64/containerd
-62a56639a16311da786bd2395433a8bfe6c9ec13df52b38b8064e001da3720e5  _output/bin/containerd/linux-arm64/containerd-shim
-8aa38310fb418358c5678696e1b12bc4288539b876ea8fec18b5e837f2a5fd39  _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
-387f8130d341f819ee289d14cbb2bc6e5cab338b88662e6f84fbd85dab8417ad  _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
-24ec72c4b3b0b74222f9c0959683b44394cb1e8454fbcfa1b24c021d1c3fcab8  _output/bin/containerd/linux-arm64/ctr
+6a694014fa1685a9a0d7f9b9664b097b26a6a166ecc294218a028ff3b2b5e1f8  _output/bin/containerd/linux-amd64/containerd
+d3324c6687ebd6adaae582499c628e7eb7757fa90c0c01128aa9680bae9bce42  _output/bin/containerd/linux-amd64/containerd-shim
+833804758eb35c23ef46900ab76e15f7fb7f849f886f4a53ada326c9cdc41a58  _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
+d3ee7b4857716d42544fb1ba9421d03d18a7286d5d3b06f428bcaa96500d8bc9  _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
+0cc7f807b17891bc1a4eec12aedd14e160a6caa840b1be11c7b83e7f59cdc984  _output/bin/containerd/linux-amd64/ctr
diff --git a/projects/containerd/containerd/GIT_TAG b/projects/containerd/containerd/GIT_TAG
@@ -1 +1 @@
-v1.7.24
+v1.7.25
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.24-blue)
+![Version](https://img.shields.io/badge/version-v1.7.25-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.24). 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.25). 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.