engine: move default image exclusions #2513
Merged
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
mythri-garaga
approved these changes
Jul 10, 2020
yhlee-aws
approved these changes
Jul 14, 2020
This commit moves the logic adding default excluded images from the cleanup list to the engine package, away from the config package, and in doing so fixes two bugs: 1. Prior to this change, any value for ImageCleanupExclusionList provided by a config mechanism *other* than environmentConfig would be ignored. This is because environmentConfig has the highest precedence, the defaults were added to environmentConfig by parseImageCleanupExclusionList, and config.Merge will only merge a new value when the left config's field is its zero value. Since the default excluded images were populated, environmentConfig's ImageCleanupExclusionList field was never zero. 2. CachedImageNamePauseContainer hard-coded a name for the pause container image that was used to populate the exclusion list, but the actual name of the pause container is a value populated at link-time into the DefaultPauseContainerImageName and DefaultPauseContainerTag variables. If the value was set to anything other than what was defined in CachedImageNamePauseContainer, the pause container image would not be correctly excluded from image cleanup. Signed-off-by: Samuel Karp <skarp@amazon.com>
samuelkarp
force-pushed
the
default-image-exclusions
branch
from
c2a7cea
to
08fd483
Compare
Merged
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
This commit moves the logic adding default excluded images from the cleanup list to the engine package, away from the config package, and in doing so fixes two bugs:
Implementation details
Added defaulting logic to the constructor of
dockerImageManagerand wrote a test to cover the new logic.Testing
New tests cover the changes: yes
Description for the changelog
Bug - Fixed a bug that caused configured values for
ImageCleanupExclusionListto be ignored in some situations.Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.