Add an image-default.yaml, pass JSON to create_disk.sh #1787
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
|
This is prep work for a larger refactoring for coreos/bootupd#50 |
jlebon
approved these changes
Oct 21, 2020
|
I can /lgtm this if you'd prefer to convert the other ones in a separate PR. |
The way we parse an `image.yaml` and then convert it into arguments for `create_disk.sh` is unwieldy. Instead, convert `image.yaml` into JSON, inheriting default values from a separate `image-default.yaml` we ship. Then pass that JSON to `create_disk.sh`. This only converts the `rootfs` argument, but if people are OK with this I can go ahead and convert everything else - getting us to where the only argument to `create_disk.sh` is a JSON file that's already been pre-validated.
cgwalters
force-pushed
the
create-disk-cleanup
branch
from
f49aa24
to
b769f56
Compare
|
OK rebased 🏄 |
jlebon
approved these changes
Nov 12, 2020
| @@ -92,6 +92,17 @@ remote_name="${remote_name:?--ostree-remote must be defined}" | |||
| grub_script="${grub_script:?--grub-script must be defined}" | |||
| os_name="${os_name:?--os_name must be defined}" | |||
|
|
|||
| getconfig() { | |||
| k=$1 | |||
| jq -re .$k < ${config} | |||
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, jlebon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
The way we parse an
image.yamland then convert itinto arguments for
create_disk.shis unwieldy.Instead, convert
image.yamlinto JSON, inheriting default valuesfrom a separate
image-default.yamlwe ship. Then passthat JSON to
create_disk.sh.This only converts the
rootfsargument, but if peopleare OK with this I can go ahead and convert everything
else - getting us to where the only argument to
create_disk.shis a JSON file that's already been pre-validated.