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

Allow for variant-specific default settings #613

Merged
merged 1 commit into from
Dec 20, 2019
Merged

Conversation

tjkirch
Copy link
Contributor

@tjkirch tjkirch commented Dec 20, 2019

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.

Copy link
Contributor

@patraw patraw left a comment

Choose a reason for hiding this comment

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

🐩

workspaces/api/storewolf/src/main.rs Show resolved Hide resolved
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.)
@tjkirch
Copy link
Contributor Author

tjkirch commented Dec 20, 2019

Fixed weird empty comment line; my reformatter was a bit overzealous. Also run rustfmt for a struct I missed.

@tjkirch tjkirch merged commit aed0947 into develop Dec 20, 2019
@tjkirch tjkirch deleted the defaults-dedupe branch December 20, 2019 23:07
tjkirch added a commit that referenced this pull request Jan 15, 2020
We changed the path to the containerd config template file in #613 to support
image variants, and we need a migration to update existing installations.
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.

3 participants