Improve cni windows code #5421
Merged
Improve cni windows code #5421
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
Signed-off-by: Manuel Buil <mbuil@suse.com>
thomasferrandiz
approved these changes
Feb 12, 2024
rbrtbnfgl
approved these changes
Feb 12, 2024
Merged
|
I have just tested this deploying with Calico and Flannel and it works :) |
This was referenced Feb 12, 2024
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
This PR does a few things:
1 - Fixes a bug in calico which prevented pods from starting (config should have "Calico" instead of "calico")
2 - Increases time out to 30s. I saw twice during my tests that sometimes 20s is not enough for the interfaces to come back in Windows
3 - Similarly to Flannel, before starting Calico, we check if the node is present in kube-api to avoid potential issues
4 - Instead of using an infinite loop to start calico, we use
wait.PollImmediateWithContextwith a time out of 5 minutes5 - Flannel's
wait.PollImmediateWithContextnow return an errorTypes of Changes
Bugfix
Verification
Just verify that rke2 still works with flannel and calico
Testing
Linked Issues
#5415
User-Facing Change
Further Comments