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/init.sh: move node config generation to Go #25380

Merged
merged 2 commits into from May 26, 2023

Conversation

rgo3
Copy link
Contributor

@rgo3 rgo3 commented May 11, 2023

This PR refactors node_config.h generation code in init.sh to Go. In order for this to work properly the function that initially creates node_config.h had to move to Reinitialize().

Fixes: #25378

@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 May 11, 2023
@rgo3 rgo3 added sig/loader Impacts the loading of BPF programs into the kernel. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. labels May 11, 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 May 11, 2023
@rgo3
Copy link
Contributor Author

rgo3 commented May 11, 2023

/test

@rgo3 rgo3 force-pushed the initsh-remove-nodeconfig-gen branch from ac8a933 to 660411d Compare May 15, 2023 16:46
@rgo3
Copy link
Contributor Author

rgo3 commented May 15, 2023

/test

@rgo3 rgo3 force-pushed the initsh-remove-nodeconfig-gen branch from 660411d to c07e265 Compare May 16, 2023 09:29
@rgo3
Copy link
Contributor Author

rgo3 commented May 16, 2023

/test

@rgo3 rgo3 force-pushed the initsh-remove-nodeconfig-gen branch from c07e265 to faf869f Compare May 16, 2023 13:02
@rgo3
Copy link
Contributor Author

rgo3 commented May 16, 2023

/test

@rgo3
Copy link
Contributor Author

rgo3 commented May 16, 2023

NB: I have removed the #ifndef ... #endif block around CILIUM_NET_MAC as it was a bit cumbersome to get this to work with the cDefinesMap and I think it is not actually needed? Hope a reviewer can confirm.

@rgo3 rgo3 requested a review from ti-mo May 16, 2023 13:15
@rgo3 rgo3 marked this pull request as ready for review May 16, 2023 13:16
@rgo3 rgo3 requested review from a team as code owners May 16, 2023 13:16
Copy link
Member

@pippolo84 pippolo84 left a comment

Choose a reason for hiding this comment

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

LGTM for agent related changes 🚀

@rgo3 rgo3 added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label May 23, 2023
@rgo3 rgo3 force-pushed the initsh-remove-nodeconfig-gen branch from faf869f to 2d05a49 Compare May 23, 2023 16:58
@rgo3 rgo3 removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label May 23, 2023
rgo3 added 2 commits May 24, 2023 16:34
This commit moves the generation of node_config.h into
Reinitialize(). This is needed for following commits that
move node config generation logic from init.sh to Go but
depend on other initialization steps happening in
Reinitialize().

Signed-off-by: Robin Gögge <r.goegge@isovalent.com>
This refactors writes to node_config.h in init.sh to a Go implementation
and centralizes most writes to node_config.h in writeNodeConfigHeader().

Signed-off-by: Robin Gögge <r.goegge@isovalent.com>
@rgo3 rgo3 force-pushed the initsh-remove-nodeconfig-gen branch from 2d05a49 to 4efde2e Compare May 24, 2023 14:44
@rgo3
Copy link
Contributor Author

rgo3 commented May 24, 2023

/test

@ti-mo ti-mo merged commit 84a5a24 into cilium:main May 26, 2023
58 checks passed
@ti-mo ti-mo deleted the initsh-remove-nodeconfig-gen branch May 26, 2023 08:00
@ti-mo
Copy link
Contributor

ti-mo commented May 26, 2023

Nice work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. sig/loader Impacts the loading of BPF programs into the kernel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

init.sh: move node_config.h header generation to Go
4 participants