containerd: share duplicate configs #1538
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
tjkirch
commented
Apr 29, 2021
| const SETTING: &'static str = "configuration-files.containerd-config-toml.template-path"; | ||
|
|
||
| lazy_static! { | ||
| static ref TEMPLATE_CHANGES: &'static [(&'static str, &'static str)] = &[ |
There was a problem hiding this comment.
This could be a candidate for a plural version of our ReplaceStringMigration. I guess we haven't needed that yet because we haven't changed settings that differ across variants. We could also wait until we need it once more and then use this as a template for making a common migration.
Rather than naming the config file after the variant, use a more generic name, and have each variant pick which generic config applies. We only have two different configs, so this immediately saves some duplication.
tjkirch
force-pushed
the
refactor-ctrd-configs
branch
from
76d2519
to
4fdc69f
Compare
|
^ rebase on develop to fix conflicts. |
etungsten
approved these changes
Apr 29, 2021
bcressey
approved these changes
Apr 30, 2021
zmrow
approved these changes
Apr 30, 2021
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.
Issue number:
Fixes #1511 (comment)
Description of changes:
Testing done:
For each of aws-k8s-1.19, aws-ecs-1, and aws-dev:
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.