Skip to content

[release-1.34] Move data dir into position before creating CNI symlinks#12876

Merged
brandond merged 1 commit into
k3s-io:release-1.34from
brandond:fix-cni-bin-target_release-1.34
Sep 8, 2025
Merged

[release-1.34] Move data dir into position before creating CNI symlinks#12876
brandond merged 1 commit into
k3s-io:release-1.34from
brandond:fix-cni-bin-target_release-1.34

Conversation

@brandond

@brandond brandond commented Sep 5, 2025

Copy link
Copy Markdown
Member

Proposed Changes

Move data dir into position before creating CNI symlinks

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.

Types of Changes

Bugfix

Verification

See linked issue - user will probably need to validate as this is a fairly odd configuration.

Testing

Linked Issues

User-Facing Change

Further Comments

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 <brad.davidson@rancher.com>
@brandond
brandond requested a review from a team as a code owner September 5, 2025 20:41
@codecov

codecov Bot commented Sep 5, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 20.47%. Comparing base (4d1f1af) to head (d92de0b).
⚠️ Report is 2 commits behind head on release-1.34.

❗ There is a different number of reports uploaded between BASE (4d1f1af) and HEAD (d92de0b). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (4d1f1af) HEAD (d92de0b)
e2etests 1 0
Additional details and impacted files
@@                Coverage Diff                @@
##           release-1.34   #12876       +/-   ##
=================================================
- Coverage         40.62%   20.47%   -20.16%     
=================================================
  Files               185      182        -3     
  Lines             18937    18869       -68     
=================================================
- Hits               7694     3863     -3831     
- Misses            10063    14570     +4507     
+ Partials           1180      436      -744     
Flag Coverage Δ
e2etests ?
unittests 20.47% <ø> (+0.01%) ⬆️

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 merged commit 25b528b into k3s-io:release-1.34 Sep 8, 2025
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants