Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[release-1.32] Backports for 2025-03 #11919

Merged
merged 14 commits into from
Mar 7, 2025

Conversation

brandond
Copy link
Member

@brandond brandond commented Mar 7, 2025

Proposed Changes

Backports:

Types of Changes

backports

Verification

see linked issues

Testing

Linked Issues

User-Facing Change

Further Comments

brandond and others added 13 commits March 7, 2025 18:34
Static bin dir is first in search path and is on /var/lib/rancher/k3s volume, which can be persisted by users. If the volume is empty it will just fall back to the legacy /bin dir.

(cherry picked from commit b2d495e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6199b79)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…fig command

Signed-off-by: Somesh Bhalsing <somesh.bhalsing@gmail.com>
(cherry picked from commit 6131ea1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5894af3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Fixes issue where CA rotation would fail on servers with join URL set due to using old data from disk on other server

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 53fcadc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also wraps errors along the cluster prepare path to improve tracability.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 244bfd0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f940368)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…s ready

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e7b52cd)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Anders Larsson <anders.git@larsson.xyz>
(cherry picked from commit 8aa543e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 66d0f16)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
We are not making use of the stack traces that these functions capture, so we should avoid using them as unnecessary overhead.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bed1f66)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Interval is configurable with new etcd-snapshot-reconcile-interval flag

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d694dd1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0a47df6)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner March 7, 2025 19:01
Copy link

codecov bot commented Mar 7, 2025

Codecov Report

Attention: Patch coverage is 16.11570% with 406 lines in your changes missing coverage. Please review.

Project coverage is 44.90%. Comparing base (26e3fa9) to head (4407202).
Report is 14 commits behind head on release-1.32.

Files with missing lines Patch % Lines
pkg/cluster/bootstrap.go 10.12% 67 Missing and 4 partials ⚠️
pkg/cluster/cluster.go 14.28% 41 Missing and 1 partial ⚠️
pkg/etcd/snapshot.go 9.30% 39 Missing ⚠️
pkg/agent/config/config.go 0.00% 22 Missing ⚠️
pkg/etcd/etcd.go 14.28% 18 Missing ⚠️
pkg/cluster/storage.go 25.00% 15 Missing ⚠️
pkg/agent/run.go 0.00% 13 Missing ⚠️
pkg/cli/server/server.go 7.14% 12 Missing and 1 partial ⚠️
pkg/agent/containerd/containerd.go 0.00% 12 Missing ⚠️
pkg/agent/flannel/flannel.go 0.00% 11 Missing ⚠️
... and 47 more
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.32   #11919      +/-   ##
================================================
- Coverage         46.61%   44.90%   -1.72%     
================================================
  Files               206      190      -16     
  Lines             19509    19107     -402     
================================================
- Hits               9095     8580     -515     
- Misses             9117     9285     +168     
+ Partials           1297     1242      -55     
Flag Coverage Δ
e2etests 35.84% <10.52%> (-5.16%) ⬇️
inttests 35.30% <11.78%> (+0.19%) ⬆️
unittests 16.79% <7.85%> (+0.35%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@brandond brandond changed the title [release-1.32] Backports for 2025-02 [release-1.32] Backports for 2025-03 Mar 7, 2025
Signed-off-by: Derek Nola <derek.nola@suse.com>
@brandond brandond merged commit 7034b96 into k3s-io:release-1.32 Mar 7, 2025
54 checks passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants