Level rke2-flannel CNI plugin config with k3s #556
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
brandond
approved these changes
Nov 5, 2024
manuelbuil
approved these changes
Nov 5, 2024
|
@rbrtbnfgl any concern? Mine is only with rke2-windows but it does not use the chart option for the config, so it should not affect it |
|
lgtm but there appear to be issues with the packageversion |
|
Happy to fix if I did the version bump wrong |
manuelbuil
requested changes
Nov 6, 2024
This change follows how k3s configures flannel mostly, including adding the `bandwidth` plugin, except for leaving the cni version the same. Most importantly and the main reason for this change, this adds `"forceAddress": true` to handle when the `cni0` interface, `/run/flannel/subnet.env`, and node's podCIDR don't match, without requiring an rke2 service restart/ manual `cni0` intervention.
brandond
approved these changes
Nov 6, 2024
manuelbuil
approved these changes
Nov 7, 2024
|
@Apsu is it ok if we add this in the December release? We are already moving Flannel one minor version in the November release. I don't expect any problem but it's certainly a potential source of problems |
|
Oh no problem at all. Thanks for being cautious! |
|
I created an issue in RKE2 to track missing bandwidth plugin support: rancher/rke2#7244 |
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.
This change follows how k3s configures flannel mostly, including adding the
bandwidthplugin, except for leaving the cni version the same.Most importantly and the main reason for this change, this adds
"forceAddress": trueto handle when thecni0interface,/run/flannel/subnet.env, and node'spodCIDRdon't match, without requiring an rke2 service restart/manualcni0intervention.Reference: https://github.com/k3s-io/k3s/blob/master/pkg/agent/flannel/setup_linux.go
Issue:
bandwidthCNI plugin) does not work withcni: flannelrke2#7244