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.

Sign up for GitHub

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

Jump to bottom

CNI: add host-side interface info to cni.Result #26518

Merged
merged 1 commit into from Jun 29, 2023
Merged

CNI: add host-side interface info to cni.Result #26518

merged 1 commit into from Jun 29, 2023

Conversation

nayihz
Copy link
Contributor

@nayihz nayihz commented Jun 28, 2023

Fixes: #24899

Add host-side interface info to cni.Result, which allows bandwidth CNI to work with Cilium

@nayihz nayihz requested a review from a team as a code owner June 28, 2023 02:22
@nayihz nayihz requested a review from squeed June 28, 2023 02:22
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jun 28, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Jun 28, 2023
@nayihz nayihz mentioned this pull request Jun 28, 2023
Closed
squeed
squeed approved these changes Jun 28, 2023
View reviewed changes
Copy link
Contributor

@squeed squeed left a comment

Choose a reason for hiding this comment

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

One minor request, then looks good!

plugins/cilium-cni/main.go Show resolved Hide resolved
@borkmann
Copy link
Member 

Add host-side interface info to cni.Result, which allows bandwidth CNI to work with Cilium

Off topic and unrelated to the fix, have you considered using Cilium's bandwidth manager? https://docs.cilium.io/en/stable/network/kubernetes/bandwidth-manager/

@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label Jun 28, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jun 28, 2023
@tklauser tklauser added release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/misc This PR makes changes that have no direct user impact. labels Jun 28, 2023
@tommyp1ckles tommyp1ckles self-requested a review June 28, 2023 15:23
@tommyp1ckles
Copy link
Contributor

mirroring +1 from last pr which was closed: #24901

@tommyp1ckles
Copy link
Contributor

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 28, 2023
@tklauser tklauser added dont-merge/bad-bot To prevent MLH from marking ready-to-merge. and removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Jun 28, 2023
@tklauser
Copy link
Member 

Add host-side interface info to cni.Result, which allows bandwidth CNI to work with Cilium

Off topic and unrelated to the fix, have you considered using Cilium's bandwidth manager? https://docs.cilium.io/en/stable/network/kubernetes/bandwidth-manager/

Issue #24899 which this PR fixes mentions "we cannot use cilium bandwidthManager because our os kernel version is too low to meet the requirements.".

@nayihz @tklauser
add host-side interface info to cni.Result
bd3ef30 
This commit adds host-side interface name and
mac address to cni.Result according to CNI Specification
(https://www.cni.dev/docs/spec/#section-5-result-types)

Signed-off-by: czybjtu <smartczy@outlook.com>
@tklauser
Copy link
Member

/test

@tklauser tklauser added area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. and removed dont-merge/bad-bot To prevent MLH from marking ready-to-merge. labels Jun 28, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 28, 2023
@tklauser tklauser merged commit 2b3d8a6 into cilium:main Jun 29, 2023
65 checks passed
@nayihz nayihz deleted the add_hostside_veth_info branch June 29, 2023 09:19
@gandro gandro added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Jun 29, 2023
@gandro
Copy link
Member

gandro commented Jun 29, 2023

Marking for backport since this is a bug fix.

@joamaki joamaki mentioned this pull request Jul 5, 2023
Merged
23 tasks
@joamaki joamaki added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jul 5, 2023
@jibi jibi added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Jul 10, 2023
@joestringer joestringer mentioned this pull request Jul 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squeed squeed squeed approved these changes

@tommyp1ckles tommyp1ckles tommyp1ckles approved these changes

Assignees
No one assigned
Labels
area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cilium CNI cannot be used in combination with bandwidth CNI
8 participants
@nayihz @borkmann @tommyp1ckles @tklauser @gandro @squeed @jibi @joamaki