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

Bump containerd to 1.7.7 #3567

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Bump containerd to 1.7.7 #3567

merged 2 commits into from
Oct 25, 2023

Conversation

ncopa
Copy link
Collaborator

@ncopa ncopa commented Oct 10, 2023

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

Description

Fixes # (issue)

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

@ncopa ncopa requested a review from a team as a code owner October 10, 2023 11:40
@ncopa ncopa requested review from twz123 and jnummelin October 10, 2023 11:40
jnummelin
jnummelin previously approved these changes Oct 11, 2023
@jnummelin
Copy link
Member

@ncopa To which release branches this should be backported? Once you figure that out, could you add the necessary labels for the automation?

@twz123 twz123 added area/containers chore component/containerd backport/release-1.27 PR that needs to be backported/cherrypicked to release-1.27 branch backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch labels Oct 13, 2023
@twz123
Copy link
Member

twz123 commented Oct 13, 2023

Rebased to pick up CI fixes and added labels.

@twz123
Copy link
Member

twz123 commented Oct 18, 2023

Rebased to resolve merge conflicts.

@twz123 twz123 requested a review from jnummelin October 18, 2023 19:59
@ncopa ncopa enabled auto-merge October 19, 2023 07:37
@ncopa ncopa merged commit 7e07582 into k0sproject:main Oct 25, 2023
74 checks passed
@k0s-bot
Copy link

k0s-bot commented Oct 25, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-1.27
git worktree add -d .worktree/backport-3567-to-release-1.27 origin/release-1.27
cd .worktree/backport-3567-to-release-1.27
git checkout -b backport-3567-to-release-1.27
ancref=$(git merge-base c43f019f01eb5e78a4dcf595675c948c8cf0bfec 786e19d01c323e8704df1fe110d6d283fbeb7214)
git cherry-pick -x $ancref..786e19d01c323e8704df1fe110d6d283fbeb7214

@k0s-bot
Copy link

k0s-bot commented Oct 25, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-1.28
git worktree add -d .worktree/backport-3567-to-release-1.28 origin/release-1.28
cd .worktree/backport-3567-to-release-1.28
git checkout -b backport-3567-to-release-1.28
ancref=$(git merge-base c43f019f01eb5e78a4dcf595675c948c8cf0bfec 786e19d01c323e8704df1fe110d6d283fbeb7214)
git cherry-pick -x $ancref..786e19d01c323e8704df1fe110d6d283fbeb7214

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

Successfully merging this pull request may close these issues.

4 participants