Insert generated image.json into the ostree commit [retry]#2839
Merged
cgwalters merged 1 commit intocoreos:mainfrom Jun 1, 2022
Merged
Insert generated image.json into the ostree commit [retry]#2839cgwalters merged 1 commit intocoreos:mainfrom
cgwalters merged 1 commit intocoreos:mainfrom
Conversation
cgwalters
force-pushed
the
aws-replicate-no-ostree
branch
from
a8e4b8c to
1950c5e
Compare
cgwalters
changed the title
cgwalters
force-pushed
the
aws-replicate-no-ostree
branch
from
1950c5e to
2d0a4a7
Compare
Member
Author
|
We can give this one another try right? |
Member
Let's discuss with @jlebon when he is back (maybe tomorrow?). |
Member
Author
|
Any updates on this? |
dustymabe
reviewed
May 24, 2022
Member
dustymabe
left a comment
dustymabe
left a comment
There was a problem hiding this comment.
Sorry about the delay here.. Did an initial round of review.
jlebon
reviewed
May 24, 2022
cgwalters
force-pushed
the
aws-replicate-no-ostree
branch
6 times, most recently
from
fa721a0 to
3af7266
Compare
Member
Author
|
OK, squashed the fixup commit now that it's passed CI. |
jlebon
previously approved these changes
May 31, 2022
Member
|
/test rhcos |
Member
Author
|
flaked on coreos/fedora-coreos-tracker#1214 |
|
@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
cgwalters
force-pushed
the
aws-replicate-no-ostree
branch
from
3af7266 to
65b97b9
Compare
This is part of coreos/fedora-coreos-tracker#1151 Our generated disk images are largely just a "shell" around the egg of an ostree commit. There is almost nothing that lives in the disk image that isn't in the commit. (This is especially true now that a preparatory commit previous to this moved the *content* of our static `grub.cfg` into `image.json`) In the original coreos-assembler design I'd tried to cleanly separate builds of the ostree from disk image builds, but also support linking them together (with matching version numbers, etc.) The separate `image.yaml` was part of this. This...mostly worked. This change furthers that separation by having image builds input from *just the ostree commit*. Crucially we would no longer need the config git repository to perform an image build. And this in turn unlocks truly better separating ostree builds from disk image builds in the pipeline *and* supporting downstream tooling generating disk images from custom containers. One neat thing here is we will finally fix a longstanding issue where coreos-assembler fails when just the `image.yaml` changes: Closes: coreos#972
cgwalters
force-pushed
the
aws-replicate-no-ostree
branch
from
65b97b9 to
491339c
Compare
dustymabe
approved these changes
Jun 1, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 is part of coreos/fedora-coreos-tracker#1151
Our generated disk images are largely just a "shell" around the egg
of an ostree commit. There is almost nothing that lives
in the disk image that isn't in the commit.
(This is especially true now that a preparatory commit previous to
this moved the content of our static
grub.cfgintoimage.json)In the original coreos-assembler design I'd tried to cleanly
separate builds of the ostree from disk image builds, but also
support linking them together (with matching version numbers, etc.)
The separate
image.yamlwas part of this. This...mostly worked.This change furthers that separation by having image builds input from
just the ostree commit. Crucially we would no longer need the config
git repository to perform an image build.
And this in turn unlocks truly better separating ostree builds from
disk image builds in the pipeline and supporting
downstream tooling generating disk images from custom containers.
One neat thing here is we will finally fix a longstanding issue
where coreos-assembler fails when just the
image.yamlchanges:Closes: #972