From 36b0f93389ee14e7b796e42d76ae383e9ea45f8d Mon Sep 17 00:00:00 2001 From: EKS Distro PR Bot Date: Wed, 18 Dec 2024 09:10:50 +0000 Subject: [PATCH] Bump containerd/containerd to latest release --- UPSTREAM_PROJECTS.yaml | 2 +- projects/containerd/containerd/ATTRIBUTION.txt | 2 +- projects/containerd/containerd/CHECKSUMS | 15 +++++---------- projects/containerd/containerd/GIT_TAG | 2 +- projects/containerd/containerd/README.md | 4 ++-- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index a51f9e2882..4dbec24f71 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -73,7 +73,7 @@ projects: repos: - name: containerd versions: - - tag: v1.7.23 + - tag: v1.7.24 go_version: "1.22" - org: distribution repos: diff --git a/projects/containerd/containerd/ATTRIBUTION.txt b/projects/containerd/containerd/ATTRIBUTION.txt index b125301f78..829e53e930 100644 --- 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.23 -- +** github.com/containerd/containerd; version v1.7.24 -- https://github.com/containerd/containerd ** github.com/containerd/containerd/api; version v1.7.19 -- diff --git a/projects/containerd/containerd/CHECKSUMS b/projects/containerd/containerd/CHECKSUMS index 456f8513fc..f61577b780 100644 --- a/projects/containerd/containerd/CHECKSUMS +++ b/projects/containerd/containerd/CHECKSUMS @@ -1,10 +1,5 @@ -22e5372271b51913542ed6884f286115efe129ff1ddbf47cd11d799a261b72a0 _output/bin/containerd/linux-amd64/containerd -fd8d08c191a1b91b07dd906fbb0056a37abaf0cd7fc66d495152cb335836943f _output/bin/containerd/linux-amd64/containerd-shim -d31b17389999f818af357a75c20c7c68fe90f4894f769da0d98e42715c7618f2 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1 -7b2bb6902faa14c206d6aef195c22e3b0c7ecb9f203e317c7d6ca167317d89c0 _output/bin/containerd/linux-amd64/containerd-shim-runc-v2 -45949d29c2b7c87b2f6cd2a154fd2fe453f056d10491cf694c9771fdec302669 _output/bin/containerd/linux-amd64/ctr -f617cecc46a65875fe0f185dadfbe496f3d048fc8eff4a61c291489718fa18d6 _output/bin/containerd/linux-arm64/containerd -ac0ba0afd5c3653f2b9e66d2fac17ff885a29306cf2b8998f2a552f44322f1d1 _output/bin/containerd/linux-arm64/containerd-shim -c20f29a41ed2328896836d6eca3630d351ed3ec9306b031942216c737f3380d2 _output/bin/containerd/linux-arm64/containerd-shim-runc-v1 -937b40d154153d518cbeba555de5e5a28407989f4b8e4ebddf0fc4ffd9187171 _output/bin/containerd/linux-arm64/containerd-shim-runc-v2 -8be16eb7ba6e395d92d59b6cdc00708844129c49c1cd94ec5191aa015938dfeb _output/bin/containerd/linux-arm64/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 diff --git a/projects/containerd/containerd/GIT_TAG b/projects/containerd/containerd/GIT_TAG index 32fb1dfc3b..00b33910d1 100644 --- a/projects/containerd/containerd/GIT_TAG +++ b/projects/containerd/containerd/GIT_TAG @@ -1 +1 @@ -v1.7.23 +v1.7.24 diff --git a/projects/containerd/containerd/README.md b/projects/containerd/containerd/README.md index 1ccaaeed29..df3be104ae 100644 --- 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.23-blue) +![Version](https://img.shields.io/badge/version-v1.7.24-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.23). 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.24). 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.