[39/n] prepare sled-agent reconciler for honoring mupdate overrides#8688
Merged
sunshowers merged 10 commits intoJul 29, 2025
Conversation
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
jgallagher
reviewed
Jul 28, 2025
| // | ||
| // This status is obtained after remove_mupdate_override is processed. | ||
| let resolver_status = | ||
| sled_agent_facilities.zone_image_resolver_status(); |
Contributor
There was a problem hiding this comment.
We also need to pass this into boot_partitions.reconcile() above, to avoid writing phase 2 images while we have a mupdate override in place. 😬
Seems like that could be done as a followup to this but before the planner work lands? I'm hoping this is pretty small and straightforward; there are no zones involved, so I think it's "if we'd be willing to launch artifacts from the TUF repo depo, we're also willing to write OS images; otherwise, we only report what we have"?
Contributor
Author
There was a problem hiding this comment.
Added logic to prepare for this -- will add the actual implementation in #8456.
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
jgallagher
approved these changes
Jul 29, 2025
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
2 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 PR prepares the sled-agent config reconciler to honor mupdate overrides. In particular, the logic that requires bouncing zones needs to be updated to consider zone image locations after mupdate overrides have been considered, not before.
Doing this required some refactoring. The biggest one is that looking up zone image sources is no longer done through the image resolver and/or within sled-agent's
services.rs, but rather by gathering and querying the resolver status within the config reconciler. This is a nice improvement overall, particularly because it means we grab the lock once per reconciler run rather than each time we need to look up a zone's image source.We do not actually honor the mupdate override yet, though all the pieces are now in place. We'll combine the PRs to honor the override and update the blueprint logic into one, within #8456.