From 721663e19184f8b4229745cf3067f4142b662052 Mon Sep 17 00:00:00 2001 From: EKS Distro PR Bot Date: Sat, 6 Apr 2024 08:09:30 +0000 Subject: [PATCH] Bump containerd/containerd to latest release --- UPSTREAM_PROJECTS.yaml | 2 +- projects/containerd/containerd/ATTRIBUTION.txt | 6 +++--- projects/containerd/containerd/CHECKSUMS | 15 +++++---------- projects/containerd/containerd/GIT_TAG | 2 +- projects/containerd/containerd/README.md | 4 ++-- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 70f85277cd..9bcb7523e1 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -73,7 +73,7 @@ projects: repos: - name: containerd versions: - - tag: v1.7.14 + - tag: v1.7.15 go_version: "1.21" - org: distribution repos: diff --git a/projects/containerd/containerd/ATTRIBUTION.txt b/projects/containerd/containerd/ATTRIBUTION.txt index 09931d9d9e..158584e84d 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.14 -- +** github.com/containerd/containerd; version v1.7.15 -- https://github.com/containerd/containerd ** github.com/containerd/continuity; version v0.4.2 -- @@ -810,7 +810,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.3 -- +** github.com/golang/protobuf; version v1.5.4 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. @@ -1142,7 +1142,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.31.0 -- +** google.golang.org/protobuf; version v1.33.0 -- 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 index 2bbe8b72b5..c3061662cc 100644 --- a/projects/containerd/containerd/CHECKSUMS +++ b/projects/containerd/containerd/CHECKSUMS @@ -1,10 +1,5 @@ -7d402165ea90d53581b12569586ebe202f9b00a75b824aa93587d84cbb326415 _output/bin/containerd/linux-amd64/containerd -ae56d07271d24139eeb021d55667bcb841282e93f976e4c97afd26be6b71122a _output/bin/containerd/linux-amd64/containerd-shim -9db2d6592eec200fb441c5e6562f7a840fdda198b20a2953624f91de93b21036 _output/bin/containerd/linux-amd64/containerd-shim-runc-v1 -744f667fe559118cc82fef0e9fdc51a8554917c76529b60bb01b4eb29527ef74 _output/bin/containerd/linux-amd64/containerd-shim-runc-v2 -eb916bb32ab8041c0c77d79152c6c240f2a183f33f633e8699db8e9df46f16c7 _output/bin/containerd/linux-amd64/ctr -16baec827ffaca0e10587aa351be7ec8cbd439e1cfe7ad878ff1e6819825b2be _output/bin/containerd/linux-arm64/containerd -1401aea94df72a0b75a19b41c56a5468edf0fe21e4ed459d25f6900a38f90944 _output/bin/containerd/linux-arm64/containerd-shim -dfd3bfa63cc0fae041c4dfe370fcaf97d3f4914e825066d725cf748ad7933e76 _output/bin/containerd/linux-arm64/containerd-shim-runc-v1 -2b83589fd369dd86580ee731b5a6e4adb09581cd4c965fac24458d67c198ae39 _output/bin/containerd/linux-arm64/containerd-shim-runc-v2 -2cdae54a5ea34ec45e6a1dabaabf4b8ec6ada3b26779cd7f0bd19cf54d9fcac5 _output/bin/containerd/linux-arm64/ctr +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 diff --git a/projects/containerd/containerd/GIT_TAG b/projects/containerd/containerd/GIT_TAG index 25aa920d90..2af46cc3f3 100644 --- a/projects/containerd/containerd/GIT_TAG +++ b/projects/containerd/containerd/GIT_TAG @@ -1 +1 @@ -v1.7.14 +v1.7.15 diff --git a/projects/containerd/containerd/README.md b/projects/containerd/containerd/README.md index 98d3174e3e..c3df4c96af 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.14-blue) +![Version](https://img.shields.io/badge/version-v1.7.15-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.14). 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.15). 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.