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

bpf, cilium/cmd: remove unused hidden cilium bpf migrate-map sub-command #25196

Merged
merged 2 commits into from May 2, 2023

Conversation

tklauser
Copy link
Member

The cilium bpf migrate-map sub-command was introduced in 4305f92
("cilium-migrate-map: port from from C to Go") as a temporary CLI
wrapper around the logic to migrate bpf maps from bpf/init.sh. Since
commit d38dda4 ("init.sh,loader: load overlay programs in Go") that
task is performed from within the agent using the same Go code and thus
making the migrate-map sub-command obsolete. The sub-command is hidden
and was only used in bpf/init.sh, so remove it directly without
deprecating it first.

It's unused in the datapath since commit bd31f7d ("datapath: Drop
nodeport_must_drop_remote constraint").

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. labels Apr 28, 2023
@tklauser tklauser requested review from a team as code owners April 28, 2023 13:45
@tklauser tklauser added the area/cli Impacts the command line interface of any command in the repository. label Apr 28, 2023
…mmand

The `cilium bpf migrate-map sub-command` was introduced in 4305f92
("cilium-migrate-map: port from C to Go") as a temporary CLI wrapper
around the logic to migrate bpf maps from bpf/init.sh. Since commit
d38dda4 ("init.sh,loader: load overlay programs in Go") that task
is performed from within the agent using the same Go code and thus
making the migrate-map sub-command obsolete. The sub-command is hidden
and was only used in bpf/init.sh, so remove it directly without
deprecating it first.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser force-pushed the pr/tklauser/rm-cilium-migrate-map branch from 4b2c1f0 to 097e8f0 Compare April 28, 2023 13:47
Copy link
Contributor

@ti-mo ti-mo left a comment

Choose a reason for hiding this comment

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

Thanks! 😁 🚀 How did you notice?

@tklauser
Copy link
Member Author

tklauser commented Apr 28, 2023

How did you notice?

Merge conflicts when rebasing one of my WIP branches where I had hacks in bpf/init.sh, got curious, checked d38dda4 and noticed that cilium bpf migrate-maps isn't used anywhere else anymore 😁

@tklauser
Copy link
Member Author

/test

@tklauser
Copy link
Member Author

tklauser commented Apr 28, 2023

Copy link
Member

@dylandreimerink dylandreimerink left a comment

Choose a reason for hiding this comment

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

LGTM!

@tklauser
Copy link
Member Author

tklauser commented May 2, 2023

/ci-e2e

@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 May 2, 2023
@tklauser tklauser merged commit 2ce813c into main May 2, 2023
57 checks passed
@tklauser tklauser deleted the pr/tklauser/rm-cilium-migrate-map branch May 2, 2023 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli Impacts the command line interface of any command in the repository. 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. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants