Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.32] Backports for 2025-09 #12886

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
Merged
merged 15 commits into from
Sep 8, 2025
Merged

[release-1.32] Backports for 2025-09 #12886

merged 15 commits into from
Sep 8, 2025

Conversation

@brandond
Copy link
Member

@brandond brandond commented Sep 8, 2025 •
edited
Loading

Proposed Changes

Backports:

Types of Changes

backports

Verification

see linked issues

Testing

Linked Issues

User-Facing Change

* Wire cri-dockerd --log-level=debug up to k3s --debug flag
* Fix spegel logging and startup sequence
* Update to runc v1.2.7
* Do not bootstrap etcd-only nodes from existing supervisor
* Add retry on etcd MemberAdd timeout
* Bump containerd to v2.1.4
* Retry CRD creation in case of conflict
* Wire up kine metrics
* Fix etcd join timeout handling
* Bump k3s-root to v0.15.0
* Move data dir into position before creating CNI symlinks

Further Comments

@brandond
Wire cri-dockerd --log-level=debug up to k3s --debug flag
a0aacf6 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 6ab8b42)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Fix spegel logging and startup sequence
d7cf67b 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 356bd5d)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Update to runc v1.2.7
1ea2955 
Requires switch from github.com/opencontainers/runc/libcontainer/cgroups -> github.com/opencontainers/cgroups

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0254ca3)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Do not bootstrap etcd-only nodes from existing supervisor
96887b0 
Changes to how we bootstrap the agent and apiserver address list have
made this unnecessary since 5014c9e was merged, and it is creating
problems due to only etcd-only nodes not using their own config.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0ec4740)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Add retry on etcd MemberAdd timeout
14355f2 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit a9016f3)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond force-pushed the 2025-09-backports_release-1.32 branch 2 times, most recently from 55a1742 to e408f3d Compare September 8, 2025 20:48
@codecov
Copy link

codecov bot commented Sep 8, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 4.58716% with 104 lines in your changes missing coverage. Please review.
✅ Project coverage is 20.16%. Comparing base (fe896f7) to head (83c5954).
⚠️ Report is 15 commits behind head on release-1.32.

Files with missing lines Patch % Lines
pkg/util/logger/logger.go 0.00% 40 Missing ⚠️
pkg/server/context.go 0.00% 33 Missing ⚠️
pkg/cli/server/server.go 0.00% 8 Missing ⚠️
pkg/etcd/etcd.go 12.50% 7 Missing ⚠️
pkg/spegel/spegel.go 0.00% 6 Missing ⚠️
pkg/agent/run.go 0.00% 4 Missing ⚠️
pkg/agent/cridockerd/cridockerd.go 0.00% 3 Missing ⚠️
pkg/server/server.go 0.00% 2 Missing ⚠️
pkg/agent/config/config.go 0.00% 1 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (fe896f7) and HEAD (83c5954). Click for more details.

HEAD has 4 uploads less than BASE
Flag BASE (fe896f7) HEAD (83c5954)
unittests 5 2
e2etests 1 0
Additional details and impacted files 
@@                Coverage Diff                @@
##           release-1.32   #12886       +/-   ##
=================================================
- Coverage         40.13%   20.16%   -19.98%     
=================================================
  Files               185      183        -2     
  Lines             19138    19130        -8     
=================================================
- Hits               7681     3857     -3824     
- Misses            10279    14837     +4558     
+ Partials           1178      436      -742
Flag Coverage Δ
e2etests ?
unittests 20.16% <4.58%> (-0.05%) ⬇️

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
Bump containerd to v2.1.4
226cd7f 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit e47c497)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Retry CRD creation in case of conflict
e511439 
Also cleans up some of the server.Context factory creation stuff to eliminate unused code paths and avoid registering the Helm controller when helm is disabled.

As of fe465cc we no longer call NewContext outside pkg/server, so the isServer bool flag to use the supervisor kubeconfig and create an event recorder is unnecessary.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 068a013)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Wire up kine metrics
c606ddb 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 795091a)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Fix etcd join timeout handling
aec6c9d 
Error is deadline exceeded, not cancelled

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit f1c8239)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump k3s-root to v0.15.0
f428b1f 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit ac9f834)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Upload integration test logs on failure
e9041f5 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 1ae5ec3)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump kine for metrics panic fix
263b1be 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit c837bfc)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump kine for compact_rev_key watch fix
3da7890 
Fix apiserver-managed compact, and enable it

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit f3a036a)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Fix caceertrotation test; add kine to matrix
a5bd551 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 4d1f1af)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Move data dir into position before creating CNI symlinks
83c5954 
Addresses issue where CNI bin symlinks were created with targets that were not yet valid, which caused external container runtimes that rely on filesystem notifications to detect changes to think that the bins did not exist.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b3ac144)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond force-pushed the 2025-09-backports_release-1.32 branch from e408f3d to 83c5954 Compare September 8, 2025 21:31
@brandond brandond marked this pull request as ready for review September 8, 2025 21:31
@brandond brandond requested a review from a team as a code owner September 8, 2025 21:31
@brandond brandond merged commit 40013a6 into k3s-io:release-1.32 Sep 8, 2025
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dereknola dereknola dereknola approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@brandond @dereknola