Fixed windows CNI setup in case cni none is configured

[rbrtbnfgl]

Proposed Changes

Check if the cni configured is none before doing the setup on windows to fix the panic error. (#6768)

Types of Changes

Verification

Testing

Linked Issues

#6819

User-Facing Change

Further Comments

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 25.11%. Comparing base (5d229c9) to head (654130d).
Report is 1 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #6820   +/-   ##
=======================================
  Coverage   25.11%   25.11%           
=======================================
  Files          33       33           
  Lines        2839     2839           
=======================================
  Hits          713      713           
  Misses       2079     2079           
  Partials       47       47           

Flag	Coverage Δ
inttests	9.54% <ø> (ø)
unittests	17.75% <ø> (ø)

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.

[brandond]

This is just below another block that is switching on CNIName, adding another if statement checking its value feels wrong.

Just move the p.KubeConfigKubeProxy = nodeConfig.AgentConfig.KubeConfigKubeProxy line above restConfig, err := ..., and add a return nil to the CNINone case.

[rbrtbnfgl]

I didn't want to change the code too much but logically you're right. Initially the Setup was inside the switch case for calico but when flannel was added it was moved outside without considering the possible fail with cni: none