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

Bump containerd/containerd to latest release #3120

Merged
merged 2 commits into from
May 2, 2024
Merged

Bump containerd/containerd to latest release #3120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32f3463
Bump containerd/containerd to latest release
eks-distro-pr-bot May 2, 2024
0e0a821
Update checksums for containerd/containerd
abhay-krishna May 2, 2024
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
2 changes: 1 addition & 1 deletion UPSTREAM_PROJECTS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ projects:
repos:
- name: containerd
versions:
- tag: v1.7.15
- tag: v1.7.16
go_version: "1.21"
- org: distribution
repos:
Expand Down
8 changes: 4 additions & 4 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.15 --
** github.com/containerd/containerd; version v1.7.16 --
https://github.com/containerd/containerd

** github.com/containerd/continuity; version v0.4.2 --
Expand All @@ -35,7 +35,7 @@ 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.0 --
** github.com/containerd/nri; version v0.6.1 --
https://github.com/containerd/nri

** github.com/containerd/ttrpc; version v1.2.3 --
Expand Down Expand Up @@ -242,10 +242,10 @@ https://github.com/kubernetes-sigs/json
** sigs.k8s.io/structured-merge-diff/v4/value; version v4.2.3 --
https://github.com/kubernetes-sigs/structured-merge-diff

** tags.cncf.io/container-device-interface; version v0.6.2 --
** tags.cncf.io/container-device-interface; version v0.7.2 --
https://github.com/cncf-tags/container-device-interface

** tags.cncf.io/container-device-interface/specs-go; version v0.6.0 --
** tags.cncf.io/container-device-interface/specs-go; version v0.7.0 --
https://github.com/cncf-tags/container-device-interface


Expand Down
20 changes: 10 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,10 @@
5d63cb5c1fa78cf9c3d0bc040dee71853f93fdc35f3b1134ce1bc811564a0486 _output/bin/containerd/linux-amd64/containerd
fa104860bdb724681b43dcb97b6002983afe9a48b1bbfc3be917aba5d8bb1c5f _output/bin/containerd/linux-amd64/containerd-shim
17fb78562d44e6d1fa0800f15c8d78b1eea97ba2182ca6b374766f6455350c72 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
d1522f149b6d1e6193bfe55a7bf1078cc1edd4461a92aac14307fed7748e225c _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
27fc10021c75015029ebba902a23becde2e73b8fa9694a575ebf4ebadbaeafb0 _output/bin/containerd/linux-amd64/ctr
6c5cea9d58ff62694763aec9928f4918ce306206d67a26b899a348558ae0b3e1 _output/bin/containerd/linux-arm64/containerd
4e77e9f7c2af27cc0964fdff05cabccdcaa107957a5cc472998b89203eee0dad _output/bin/containerd/linux-arm64/containerd-shim
d250b62d01490be035c660cacb5fe8280ef988780aef89e74b4f9287e32fda87 _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
c3cea7c17284f1117cc83a2412abef968ad8bb8a350faea2e55a4f26470170f1 _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
cf12ccdd0e02756c163809cecbd70482ab4f665a5377412208e71b86a18340cf _output/bin/containerd/linux-arm64/ctr
efbc721c8b6f596ecf5ad0a8b25af4b1b3d4827cc4d2dd0a0d79542b90dd589e _output/bin/containerd/linux-amd64/containerd
972d8faf3d673c99a9517cfc77ae2ea0ce848b3b368bc2b33a7614e852686ed0 _output/bin/containerd/linux-amd64/containerd-shim
024d83b977db6fb9e4d68a1475f32d09aeefc92594d8edc326f1a3ff8f43b215 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
2bf85d9f612e5809c0c9a8c807640266371181c927e17c946d01d7c30d4f2700 _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
ba65b7c96a3ffdd37835c8373d2a4ec9e3e346b5a691949b9dbd942627834981 _output/bin/containerd/linux-amd64/ctr
e0971266f44bc32d76a411ce75147e988946c748c3ef1c3177ad8d5749d8a910 _output/bin/containerd/linux-arm64/containerd
4e0f02b34621a1318bb475972d3743fd47364edde87fcedfb0831255cc926c08 _output/bin/containerd/linux-arm64/containerd-shim
65b42f73de2da31e5c5e16841fcfc8785aa093a0b8dcf3e48a1e0f4604e36271 _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
2b166974bb654c5716aabb58e002bde451b18ac251869e7cc005d8311c3684e3 _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
9b3cd0e1ed5e72a9e74c828678978a33cbdcdbdd15cd7db0c897fc400d0f0146 _output/bin/containerd/linux-arm64/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.15
v1.7.16
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.15-blue)
![Version](https://img.shields.io/badge/version-v1.7.16-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.15). 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.16). 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