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 etcd to v3.5.11 #3956

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Bump etcd to v3.5.11 #3956

merged 1 commit into from
Jan 19, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jan 18, 2024

Description

https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3511-2023-12-07

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

@twz123 twz123 added area/controlplane component/etcd chore backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch labels Jan 18, 2024
@twz123 twz123 added this to the 1.29 milestone Jan 19, 2024
@twz123 twz123 marked this pull request as ready for review January 19, 2024 09:43
@twz123 twz123 requested a review from a team as a code owner January 19, 2024 09:43
@twz123 twz123 requested review from kke and jnummelin January 19, 2024 09:43
@twz123 twz123 enabled auto-merge January 19, 2024 09:43
@twz123 twz123 merged commit 7cc7ae8 into k0sproject:main Jan 19, 2024
78 checks passed
@twz123 twz123 deleted the bump-etcd branch January 19, 2024 09:45
@k0s-bot
Copy link

k0s-bot commented Jan 19, 2024

Backport failed for release-1.28, 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.28
git worktree add -d .worktree/backport-3956-to-release-1.28 origin/release-1.28
cd .worktree/backport-3956-to-release-1.28
git switch --create backport-3956-to-release-1.28
git cherry-pick -x 89f45a7d4bed986bc19d30def3f27cd25b4b69d9

@twz123 twz123 removed the backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch label Jan 19, 2024
@twz123
Copy link
Member Author

twz123 commented Jan 19, 2024

Okay, no backports. There's OpenTelemetry dependency conflicts, once again.

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