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

Improve Makefile to ease debugging #26159

Merged

Conversation

pippolo84
Copy link
Member

Add the ability to override variables in Makefile for debugging purposes. This is done including (when available) an additional Makefile.override file.
Also, refactor the operator Dockerfile to remove fixed paths and rely on the ones defined in Makefile.defs, just like we do for the agent Dockerfile.

@pippolo84 pippolo84 added release-note/misc This PR makes changes that have no direct user impact. area/build Anything to do with the build, more general then area/CI labels Jun 13, 2023
@pippolo84 pippolo84 requested review from a team as code owners June 13, 2023 09:06
@pippolo84 pippolo84 requested a review from tklauser June 13, 2023 09:06
@pippolo84
Copy link
Member Author

Runtime test (privileged) failure tracked in #26233, rerunning

@pippolo84

This comment was marked as outdated.

The Dockerfile used to build the operator images uses fixed paths as
destination and binary directories.  The commit changes this to use the
variables defined in Makefile.defs, just like in the agent Dockerfile.

Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
Add the ability to override Makefile variables using an additional
Makefile.override file for debugging purposes.

Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@pippolo84 pippolo84 force-pushed the pr/pippolo84/Makefiles-Dockerfiles-improvement branch from ac1304c to 7824047 Compare June 14, 2023 15:49
@pippolo84
Copy link
Member Author

/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 14, 2023
@tklauser tklauser merged commit b256fbd into cilium:main Jun 15, 2023
59 of 65 checks passed
michi-covalent added a commit to cilium/cilium-cli that referenced this pull request Mar 20, 2024
Include Makefile.override if the file exists to allow overriding Make
variables without modifying Makefile. Copied from cilium/cilium#26159.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
michi-covalent added a commit to cilium/cilium-cli that referenced this pull request Mar 21, 2024
- Include Makefile.override if the file exists to allow overriding Make
  variables without modifying Makefile. Copied from cilium/cilium#26159.
- Define GO_BUILD_LDFLAGS to use with default and local-release targets
  so that these targets consistently use the same ldflags without having
  to update multiple places. It also makes it easier to override ldflags
  with Makefile.override.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
tklauser pushed a commit to cilium/cilium-cli that referenced this pull request Mar 22, 2024
- Include Makefile.override if the file exists to allow overriding Make
  variables without modifying Makefile. Copied from cilium/cilium#26159.
- Define GO_BUILD_LDFLAGS to use with default and local-release targets
  so that these targets consistently use the same ldflags without having
  to update multiple places. It also makes it easier to override ldflags
  with Makefile.override.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build Anything to do with the build, more general then area/CI 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.

None yet

2 participants