[Windows] Create a common CNI interface and config struct #5276
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
pkg/windows/calico.go
Outdated
| @@ -60,11 +60,11 @@ users: | |||
| calicoConfigTemplate = template.Must(template.New("CalicoConfig").Funcs(replaceSlashWin).Parse(`{ | |||
| "name": "{{ .Name }}", | |||
| "windows_use_single_network": true, | |||
| "cniVersion": "{{ .CNI.Version }}", | |||
| "cniVersion": "0.3.1", | |||
There was a problem hiding this comment.
is it necessary to hard-code the CNI version?
There was a problem hiding this comment.
No, it is not. I don't know why I thought it was a good idea :). Let me add it as part of the config
manuelbuil
force-pushed
the
createCNIInterface
branch
from
5d4d453
to
e839225
Compare
manuelbuil
force-pushed
the
createCNIInterface
branch
3 times, most recently
from
d3df342
to
c6fee0e
Compare
rbrtbnfgl
approved these changes
Jan 22, 2024
dereknola
approved these changes
Jan 22, 2024
brandond
approved these changes
Jan 22, 2024
manuelbuil
force-pushed
the
createCNIInterface
branch
2 times, most recently
from
f827656
to
9d4ea8f
Compare
Signed-off-by: Manuel Buil <mbuil@suse.com>
manuelbuil
force-pushed
the
createCNIInterface
branch
from
9d4ea8f
to
57fcca8
Compare
Merged
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
As rke2-windows will have two CNI plugin options: calico and flannel, we should abstract the current code so that it gets easier and cleaner to include flannel. This PR tries to achieve that.
Changes:
This is part of the Flannel PR I am preparing but that PR is getting too large, hence I decided to split it into a couple of PRs to simplify reviewing and reduce the risk of introducing bugs
Types of Changes
New Feature
Verification
This is basically a refactoring of code. It does not introduce any new feature. Therefore, what would be great is a verification that rke2-windows-calico is still working and no regression was introduced by this PR
Testing
Linked Issues
#5275
#5215
User-Facing Change
Further Comments