[release-1.30] Render CNI dir config whenever vars are set #11821
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RKE2 on Windows sets CNI bin dirs in node config even though embedded flannel is disabled (NoFlannel=true). We need to gate rendering this config on the vars being, set NOT on NoFlannel being false. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
fix-cni-dirs-windows_release-1.30
branch
from
10da29a to
6e4c2cb
Compare
dereknola
approved these changes
Feb 20, 2025
mdrahman-suse
approved these changes
Feb 20, 2025
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
fix-cni-dirs-windows_release-1.30
branch
from
a0064de to
a07fa53
Compare
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
fix-cni-dirs-windows_release-1.30
branch
from
a07fa53 to
f678210
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release-1.30 #11821 +/- ##
================================================
- Coverage 48.12% 45.70% -2.42%
================================================
Files 206 206
Lines 19688 19688
================================================
- Hits 9475 8999 -476
- Misses 8832 9370 +538
+ Partials 1381 1319 -62
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Render CNI dir config whenever vars are set
RKE2 on Windows sets CNI dirs in node config even though embedded flannel is disabled (NoFlannel=true). We need to gate rendering this config on the vars being, set NOT on NoFlannel being false.
All other configurations (K3s on Windows and Linux, RKE2 on Linux) worked fine, but RKE2 on Windows was relying on this config section not being in a conditional within the template.
Types of Changes
rke2 windows regression fix
Verification
Test RKE2 in Windows.
Testing
TODO on rke2 side.
Linked Issues
rancher/rke2#7793
User-Facing Change
Further Comments