Skip to content

Conversation

@brandond
Copy link
Member

@brandond brandond commented Dec 5, 2025

Proposed Changes

  • Move Windows CNI startup into CNI - moves CNI config and setup out of KubeProxy and Kubelet functions into dedicated CNI function. In addition to having a more logical flow, this removes several notable indirect deps by eliminating references to the k3s embedded executor:
    github.com/bronze1man/goStrongswanVici
    github.com/cloudnativelabs/kube-router
    github.com/coreos/go-iptables
    github.com/flannel-io/flannel
    github.com/mdlayher/genetlink
    github.com/mdlayher/netlink
    github.com/mdlayher/socket
    golang.zx2c4.com/wireguard
    
  • Fix calico felix and confd not being restarted on exit
  • Fix flannel not being restarted on exit

Blocked on:

Types of Changes

bugfix, tech debt

Verification

See linked issue

Testing

Linked Issues

User-Facing Change

Further Comments

@brandond brandond requested a review from a team as a code owner December 5, 2025 19:45
@codecov-commenter
Copy link

codecov-commenter commented Dec 5, 2025

Codecov Report

❌ Patch coverage is 0.78125% with 127 lines in your changes missing coverage. Please review.
✅ Project coverage is 19.37%. Comparing base (acf308a) to head (e8b1e05).
⚠️ Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
pkg/windows/flannel.go 0.00% 55 Missing ⚠️
pkg/windows/calico.go 0.00% 50 Missing ⚠️
pkg/executor/pebinary/pebinary.go 0.00% 14 Missing ⚠️
pkg/windows/none.go 0.00% 6 Missing ⚠️
pkg/executor/staticpod/staticpod.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9339      +/-   ##
==========================================
- Coverage   19.52%   19.37%   -0.16%     
==========================================
  Files          47       48       +1     
  Lines        4016     4042      +26     
==========================================
- Hits          784      783       -1     
- Misses       3189     3216      +27     
  Partials       43       43              
Flag Coverage Δ
inttests 9.07% <0.00%> (-0.01%) ⬇️
unittests 14.19% <0.78%> (-0.12%) ⬇️

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 force-pushed the executor-cni branch 5 times, most recently from 9709cbb to b431488 Compare December 6, 2025 21:55
Removes several notable indirect deps by removing references to the
k3s embedded executor:

```
github.com/bronze1man/goStrongswanVici
github.com/cloudnativelabs/kube-router
github.com/coreos/go-iptables
github.com/flannel-io/flannel
github.com/mdlayher/genetlink
github.com/mdlayher/netlink
github.com/mdlayher/socket
golang.zx2c4.com/wireguard
```

Signed-off-by: Brad Davidson <[email protected]>
Moves CNI config and setup out of KubeProxy and Kubelet functions into dedicated CNI function

Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
CNI is now part of the executor, we no longer have to disable the K3s embedded CNI by setting the backend to none.

Signed-off-by: Brad Davidson <[email protected]>
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