-
Notifications
You must be signed in to change notification settings - Fork 165
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
Insert generated image.json into the ostree commit [retry] #2839
Conversation
a8e4b8c
to
1950c5e
Compare
1950c5e
to
2d0a4a7
Compare
We can give this one another try right? |
Let's discuss with @jlebon when he is back (maybe tomorrow?). |
Any updates on this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry about the delay here.. Did an initial round of review.
fa721a0
to
3af7266
Compare
OK, squashed the fixup commit now that it's passed CI. |
/test rhcos |
flaked on coreos/fedora-coreos-tracker#1214 |
@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos In 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. |
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
65b97b9
to
491339c
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
intoimage.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: #972