Skip to content

Commit 6ec600e

Browse files
Bump containerd/containerd to latest release
1 parent 7bb2c46 commit 6ec600e

File tree

6 files changed

+46
-46
lines changed

6 files changed

+46
-46
lines changed

UPSTREAM_PROJECTS.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ projects:
6969
repos:
7070
- name: containerd
7171
versions:
72-
- tag: v1.7.28
73-
go_version: "1.23"
72+
- tag: v1.7.29
73+
go_version: "1.24"
7474
- org: distribution
7575
repos:
7676
- name: distribution

projects/containerd/containerd/ATTRIBUTION.txt

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ https://github.com/containerd/cgroups/v3
1414
** github.com/containerd/console; version v1.0.3 --
1515
https://github.com/containerd/console
1616

17-
** github.com/containerd/containerd; version v1.7.28 --
17+
** github.com/containerd/containerd; version v1.7.29 --
1818
https://github.com/containerd/containerd
1919

2020
** github.com/containerd/containerd/api; version v1.8.0 --
@@ -1130,42 +1130,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11301130

11311131
------
11321132

1133-
** golang.org/go; version go1.23.12 --
1133+
** golang.org/go; version go1.24.6 --
11341134
https://github.com/golang/go
11351135

1136-
** k8s.io/apimachinery/third_party/forked/golang; version v0.27.4 --
1137-
https://github.com/kubernetes/apimachinery
1138-
1139-
Copyright (c) 2009 The Go Authors. All rights reserved.
1140-
1141-
Redistribution and use in source and binary forms, with or without
1142-
modification, are permitted provided that the following conditions are
1143-
met:
1144-
1145-
* Redistributions of source code must retain the above copyright
1146-
notice, this list of conditions and the following disclaimer.
1147-
* Redistributions in binary form must reproduce the above
1148-
copyright notice, this list of conditions and the following disclaimer
1149-
in the documentation and/or other materials provided with the
1150-
distribution.
1151-
* Neither the name of Google Inc. nor the names of its
1152-
contributors may be used to endorse or promote products derived from
1153-
this software without specific prior written permission.
1154-
1155-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1156-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1157-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1158-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1159-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1160-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1161-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1162-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1163-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1164-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1165-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1166-
1167-
------
1168-
11691136
** golang.org/x/crypto; version v0.40.0 --
11701137
https://golang.org/x/crypto
11711138

@@ -1290,6 +1257,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12901257

12911258
------
12921259

1260+
** k8s.io/apimachinery/third_party/forked/golang; version v0.27.4 --
1261+
https://github.com/kubernetes/apimachinery
1262+
1263+
Copyright (c) 2009 The Go Authors. All rights reserved.
1264+
1265+
Redistribution and use in source and binary forms, with or without
1266+
modification, are permitted provided that the following conditions are
1267+
met:
1268+
1269+
* Redistributions of source code must retain the above copyright
1270+
notice, this list of conditions and the following disclaimer.
1271+
* Redistributions in binary form must reproduce the above
1272+
copyright notice, this list of conditions and the following disclaimer
1273+
in the documentation and/or other materials provided with the
1274+
distribution.
1275+
* Neither the name of Google Inc. nor the names of its
1276+
contributors may be used to endorse or promote products derived from
1277+
this software without specific prior written permission.
1278+
1279+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1280+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1281+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1282+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1283+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1284+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1285+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1286+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1287+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1288+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1289+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1290+
1291+
------
1292+
12931293
** github.com/davecgh/go-spew/spew; version v1.1.1 --
12941294
https://github.com/davecgh/go-spew
12951295

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
41e52757ddac9db24e756ea80d34cb8111ca20915f6e84c6f520c0b1c7ef4f34 _output/bin/containerd/linux-amd64/containerd
2+
9a67d4616ac3463a2667c82628d9198c516d32d3368614465505695419cf0db6 _output/bin/containerd/linux-amd64/containerd-shim
3+
4d2df7a0734a04424a7a45e7c64fcfd3ecbbfc32f19041037479ec49fee6a6a9 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
4+
3bf9b475951c0d8be46e379e9cece9efe11c8490e74d362bf1b9db842a40c02e _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
5+
c115412b924388dd34c8f026e7ff874fff7f690677dbbb26f8b00739baacdddd _output/bin/containerd/linux-amd64/ctr
16
70966ec5377f454af4aa285f09f5e4d29df7f96ffcea03c1354b526dc51423e4 _output/bin/containerd/linux-arm64/containerd
27
e616e2fedb66639c0404cfc2e209803014bd0f7afc6e1cb2e17747e9ddbfa738 _output/bin/containerd/linux-arm64/containerd-shim
38
2314b5a8c7bf30bcf0a64bc559694cda7c0c41b0ce57d5f9f3f4b3739e3df637 _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
49
cb3aa6dffd074f474cb79a4ad03da7b2ac371a9b846ae1e85153d8d08ddaa6ef _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
510
530f7f9b7773469cfdce6cdd83ec0e349553dc25b6a83eecd26f81c1876d443c _output/bin/containerd/linux-arm64/ctr
6-
9af28b7ea1d758caa8be736c9cf34479864d2e6ae9afcde147bbc70ca8aaa01e _output/bin/containerd/linux-amd64/containerd
7-
962dbd28fd404e11ae34649ed52200d8e57c510a6926391928a8b9be63ef5518 _output/bin/containerd/linux-amd64/containerd-shim
8-
5d53036487f251020f97205b564fdd293f9f9de81885f95e3ba21671422f6d77 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
9-
00269523504889b69675b684671845b48dbd8d585d6e2350d1a4b39667760b5f _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
10-
11cf39f58b902311aa24b6c6c88a433c06e41b1b92d081b646222246e36dcbc9 _output/bin/containerd/linux-amd64/ctr
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.7.28
1+
v1.7.29
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23
1+
1.24

projects/containerd/containerd/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## **containerd**
2-
![Version](https://img.shields.io/badge/version-v1.7.28-blue)
2+
![Version](https://img.shields.io/badge/version-v1.7.29-blue)
33
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTWhoMS9lejNIZmxuZzB2NThxU1N5VXNoVVR3MlNWYVBqajA4M3QwN3BERHRjN3oxSGxCcmk4R3pqVVU0aVVHYVVsRnVReU5pdnRRQ1FGQ2djT0pmbjVzPSIsIml2UGFyYW1ldGVyU3BlYyI6ImpGdnQ4d05CL21Lbjdsa0oiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
44

55
[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 @@
1010
[repo](https://github.com/containerd/containerd) and decide on new version.
1111
1. Update the `GIT_TAG` file to have the new desired version based on the upstream release tags.
1212
1. Compare the old tag to the new, looking specifically for Makefile changes.
13-
ex: [1.6.20 compared to 1.6.21](https://github.com/containerd/containerd/compare/v1.6.20...v1.7.28). Check the release [dockerfile](https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile)
13+
ex: [1.6.20 compared to 1.6.21](https://github.com/containerd/containerd/compare/v1.6.20...v1.7.29). Check the release [dockerfile](https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile)
1414
and [Makefile](https://github.com/containerd/containerd/blob/main/Makefile#L99) for any build flag changes, tag changes, dependencies, etc.
1515
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)
1616
should be considered the source of truth.

0 commit comments

Comments
 (0)