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

app-emulation/amazon-ssm-agent: use upstream makefile #1572

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Conversation

tormath1
Copy link
Contributor

@tormath1 tormath1 commented Jan 15, 2024

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

Locally tested but a last test with the image from the CI will be good.

Closes: flatcar/Flatcar#1307 aws/amazon-ssm-agent#554

Comment on lines -31 to -32
# this is replication of commands from the vendor makefile
# but without network activity during build phase
Copy link
Member

Choose a reason for hiding this comment

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

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.

Copy link
Contributor Author

@tormath1 tormath1 Jan 15, 2024

Choose a reason for hiding this comment

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

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>
@jepio jepio marked this pull request as ready for review January 16, 2024 14:26
@jepio jepio merged commit 625fe5c into main Jan 16, 2024
1 check failed
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>
@tormath1 tormath1 deleted the tormath1/ssm-agent branch January 16, 2024 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SSM Agent fails to start on latest alpha
3 participants