Skip to content

[v1.17] chore(deps): revert etcd bump to v3.6.0 #39628

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

Merged
merged 1 commit into from
May 20, 2025

Conversation

giorio94
Copy link
Member

Partially revert eee00a6 ("chore(deps): update all-dependencies") to undo the etcd upgrade to v3.6.0. This matches the newly adopted policy of only performing patch version upgrades in stable branches, to prevent introducing unnecessary churn due to possible API changes.

It is safe to revert this change, as not part of any release.

@giorio94 giorio94 added area/clustermesh Relates to multi-cluster routing functionality in Cilium. area/kvstore Impacts the KVStore package interactions. labels May 20, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.17 This PR represents a backport for Cilium 1.17.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels May 20, 2025
@giorio94 giorio94 added dependencies Pull requests that update a dependency file and removed kind/backports This PR provides functionality previously merged into master. backport/1.17 This PR represents a backport for Cilium 1.17.x of a PR that was merged to main. labels May 20, 2025
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Thanks :)

Partially revert eee00a6 ("chore(deps): update all-dependencies")
to undo the etcd upgrade to v3.6.0. This matches the newly adopted policy
of only performing patch version upgrades in stable branches, to prevent
introducing unnecessary churn due to possible API changes.

It is safe to revert this change, as not part of any release.

Related: 592f7b0 ("renovate: only perform etcd patch version updates in stable branches")
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 force-pushed the pr/giorio94/v1.17/revert-etcd-bump branch from 84eefc8 to 346456b Compare May 20, 2025 11:27
@giorio94
Copy link
Member Author

Updated the commit message to reference the renovate change.

@giorio94
Copy link
Member Author

/test

@giorio94 giorio94 marked this pull request as ready for review May 20, 2025 12:44
@giorio94 giorio94 requested a review from a team as a code owner May 20, 2025 12:44
@giorio94 giorio94 enabled auto-merge May 20, 2025 12:45
@julianwiedmann julianwiedmann changed the title chore(deps): revert etcd bump to v3.6.0 [v1.17] chore(deps): revert etcd bump to v3.6.0 May 20, 2025
@joestringer
Copy link
Member

newly adopted policy

I thought this was a long-standing policy :) Was there a specific link for this? I guess that this page would be the obvious place to properly document the pattern.

@giorio94 giorio94 added this pull request to the merge queue May 20, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 20, 2025
Merged via the queue into v1.17 with commit a9f9c00 May 20, 2025
391 of 402 checks passed
@giorio94 giorio94 deleted the pr/giorio94/v1.17/revert-etcd-bump branch May 20, 2025 16:07
@giorio94
Copy link
Member Author

newly adopted policy

I thought this was a long-standing policy :) Was there a specific link for this? I guess that this page would be the obvious place to properly document the pattern.

This is specifically referring to the etcd binary bundled as part of the clustermesh-apiserver image, and (mostly as a byproduct) the etcd version used for integration tests. Currently, renovate was configured to perform the upgrade on stable branches as well together with the other dependencies, and we mostly noticed due to a minor incompatibility that caused clustermesh E2E tests to basically fail. This is the first time that this topic is being brought up because it is the first etcd minor release cut since we started directly bundling etcd as part of the clustermesh-apiserver image (Cilium v1.15 IIRC) for additional control, and to prevent issues due to version mismatches like this, while it used to be user-configurable before.

I think you may referring to the etcd go client version instead, which (similarly to the other go dependencies), is already configured to be only bumped on the main branch (and responsibility of the vendor team), to prevent unnecessary churn and the possible associated risks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/clustermesh Relates to multi-cluster routing functionality in Cilium. area/kvstore Impacts the KVStore package interactions. dependencies Pull requests that update a dependency file ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants