Skip to content

Commit

Permalink
Bump containerd/containerd to latest release (aws#2869)
Browse files Browse the repository at this point in the history
* Bump containerd/containerd to latest release

* Update checksums for containerd/containerd

---------

Co-authored-by: Abhay Krishna Arunachalam <arnchlm@amazon.com>
  • Loading branch information
eks-distro-pr-bot and abhay-krishna authored Feb 8, 2024
1 parent 22f6e56 commit a6dff97
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 18 deletions.
2 changes: 1 addition & 1 deletion UPSTREAM_PROJECTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ projects:
repos:
- name: containerd
versions:
- tag: v1.7.12
- tag: v1.7.13
go_version: "1.20"
- org: distribution
repos:
Expand Down
11 changes: 7 additions & 4 deletions projects/containerd/containerd/ATTRIBUTION.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

** github.com/container-orchestrated-devices/container-device-interface; version v0.6.1 --
https://github.com/cncf-tags/container-device-interface

** github.com/containerd/aufs; version v1.0.0 --
https://github.com/containerd/aufs

Expand All @@ -17,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.12 --
** github.com/containerd/containerd; version v1.7.13 --
https://github.com/containerd/containerd

** github.com/containerd/continuity; version v0.4.2 --
Expand Down Expand Up @@ -245,6 +242,12 @@ 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 --
https://github.com/cncf-tags/container-device-interface

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


Apache License
Version 2.0, January 2004
Expand Down
20 changes: 10 additions & 10 deletions projects/containerd/containerd/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
91749df27bb808563765cd70e4d5dbd31c866ed4ef8de3448a9fec7b943a5026 _output/bin/containerd/linux-amd64/containerd
dc557637403f6738ef64005264b73af837a44e0bcf6dd64c8a6f04317d954ed9 _output/bin/containerd/linux-amd64/containerd-shim
e7601e6932204a5f0760daf58ccd431f91166c23566e638dca372ab9360b8077 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
96addbf8d427c5560557d21c3167789e90d6d3a59dd75673439e08d6500eb54f _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
b07138cbf160b923fbae9ebded121e24f6b81d402fedcd77e8f56fa409757dbc _output/bin/containerd/linux-amd64/ctr
39aa0aa519c7bebbedb227aeefcf4d32a7595f83b85700ccbec8669a6a53dcb6 _output/bin/containerd/linux-arm64/containerd
d53487120a1eec77a251066e3e38c08d71cee1d7d9954be48a019ae185579fa3 _output/bin/containerd/linux-arm64/containerd-shim
555be3753d0d178565f09abcdb1c4f4158355bb1621e820043e099b8a30d91cf _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
7b8c25a9387a0ae349790980e27dacdc3d430b22a24c2290cc049bac5c8cb399 _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
8419c0d447d904f2100b689b36d9df4eed86fd9eb11a2d2364c10cc06d6e8fe1 _output/bin/containerd/linux-arm64/ctr
372726c90ba291ae395d924ee65aabeb12bdcbfd62127de781d877561c9b20d2 _output/bin/containerd/linux-amd64/containerd
753c238a37c85676702b22885abd701ef772172c1a7b02b070d1d6d951fc8310 _output/bin/containerd/linux-amd64/containerd-shim
f1c8dd4a8b5214622b4847486516823a57f7d0e7b013461c5f41473d6063c555 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1
03de58fca99466c4122411edfee652b6b077ea94bbb994181b6c354cb5bc5a9f _output/bin/containerd/linux-amd64/containerd-shim-runc-v2
b7b3bd8446e64de19206e1c853d7f3a2fd387666f11b80a2310e5dc6ccb78f13 _output/bin/containerd/linux-amd64/ctr
91d9e87cd01eecdfbf1a36beb4d72a20ea9d95520dabc83362e4e21c3175f07d _output/bin/containerd/linux-arm64/containerd
871737bcec5d71166b0c7e2e9bb6b5282b10148edb075cd1be2cfb0169439688 _output/bin/containerd/linux-arm64/containerd-shim
f8f7b2d52ff9006a37f403228d9ca41f62c4b9e64faf8c90e01aeedce3ec780b _output/bin/containerd/linux-arm64/containerd-shim-runc-v1
9fdc2c5c06e8ad4919bd2e88b00c8feed8990a2b86965aedf1509943f0cf7d3f _output/bin/containerd/linux-arm64/containerd-shim-runc-v2
44e0a2d85755eb94b33e9330611ec7bbad0b93cd8c684246ea90f87fc7812c6a _output/bin/containerd/linux-arm64/ctr
2 changes: 1 addition & 1 deletion projects/containerd/containerd/GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.7.12
v1.7.13
4 changes: 2 additions & 2 deletions projects/containerd/containerd/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **containerd**
![Version](https://img.shields.io/badge/version-v1.7.12-blue)
![Version](https://img.shields.io/badge/version-v1.7.13-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.12). 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.13). 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

0 comments on commit a6dff97

Please sign in to comment.