Repository navigation
switch: Add --target-imgref to Support a separate update image reference - #2603
Open
HarshwardhanPatil07 wants to merge 10 commits into
Open
HarshwardhanPatil07 wants to merge 10 commits into
HarshwardhanPatil07 wants to merge 10 commits into
Conversation
github-actions
Bot
added
area/install
HarshwardhanPatil07
force-pushed
the
fix/switch-target-imgref
branch
from
October 30, 2026 09:39
353d495 to
75ea0d9
Compare
HarshwardhanPatil07
force-pushed
the
fix/switch-target-imgref
branch
from
October 30, 2026 09:41
75ea0d9 to
8055a2f
Compare
HarshwardhanPatil07
requested review from
Johan-Liebert1,
cgwalters and
jmarrero
October 30, 2026 09:41
HarshwardhanPatil07
changed the title
cgwalters
reviewed
Oct 30, 2026
There was a problem hiding this comment.
🟡 Changes recommended
Unresolved issues can misidentify image sources, lose or strand pending origin changes, and break addon activation, unified-store updates, or soft-reboot behavior.
9 open issues
Review effort: Balanced
cgwalters
reviewed
Oct 30, 2026
HarshwardhanPatil07
force-pushed
the
fix/switch-target-imgref
branch
from
October 31, 2026 08:00
8055a2f to
a63c7f4
Compare
Offline delivery should accept the same registry names users pass to install. Normalize target references before fetching, reject incompatible options, and avoid advertising enforced verification on an unsupported composefs path. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
A cached import must retain the reference used by the deployment origin so cleanup does not discard its image metadata. Handle this in the importer, respecting set_no_imgref, so direct and unified pulls share the same behavior. Reuse the existing pull preparation helper. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
The update origin cannot identify which offline delivery was staged. Record the pull source in each deployment origin and compare both references before fetching, preserving download-only locks on repeats. Route OSTree imports through the source while retaining the target. Cover offline repeats, source replacement, activation, and provenance after reboot on both backends. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
An identical image may be delivered with a different future update origin. Reuse an existing staged image only when its OCI manifest matches exactly, preserve its finalization lock, and avoid rewriting origins shared with another deployment. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
Changing the origin of the running image should not replace the OS rollback deployment. Stage a durable origin change and apply it during finalization, validating the image and previous origin before writing. Keep download-only state across reboot and integrate cancellation with deployment deletion, rollback, and replacement. Cover recovery and the activation lifecycle with unit and reboot tests. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
Recording an origin is only useful if later updates actually use it. Extend the reboot test to check unchanged content and a newer image at the recorded registry after completing an offline delivery. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
Explain how to obtain an image from a temporary source while retaining the normal update origin. Document repeat behavior, activation, and user-visible restrictions with local-storage and registry examples. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
A redirected deployment records its update origin while containers-storage keeps the delivery name. Detect the stored host image by its OCI config ID and retain that ID during cleanup, so later updates keep using unified storage without requiring another explicit opt-in. Use the existing deployment metadata for both backends without adding persistent state or changing image aliases. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>
HarshwardhanPatil07
force-pushed
the
fix/switch-target-imgref
branch
from
October 31, 2026 13:42
a63c7f4 to
b00d6b9
Compare
Johan-Liebert1
requested changes
Nov 2, 2026
| pub(crate) finalization_locked: bool, | ||
| } | ||
|
|
||
| impl OriginChange { |
Member
There was a problem hiding this comment.
Context on all the functions that return a Result would be nice
| } | ||
| } | ||
|
|
||
| pub(crate) fn cancel(sysroot: &Dir) -> Result<()> { |
Member
There was a problem hiding this comment.
This function is poorly named. It's not clear what we're cancelling
| .booted | ||
| .as_ref() | ||
| .context("No booted deployment")?; | ||
| if booted.require_composefs()?.verity != self.deployment |
Member
There was a problem hiding this comment.
when will this not be true? afaics, we're only ever setting OriginChange::deployment to the booted depl verity
| opts, | ||
| UkiAddonCliOpts::Add { .. } | UkiAddonCliOpts::Remove { .. } | ||
| ) { | ||
| anyhow::ensure!( |
Member
There was a problem hiding this comment.
why not? We allow it when we have a staged deployment
| } | ||
|
|
||
| /// Parse a transport-prefixed reference, defaulting bare image names to the registry. | ||
| pub(crate) fn parse_image_reference(value: &str) -> Result<containers_image_proxy::ImageReference> { |
Member
There was a problem hiding this comment.
Don't we already have containers_image_proxy::ImageReference::try_from?
Member
|
Also the first two commits need proper messages and not just |
This branch has not been deployed
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
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.
Adds --target-imgref to bootc switch for OSTree and composefs, allowing an image to be downloaded from a temporary source while keeping a different registry for future updates.
Manually verified composefs UKI switching, repeated switches, and reboot with the previous deployment available for rollback. Verified OSTree download-only staging and both references in its .origin file.
Fixes #2464