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

[1.14.x] cherry-pick: add image cleanup settings #3231

Merged
merged 2 commits into from
Jun 27, 2023

Conversation

arnaldo2792
Copy link
Contributor

Description of changes:

See #3215

Testing done:
See #3215

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

This adds the configurations exposed by the agent to clean up container
images after a period of time. As with previous changes, time-related
configurations are rendered at `/etc/ecs/ecs.config` instead of
`/etc/ecs/ecs.config.json`, since the JSON parser used by the ECS agent
fails to parse time-formatted strings.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
(cherry picked from commit 086f93e)
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
(cherry picked from commit 45f3b13)
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Thanks for the commit updates!

@etungsten etungsten merged commit e3fa570 into bottlerocket-os:1.14.x Jun 27, 2023
43 checks passed
@arnaldo2792 arnaldo2792 deleted the cherry-pick-1.14.x branch July 20, 2023 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants