Skip to content

fix: change etcd to 3.5.24#2978

Merged
redscholar merged 1 commit intokubesphere:3.xfrom
redscholar:etcd-3.5.24
Jan 26, 2026
Merged

fix: change etcd to 3.5.24#2978
redscholar merged 1 commit intokubesphere:3.xfrom
redscholar:etcd-3.5.24

Conversation

@redscholar
Copy link
Copy Markdown
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

Does this PR introduced a user-facing change?


Additional documentation, usage docs, etc.:


Signed-off-by: redscholar <[email protected]>
@kubesphere-prow
Copy link
Copy Markdown

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@kubesphere-prow kubesphere-prow Bot added do-not-merge/release-note-label-needed kind/bug Categorizes issue or PR as related to a bug. labels Jan 26, 2026
@kubesphere-prow
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: redscholar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubesphere-prow kubesphere-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 26, 2026
@gemini-code-assist
Copy link
Copy Markdown

Summary of Changes

Hello @redscholar, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a bug by updating the default etcd version used in the system to v3.5.24. This ensures that new deployments or configurations will leverage the latest stable patch release of etcd, incorporating any recent bug fixes or minor enhancements from the upstream project. The change involves updating a version constant and adding corresponding checksums for the new version.

Highlights

  • Etcd Version Update: The default etcd version has been updated from v3.5.22 to v3.5.24.
  • Checksums Added: SHA256 checksums for etcd v3.5.24 have been added for both amd64 and arm64 architectures.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@kubesphere-prow kubesphere-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 26, 2026
@redscholar redscholar added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2026
@sonarqubecloud
Copy link
Copy Markdown

@redscholar redscholar merged commit 44214fe into kubesphere:3.x Jan 26, 2026
3 of 6 checks passed
@redscholar redscholar deleted the etcd-3.5.24 branch January 26, 2026 07:45
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the default etcd version from v3.5.22 to v3.5.24. The changes are correctly implemented in cmd/kk/apis/kubekey/v1alpha2/default.go and version/components.json. The new version and its checksums are added while maintaining the existing structure. The changes appear to be correct and complete for this version bump.

@redscholar
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-3.1

@ks-ci-bot
Copy link
Copy Markdown
Contributor

@redscholar: #2978 failed to apply on top of branch "release-3.1":

Applying: fix: change etcd to 3.5.24
Using index info to reconstruct a base tree...
M	cmd/kk/apis/kubekey/v1alpha2/default.go
M	version/components.json
Falling back to patching base and 3-way merge...
Auto-merging version/components.json
CONFLICT (content): Merge conflict in version/components.json
Auto-merging cmd/kk/apis/kubekey/v1alpha2/default.go
CONFLICT (content): Merge conflict in cmd/kk/apis/kubekey/v1alpha2/default.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: change etcd to 3.5.24
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-3.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ks-ci-bot
Copy link
Copy Markdown
Contributor

@redscholar: new issue created for failed cherrypick: #2979

Details

In response to this:

/cherry-pick release-3.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/release-note-label-needed kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants