app-emulation/amazon-ssm-agent: use upstream makefile#1572
Merged
Conversation
04df673 to
3ec03eb
Compare
jepio
reviewed
Jan 15, 2024
...ird_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-3.2.985.0-r3.ebuild
Outdated
Show resolved
Hide resolved
pothos
reviewed
Jan 15, 2024
Comment on lines
-31
to
-32
| # this is replication of commands from the vendor makefile | ||
| # but without network activity during build phase |
Member
There was a problem hiding this comment.
The reason for the duplication was the network access, is this not the case anymore or if it is the case, are we fine with network access? We could also patch the Makefile instead of duplicating the commands.
Contributor
Author
There was a problem hiding this comment.
I've been able to locally emerge without any issues - I think this is some legacy from an old setup (where vendor was not provided for example?)
By maintaining our own build logic, we missed the fact that the agent was now split in two parts: * amazon-ssm-agent in `./core` * ssm-agent-worker in `./agent` With the runtimeconfig passed from the `core` to the `agent`. We were currently shipping `ssm-agent-worker` as the `amazon-ssm-agent` hence some errors we had. ``` amazon-ssm-agent[8929]: 2023-12-28 15:29:32 WARN [ssm-agent-worker] failed to read runtime config 'identity_config.json': open /var/lib/amazon/ssm/runtimeconfig/identity_config.json: no such file or directory ``` Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
d3c9609 to
631a11f
Compare
jepio
approved these changes
Jan 16, 2024
jepio
added a commit
that referenced
this pull request
Jan 16, 2024
app-emulation/amazon-ssm-agent: use upstream makefile Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
jepio
added a commit
that referenced
this pull request
Jan 16, 2024
app-emulation/amazon-ssm-agent: use upstream makefile Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
By maintaining our own build logic, we missed the fact that the agent was now split in two parts:
./core./agentWith the runtimeconfig passed from the
coreto theagent.We were currently shipping
ssm-agent-workeras theamazon-ssm-agenthence some errors we had.changelog/directory (user-facing change, bug fix, security fix, update)/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.Locally tested but a last test with the image from the CI will be good.
Closes: flatcar/Flatcar#1307 aws/amazon-ssm-agent#554