-
Notifications
You must be signed in to change notification settings - Fork 522
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
defaults: refactor duplicate settings to shared files #1542
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
bcressey
reviewed
Apr 30, 2021
Only k8s variants need to override this if we set it in the base shared defaults.
tjkirch
force-pushed
the
k8s-defaults-dupes
branch
from
April 30, 2021 17:15
fce41b3
to
a35809e
Compare
^ Now that #1538 is merged, this rebases on develop and changes the PR base branch to develop. |
tjkirch
force-pushed
the
k8s-defaults-dupes
branch
from
April 30, 2021 17:50
a35809e
to
f9df0ab
Compare
^ Addresses bcressey's concerns by:
Also another one discussed offline:
|
webern
approved these changes
Apr 30, 2021
bcressey
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:
Addresses comment #1511 (comment)
Description of changes:
This should allow #1511 to remove the need for a one-off defaults.toml file, instead linking to the shared kubernetes-containerd.toml, kubernetes-services.toml, and public-ntp.toml files, and creating a new shared kubernetes-vmware.toml file with the bits that remain.
Testing done:
Ran storewolf to generate defaults.toml files for each variant before and after. (The process orders them alphabetically, not how we order them.)
The only difference is in vmware-dev, as expected with the metrics fix:
Built and ran aws-k8s-1.19 and aws-ecs-1 variants and confirmed things were healthy.
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.