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.

Sign up for GitHub

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

Jump to bottom

image.yaml: Switch to ostree-format: "oci-chunked" #1698

Merged
merged 1 commit into from
May 6, 2022
Merged

image.yaml: Switch to ostree-format: "oci-chunked" #1698

merged 1 commit into from
May 6, 2022

Conversation

cgwalters
Copy link
Member

OK, it's time to start trying this out in "production".

https://bodhi.fedoraproject.org/updates/FEDORA-2022-4813f1daaf
is queued (and already in coreos-assembler).

I've pushed an updated demo of this to quay.io/cgwalters/fcos-chunked
which you can try today.

@cgwalters
Copy link
Member Author

OK and to consume this on the host we do want https://bodhi.fedoraproject.org/updates/FEDORA-2022-4813f1daaf in our streams, but hopefully that will happen soon.

@dustymabe
Copy link
Member

A few questions:

  • can we try this on next-devel/next first?
  • can we wait until Fedora 36 is released and we've transitioned testing to Fedora 36 content safely?

@cgwalters cgwalters changed the base branch from testing-devel to next-devel April 27, 2022 20:27
@cgwalters
Copy link
Member Author

can we try this on next-devel/next first?

Sure, done

@dustymabe
Copy link
Member

Thanks!

Marking this as draft so it doesn't get merged by accident. We'll merge (assuming no objections) once we switch our testing-devel and testing streams over to F36.

@dustymabe dustymabe marked this pull request as draft April 27, 2022 20:30
dustymabe
dustymabe previously approved these changes Apr 27, 2022
View reviewed changes
@cgwalters
Copy link
Member Author

OK a few other things to keep in mind here is that this conceptually can only really break two things:

  • How we build the disk image - but that's tested in CI!
  • Anyone pulling the container directly - but that's not a production path yet, and if it did break something I'd want to know and we can easily revert

@cgwalters
Copy link
Member Author

Hmm actually anything blocking this going to rawhide first?

@dustymabe
Copy link
Member

Hmm actually anything blocking this going to rawhide first?

Nope. That would work 👍

@cgwalters
image.yaml: Switch to ostree-format: "oci-chunked"
1b54228 
OK, it's time to start trying this out in "production".

https://bodhi.fedoraproject.org/updates/FEDORA-2022-4813f1daaf
is queued (and already in coreos-assembler).

I've pushed an updated demo of this to `quay.io/cgwalters/fcos-chunked`
which you can try today.
@cgwalters cgwalters changed the base branch from next-devel to rawhide May 6, 2022 13:14
@cgwalters
Copy link
Member Author

OK, done!

@cgwalters cgwalters marked this pull request as ready for review May 6, 2022 13:14
@cgwalters
Copy link
Member Author

(I discovered when rebasing that the rawhide image.yaml still had a now-defunct override for ostree-format: oci which was the legacy of the last attempt to do OCI stuff in rawhide first)

dustymabe
dustymabe approved these changes May 6, 2022
View reviewed changes
Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

LGTM

@cgwalters cgwalters merged commit c0a0ae7 into coreos:rawhide May 6, 2022
@cgwalters
Copy link
Member Author

cgwalters commented May 9, 2022 •
edited

OK this is getting us a chunked image in S3, but the prod copy is being re-squashed back to a single layer because https://github.com/coreos/coreos-assembler/blob/c29b6f7d526090395f5248588eead17d2d36e464/src/cmd-sign#L185

We need to teach that code to read image.yaml too...which really I think wants the cleanups from coreos/coreos-assembler#2839

@cgwalters cgwalters mentioned this pull request May 9, 2022
Closed
@cgwalters
Copy link
Member Author

Eh this is going to get messy to implement here or in cosa, let's do ostreedev/ostree-rs-ext#295

cgwalters added a commit to cgwalters/os that referenced this pull request May 31, 2022
@cgwalters
image: Switch to oci-chunked format
5921336 
Now that we have rpm-ostree v2022.2 in the bootimage, we should
be able to switch to the chunked image format.

This matches coreos/fedora-coreos-config#1698
@cgwalters cgwalters mentioned this pull request May 31, 2022
Merged
cgwalters added a commit to cgwalters/os that referenced this pull request Jun 3, 2022
@cgwalters
image: Switch to oci-chunked format
70254e0 
Now that we have rpm-ostree v2022.2 in the bootimage, we should
be able to switch to the chunked image format.

This matches coreos/fedora-coreos-config#1698
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Jun 3, 2022
@cgwalters
sign: Use replace-detached-metadata if available
9347820 
Part of actually shipping chunked format, see
coreos/fedora-coreos-config#1698

Not tested.
@cgwalters cgwalters mentioned this pull request Jun 3, 2022
Merged
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Jun 3, 2022
@cgwalters
sign: Use replace-detached-metadata if available
25f37c0 
Part of actually shipping chunked format, see
coreos/fedora-coreos-config#1698

Not tested.
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Jun 3, 2022
@cgwalters
sign: Use replace-detached-metadata if available
40b13ae 
Part of actually shipping chunked format, see
coreos/fedora-coreos-config#1698

Not tested.
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Jun 3, 2022
@cgwalters
sign: Use replace-detached-metadata if available
c49f1dd 
Part of actually shipping chunked format, see
coreos/fedora-coreos-config#1698

Not tested.
cgwalters added a commit to coreos/coreos-assembler that referenced this pull request Jun 8, 2022
@cgwalters
sign: Use replace-detached-metadata if available
de628bc 
Part of actually shipping chunked format, see
coreos/fedora-coreos-config#1698

Not tested.
@cgwalters cgwalters mentioned this pull request Jun 8, 2022
Closed
7 tasks
@cgwalters
Copy link
Member Author

OK I should have done this before, but here's a tracker issue for this work: coreos/fedora-coreos-tracker#1226

cgwalters added a commit to cgwalters/os that referenced this pull request Jun 8, 2022
@cgwalters
image: Switch to oci-chunked format
8b359ed 
Now that we have rpm-ostree v2022.2 in the bootimage, we should
be able to switch to the chunked image format.

This matches coreos/fedora-coreos-config#1698
cgwalters added a commit to cgwalters/os that referenced this pull request Aug 16, 2022
@cgwalters
image: Switch to oci-chunked-v1 format
67970ef 
We now have a version of rpm-ostree in the 4.12 bootimage which
is able to pull this.

This matches coreos/fedora-coreos-config#1698
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dustymabe dustymabe dustymabe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cgwalters @dustymabe