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

Modify networking to enable integration with K3s #3252

Merged
merged 3 commits into from
Jun 12, 2023

Conversation

milan-zededa
Copy link
Contributor

This PR is related to the integration of EVE with K3s (#3210) and covers the networking part.
For now we will support specifically only the (default) Flannel CNI.
It turns out that it is necessary to propagate routes created for Flannel's bridge cni0 into the per-port routing tables (managed by NIM).

Copy link
Contributor

@naiming-zededa naiming-zededa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some separate detailed comments, but let's kick off tests.

Copy link
Member

@uncleDecart uncleDecart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I'd address comment on DNS traffic and perhaps squash this commits while merging, that'll make it easy to rebase just in case

@milan-zededa
Copy link
Contributor Author

LGTM, I'd address comment on DNS traffic and perhaps squash this commits while merging, that'll make it easy to rebase just in case

I could squash, but I didn't want the Naiming's contribution to disappear, hence I kept his commits :)

@milan-zededa milan-zededa force-pushed the k3s-networking branch 3 times, most recently from 6cde70b to 54df19b Compare June 5, 2023 10:07
Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Run eden again

@milan-zededa
Copy link
Contributor Author

Resolved merge conflicts

@eriknordmark
Copy link
Contributor

Seems like we have some issues in master causing ztests failures. Let's wait until those are resolved and then retest and merge this PR.

@eriknordmark
Copy link
Contributor

@milan-zededa Makes sense to rebase this on master so we can get reasonable test results.

naiming-zededa and others added 3 commits June 10, 2023 13:47
Signed-off-by: Naiming Shen <naiming@zededa.com>
Signed-off-by: Naiming Shen <naiming@zededa.com>
This enables communication between K3s API server (listening on a port IP
address) and other K3s components (listening on IPs from the pod subnet).

Signed-off-by: Milan Lenco <milan@zededa.com>
@milan-zededa
Copy link
Contributor Author

milan-zededa commented Jun 10, 2023

Makes sense to rebase this on master so we can get reasonable test results.

@eriknordmark Done, rebased.

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Run eden

@eriknordmark eriknordmark merged commit 28f9271 into lf-edge:master Jun 12, 2023
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.

4 participants