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.

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

[Backport release-1.30] Bump containerd to v1.7.20 #4806

Merged

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jul 24, 2024

Backport to release-1.30:

https://github.com/containerd/containerd/releases/tag/v1.7.20

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit 8ca91ea)
@twz123 twz123 added area/containers chore component/containerd backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch labels Jul 24, 2024
@twz123 twz123 marked this pull request as ready for review July 24, 2024 21:27
@twz123 twz123 requested a review from a team as a code owner July 24, 2024 21:27
@twz123 twz123 requested review from ncopa and makhov July 24, 2024 21:27
@twz123 twz123 merged commit ac8a929 into k0sproject:release-1.30 Jul 25, 2024
86 checks passed
@twz123 twz123 deleted the backport-4799-to-release-1.30 branch July 25, 2024 09:35
@k0s-bot
Copy link

k0s-bot commented Jul 25, 2024

Backport failed for release-1.29, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.29
git worktree add -d .worktree/backport-4806-to-release-1.29 origin/release-1.29
cd .worktree/backport-4806-to-release-1.29
git switch --create backport-4806-to-release-1.29
git cherry-pick -x 17cab278c49f5153a453fdb27de14f7a6b199d01

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/containers backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch chore component/containerd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants