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.31] Bump etcd to v3.5.18 #5560

Merged
merged 6 commits into from
Feb 25, 2025

Conversation

@twz123 twz123 added area/controlplane component/etcd chore backport/release-1.30 PR that needs to be backported/cherrypicked to the release-1.30 branch labels Feb 7, 2025
dependabot bot and others added 6 commits February 24, 2025 13:20
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)
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)
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)
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)
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)
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)
@twz123 twz123 force-pushed the backport-5555-to-release-1.31 branch from 56452a6 to f8168cc Compare February 24, 2025 12:21
@twz123 twz123 marked this pull request as ready for review February 24, 2025 13:32
@twz123 twz123 requested a review from a team as a code owner February 24, 2025 13:32
@twz123 twz123 requested review from makhov and jnummelin February 24, 2025 13:32
@ncopa ncopa merged commit ea19626 into k0sproject:release-1.31 Feb 25, 2025
91 checks passed
@k0s-bot
Copy link

k0s-bot commented Feb 25, 2025

Backport failed for release-1.30, 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.30
git worktree add -d .worktree/backport-5560-to-release-1.30 origin/release-1.30
cd .worktree/backport-5560-to-release-1.30
git switch --create backport-5560-to-release-1.30
git cherry-pick -x bed9e926cc88af6c2fc0de04203b1b1eba302198 37f4447d34add8b88fe5e740dfb9961da8ec52e8 766eb9d2709a68bc6fcbc2ea074968431eac955f 46bba99c47c3c05ce3a9d73e004c3aa932233510 b9623c8ab11fc3b1086a80200b0517d389a6d757 f8168cc7a2c7db0ba683aeb2a3831681cdfc0f1d

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

Successfully merging this pull request may close these issues.

3 participants