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

[release-1.26] Bump containerd to v1.6.25 #3751

Merged
merged 3 commits into from
Dec 7, 2023

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Nov 24, 2023

Description

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

Includes a partial backport of the dependency bumps in:

See:

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

dependabot bot and others added 3 commits November 24, 2023 11:32
Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.9.0 to 1.9.2.
- [Release notes](https://github.com/sirupsen/logrus/releases)
- [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md)
- [Commits](sirupsen/logrus@v1.9.0...v1.9.2)

---
updated-dependencies:
- dependency-name: github.com/sirupsen/logrus
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit a857a29)
(cherry picked from commit ba2c991)
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.3...v1.8.4)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 110d50a)
(cherry picked from commit ed5091d)
@twz123 twz123 added area/containers chore component/containerd backport/release-1.25 PR that needs to be backported/cherrypicked to release-1.25 branch labels Nov 24, 2023
@twz123 twz123 requested a review from a team as a code owner November 24, 2023 10:37
@ncopa ncopa merged commit 72d5541 into k0sproject:release-1.26 Dec 7, 2023
73 checks passed
@k0s-bot
Copy link

k0s-bot commented Dec 7, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-1.25
git worktree add -d .worktree/backport-3751-to-release-1.25 origin/release-1.25
cd .worktree/backport-3751-to-release-1.25
git checkout -b backport-3751-to-release-1.25
ancref=$(git merge-base 2f6526bc6a721869050d28af289e3470d3484e05 b47ae8443bbd2bb1fe892dadc85810d9cf077950)
git cherry-pick -x $ancref..b47ae8443bbd2bb1fe892dadc85810d9cf077950

@twz123 twz123 deleted the bump-containerd-1.6.25 branch December 7, 2023 14:18
@twz123 twz123 removed the backport/release-1.25 PR that needs to be backported/cherrypicked to release-1.25 branch label Dec 7, 2023
@twz123
Copy link
Member Author

twz123 commented Dec 7, 2023

1.25 is eol anyways

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants