Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flannel CNI plugin #5322

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Conversation

manuelbuil
Copy link
Contributor

@manuelbuil manuelbuil commented Jan 25, 2024

Proposed Changes

This PR adds flannel CNI plugin as an option for rke2. The reasoning is covered in the adr: #5145

Please only review the commit Add CNI plugin flannel support for Windows. The other one is covered in the PR: #5276, which abstracts the interface so that more CNI plugins can be used

Types of Changes

New feature

Verification

Use cni: flannel when deploying rke2

Testing

Linked Issues

#5215

User-Facing Change

Flannel added as CNI plugin option

Further Comments

@dereknola
Copy link
Contributor

Does this build on #5276?

@manuelbuil
Copy link
Contributor Author

Does this build on #5276?

Yes! There are two commits in this PR. One is #5276. I can't merge it yet because of code freeze. Once I merge it, this PR will only have one commit. I probably should write that in the description

@brandond
Copy link
Contributor

brandond commented Jan 25, 2024

GitHub doesn't have proper support for stacked PRs yet, unfortunately... so the best you can do is just call out in the comments that it's depending on another PR:

Blocked on:

Ref: https://blog.logrocket.com/using-stacked-pull-requests-in-github/

@manuelbuil manuelbuil force-pushed the addFlannelWin3 branch 3 times, most recently from c36e63e to 65d11da Compare February 8, 2024 17:26
Signed-off-by: Manuel Buil <mbuil@suse.com>
@manuelbuil
Copy link
Contributor Author

This PR should be tested together with #5421 which fixes a few minor issues

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants