Merge branch 'dev' into boltdb #2532
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
task: remove unused constant arnResourceSections
- Update busybox image versions to latest stable version
- Replace custom dockerfile that pulls python2.7 and pip installws awscli with official AWS image for awscli v2
- Update fluentd image to latest stable
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>
- Update Nginx and ubuntu images to latest stable
yhlee-aws
approved these changes
Jul 21, 2020
mythri-garaga
approved these changes
Jul 21, 2020
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
Merge branch 'dev' into boltdb. Merging in latest change before doing some final cleanup in boltdb feature branch.
Implementation details
One conflict in
agent/engine/docker_image_manager.go. Resolved by keeping changes in both branches.Testing
Rely on pr checks.
New tests cover the changes: no
Description for the changelog
N/A
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.