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.

Sign up for GitHub

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

Jump to bottom

[Backport release-1.30] Bump etcd to v3.5.18 #5611

Merged
merged 6 commits into from
Feb 25, 2025
Merged

[Backport release-1.30] Bump etcd to v3.5.18 #5611

merged 6 commits into from
Feb 25, 2025

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Feb 24, 2025 •
edited
Loading

@twz123 twz123 added area/controlplane component/etcd chore backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch labels Feb 24, 2025
@twz123
Copy link
Member Author

twz123 commented Feb 24, 2025

Needs to be rebased after #5610 has been merged.

dependabot bot and others added 6 commits February 25, 2025 11:55
@dependabot @jnummelin
build(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1
ef52547 
Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/golang-jwt/jwt/releases)
- [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md)
- [Commits](golang-jwt/jwt@v4.5.0...v4.5.1)

---
updated-dependencies:
- dependency-name: github.com/golang-jwt/jwt/v4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit 0bb9c3d)
(cherry picked from commit bed9e92)
@dependabot @jnummelin
Bump golang.org/x/tools from 0.27.0 to 0.28.0
14f776a 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.27.0 to 0.28.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.27.0...v0.28.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit 7436fbc)
(cherry picked from commit 37f4447)
@dependabot @jnummelin
Bump golang.org/x/sys from 0.28.0 to 0.29.0
9073332 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.28.0 to 0.29.0.
- [Commits](golang/sys@v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit 7a1150c)
(cherry picked from commit 766eb9d)
@dependabot @jnummelin
Bump golang.org/x/crypto from 0.31.0 to 0.32.0
c769724 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.31.0 to 0.32.0.
- [Commits](golang/crypto@v0.31.0...v0.32.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit c0cf704)
(cherry picked from commit 46bba99)
@dependabot @jnummelin
Bump golang.org/x/tools from 0.28.0 to 0.29.0
0ec1d96 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.28.0 to 0.29.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit 912a658)
(cherry picked from commit b9623c8)
@twz123 @jnummelin
Bump etcd to v3.5.18
3702c6f 
https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3518-2025-01-24

Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit c6413eb)
(cherry picked from commit ae22354)
(cherry picked from commit f8168cc)
@jnummelin jnummelin force-pushed the backport-5560-to-release-1.30 branch from 6a8bcd7 to 3702c6f Compare February 25, 2025 09:55
@twz123 twz123 mentioned this pull request Feb 25, 2025
Merged
@jnummelin jnummelin marked this pull request as ready for review February 25, 2025 11:43
@jnummelin jnummelin requested a review from a team as a code owner February 25, 2025 11:43
@jnummelin jnummelin requested review from kke and makhov February 25, 2025 11:43
@ncopa ncopa merged commit 096d04c into k0sproject:release-1.30 Feb 25, 2025
81 checks passed
@k0s-bot
Copy link

k0s-bot commented Feb 25, 2025

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-5611-to-release-1.29 origin/release-1.29
cd .worktree/backport-5611-to-release-1.29
git switch --create backport-5611-to-release-1.29
git cherry-pick -x ef525479b6cef58f58e86e9424e869649f716bf4 14f776aeb94cda95140bd8a05412ba5633fbbadb 9073332099e9b0c06a5a6ec2919483fea279c4f0 c769724aeba140f2f8928a9712b2fdffc25f5654 0ec1d9672494a86e5ebd6831d245f6d06f940b11 3702c6ff8a915e5b5755547c2958a20b358e0a0a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncopa ncopa ncopa approved these changes

@kke kke Awaiting requested review from kke kke is a code owner automatically assigned from k0sproject/k0s-maintainers

@makhov makhov Awaiting requested review from makhov makhov is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
area/controlplane backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch chore component/etcd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@twz123 @k0s-bot @ncopa