Merge pull request #2267 from flatcar/containerd-1.7.21-main

Upgrade Containerd in main from 1.7.20 to 1.7.21
flatcar · Aug 30, 2024 · 5765727 · 5765727
2 parents d953260 + 907cbfd
commit 5765727
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/changelog/updates/2024-08-30-containerd-1.7.21-update.md b/changelog/updates/2024-08-30-containerd-1.7.21-update.md
@@ -0,0 +1 @@
+- containerd ([1.7.21](https://github.com/containerd/containerd/releases/tag/v1.7.21))
diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest
@@ -1,4 +1,4 @@
 DIST containerd-1.7.1.tar.gz 9682254 BLAKE2B f168070caf2b76f0be350a98f41bfdbfe6d78344d68821fb92a29f839a6e847d795e5b79436e36f985aa88028ff1c3f44f134cf6bd502ddac22453a457bd952b SHA512 e9b00ba8f4dd1b5b1088060d3822f684611d43b367ddfeb1bee1660140af85f31e9c9bfc600a67e8fc8645a625dc4e1919d9af7291bdeaa607bff7065a4fc945
 DIST containerd-1.7.2.tar.gz 9688701 BLAKE2B d31cd0e96bb2675390cc63d06114e37d532b7c666b3ffc5b0087dfcef8de23559471f08bf8a52b164c5f645faf1b8102ab2ccdd8ec417a1c74336097f0c3a899 SHA512 c0d4c02991b7e9fc341c4ef3df2d93097f5854a51b99596ed95436a79f7a586820bb8bb7c17fc43b5f38d97ea942e59490fbbf6c9710391ef9caae3d34627bc5
-DIST containerd-1.7.20.tar.gz 10183160 BLAKE2B 440df5c0f9d7f450899a78628c2ca95c9deaf2b675132f715d11a1eaff9ce9bd2ff9436bf91700bee42e589da36dd86af8eb6ef85d46a5902ffd97a791759d15 SHA512 b8be3a073c1716d66cd97162b0f40cab68094df9f8a9eaf81fa617c552d51f536d41d2823838e01e4e3936fe0ae8af0352531b1682623c25dc2318cd9af32985
+DIST containerd-1.7.21.tar.gz 10188737 BLAKE2B 0a3eef5bd97b4249963d6e6b80652e2abef0ac7ece726d15efc3b1d364b3525ac7602afecfde3d376bdbec7d5ca39636e09dd8d2a96c420012ef4232afc2a6dd SHA512 fba998c8d7f2907b3e5fb09c3947c3272661ec33379c611c5110ca0151812adcd70ff6b837e97a5d4228d685902276eeb98cd82bb4c46149686e169e81943c75
 DIST containerd-1.7.6.tar.gz 9714550 BLAKE2B 863df1a8ab0f0fe6ec62893ed64824763c1b5230fe830fa268820ce0d6254c79e1ac62ab1261a74785b86b01dff83ea9109a899857fa47a48f2cf2eaf298fea8 SHA512 8b7e13c6ea544754ba7d53092d143f3fd2224b9bc874a33d8a00b781e719927f1b22ad5cd1e35b7b95e4890e630f4b92308549a970587ccdf9dbb8eb470e2703
diff --git a/...iners/containerd/containerd-1.7.20.ebuild → ...iners/containerd/containerd-1.7.21.ebuild b/...iners/containerd/containerd-1.7.20.ebuild → ...iners/containerd/containerd-1.7.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 inherit go-module systemd
-GIT_REVISION=8ccfc03e4e2b73c22899202ae09d0caf906d3863
+GIT_REVISION=174e0d1785eeda18dc2beba45e1d5a188771636b
 
 DESCRIPTION="A daemon to control runC"
 HOMEPAGE="https://containerd.io/"

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -8,7 +8,7 @@
 # (the following packages are "unstable" upstream; we're stabilising these)
 
 # Handled by automation
-=app-containers/containerd-1.7.20 ~amd64 ~arm64 # DO NOT EDIT THIS LINE. Added by containerd-apply-patch.sh on 2024-07-19 08:17:43
+=app-containers/containerd-1.7.21 ~amd64 ~arm64 # DO NOT EDIT THIS LINE. Added by containerd-apply-patch.sh on 2024-08-30 08:19:45
 
 # Keep versions on both arches in sync.
 =app-containers/cri-tools-1.27.0 ~arm64