Allow for variant-specific default settings #613
Merged
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.
This deduplicates the common defaults between variants. The merge function
also opens the way for having even more locations for defaults, i.e. shared
modules, if desired. (Note, though, that they're currently being read in at
compile time via include_str so we don't have to include them in the image, and
there's only so much we can do at compile time with regard to file selection.)
Testing done:
I made an aws-k8s AMI, it connected to my cluster and launched a pod OK. I logged in and confirmed the aws-k8s defaults were there and the containerd config was the k8s one.
I made an aws-dev AMI, it ran a Docker container OK. I confirmed the aws-dev defaults were there and the containerd config was the dev one.