Skip to content

Conversation

gandro
Copy link
Member

@gandro gandro commented Nov 22, 2023

This commit makes plugins/cilium-cni a proper Go package. This will make it easier to re-use parts of the Cilium CNI plugin out of tree. The first commit (which adds a CNI label source) is also done for that purpose. It already has been used by out-of-tree Cilium API users.

Review per commit

This PR contains no functional changes, besides allowing CNI plugin modifications out-of-tree.

@gandro gandro added kind/cleanup This includes no functional changes. area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. labels Nov 22, 2023
@gandro gandro requested a review from tklauser November 22, 2023 16:45
@gandro gandro requested review from a team as code owners November 22, 2023 16:45
@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 Nov 22, 2023
@gandro gandro added the release-note/misc This PR makes changes that have no direct user impact. label Nov 22, 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 Nov 22, 2023
@gandro
Copy link
Member Author

gandro commented Nov 22, 2023

/test

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Thanks

@gandro
Copy link
Member Author

gandro commented Nov 27, 2023

Rebased due to conflict on main.

@nathanjsweet @tommyp1ckles Could I get a review on this? I'd like to merge this before the feature freeze in 3 days.

This will be used for labels added by the CNI plugin.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
This commit moves the files implementing the `cilium-cni` binary
to a different directory and does not contain any functional changes.

In the next commit, we will restructure the package and bring back the
`plugins/main.go`.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
This commit makes `plugins/cilium-cni/cmd` a proper package and moves
the `main` entry point again back to it's original location. This will
make it easier to re-use parts of the Cilium CNI plugin. Other than
that, this commit contains no functional changes.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro force-pushed the pr/gandro/cni-plugin-as-go-package branch from efd5349 to c0e2346 Compare November 27, 2023 11:01
@gandro
Copy link
Member Author

gandro commented Nov 27, 2023

/test

@squeed squeed self-requested a review November 28, 2023 16:05
@gandro gandro removed the request for review from tommyp1ckles November 28, 2023 16:10
@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 Nov 28, 2023
@squeed squeed added this pull request to the merge queue Nov 28, 2023
Merged via the queue into cilium:main with commit 1aa21ec Nov 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants