Use and version flannel/cni-plugin properly

[brandond]

Proposed Changes

Use and version flannel/cni-plugin properly

Moves us closer to using the proper upstream for our flannel CNI plugin, instead of the snapshot that is vendored into our plugins fork. In the future, we can drop the flannel plugin from our fork entirely, to better align with the upstream plugins project. It will also ensure that fixes like flannel-io/cni-plugin#46 are no longer accidentally omitted from making it into k3s.

Types of Changes

tech debt

Verification

Check versions - note that flannel cni plugin version is no longer the same as the flannel version

/ # flannel --version
CNI Plugin flannel version v1.4.0-flannel1 (linux/amd64) commit HEAD built on 2024-03-04T18:48:37Z
CNI protocol versions supported: 0.1.0, 0.2.0, 0.3.0, 0.3.1, 0.4.0, 1.0.0

/ # cni --version
CNI plugins plugin v1.4.0-k3s2
CNI protocol versions supported: 0.1.0, 0.2.0, 0.3.0, 0.3.1, 0.4.0, 1.0.0

Testing

Linked Issues

• Drop flannel/cni-plugin from our fork of containernetworking/plugins #9636

User-Facing Change

The embedded flannel cni-plugin binary is now built and versioned separate from the rest of the cni plugins and the embedded flannel controller.

Further Comments

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 42.94%. Comparing base (513c341) to head (150f15b).
Report is 7 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #9635      +/-   ##
==========================================
- Coverage   45.88%   42.94%   -2.94%     
==========================================
  Files         151      154       +3     
  Lines       13509    13564      +55     
==========================================
- Hits         6198     5825     -373     
- Misses       6080     6561     +481     
+ Partials     1231     1178      -53     

Flag	Coverage Δ
e2etests	?
inttests	39.52% <ø> (?)
unittests	15.94% <ø> (?)

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.