upgrade: fix --apply when the desired deployment is already staged #256
Conversation
Previously, running: `bootc update; bootc update --apply` would result in the system not rebooting to apply the previously-staged deployment. Closes: containers#234 Signed-off-by: John Eckersberg <[email protected]>
|
Hi @jeckersb. Thanks for your PR. I'm waiting for a containers member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
|
/ok-to-test |
| @@ -356,6 +356,10 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> { | |||
| .unwrap_or_default(); | |||
| if staged_unchanged { | |||
| println!("Staged update present, not changed."); | |||
|
|
|||
| if opts.apply { | |||
There was a problem hiding this comment.
Hmm....I need to think about this. Is it that simple? Yeah, I think that will work. I'm OK with this though I do wonder if we should basically set changed=true in this case instead and just fall through.
If we do that, then maybe the changed variable is misnamed and it's really just bool have_staged.
(BTW we should probably drop --touch-if-changed since I think it's better done by querying the status API)
There was a problem hiding this comment.
FWIW I had the same reaction once I wrapped my head around things (is it this simple??). Agreed with everything else you said though. My only other thought was the bit in the help on --apply re: "In the future this command will detect the case where no kernel changes are queued, and perform a userspace-only restart." which will require some additional rearranging of things. Maybe we just leave it for now and then it'll shake out in that future reorganization.
Previously, running:
bootc update; bootc update --applywould result in the system not rebooting to apply the previously-staged deployment.
Closes: #234