Remove pointless ENABLE_ACLK/ENABLE_CLOUD split.
#17529
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
area/packaging
thiagoftsm
previously approved these changes
May 1, 2024
Ferroin
force-pushed
the
fixup-enable-cloud
branch
from
ead5231
to
4eb7b38
Compare
|
Rebased to pick up latest changes, also added a bit more cleanup. |
thiagoftsm
previously approved these changes
May 1, 2024
vkalintiris
reviewed
May 16, 2024
| @@ -156,6 +155,8 @@ mark_as_advanced(BUILD_FOR_PACKAGING) | |||
| cmake_dependent_option(FORCE_LEGACY_LIBBPF "Force usage of libbpf 0.0.9 instead of the latest version." False "ENABLE_PLUGIN_LIBBPF" False) | |||
| mark_as_advanced(FORCE_LEGACY_LIBBPF) | |||
|
|
|||
| set(ENABLE_ACLK ${ENABLE_CLOUD}) | |||
There was a problem hiding this comment.
Why do we need this and simply not use ENABLE_CLOUD throughout?
There was a problem hiding this comment.
My intent here was to avoid changing C code in this PR (we use ENABLE_ACLK in essentially all places in the C code at the moment) because changing it would have made the PR massive and much harder to review, and thus theoretically would have delayed getting it merged. I plan to do a followup to convert the C code once this is merged, which will get rid of this bit of the CMakeLists file as well.
This is a holdover from years ago when we had multiple versions of the agent-cloud link in our code. These days, everything in the code cares only about ENABLE_ACLK, and ENABLE_CLOUD is just used in the claiming script.
Ferroin
force-pushed
the
fixup-enable-cloud
branch
from
4eb7b38
to
4aeb26b
Compare
|
Rebased to resolve merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The distinction is a holdover from years ago when we had multiple versions of the agent-cloud link in our code. These days, everything in the code cares only about
ENABLE_ACLK, andENABLE_CLOUDis just used in the claiming script.This PR:
ENABLE_CLOUDcheck in the claiming script so that it looks at only the things that the agent code looks at to determine cloud support.ENABLE_CLOUDoption and define as it now does nothing.ENABLE_ACLKCMake option toENABLE_CLOUD, because that is properly descriptive of what the option actually does.Test Plan
Local testing is required for this PR.