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.

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

deployment_utils: Fix version for cached container update #4936

Merged
merged 2 commits into from
Apr 24, 2024

Conversation

travier
Copy link
Member

@travier travier commented Apr 22, 2024

container-update-check: Validate version in manifest diff


deployment_utils: Fix version for cached container update

Previous change used the version of the current deployment instead of
the one from the pending container update.

Store the new version alongside the manifest diff to be able to return
it as part of the cached update logic.

Fixes: #4923
Fixes: #4711

@travier
Copy link
Member Author

travier commented Apr 22, 2024

This notably does not fix the checksum entry in cached-update. But is it even possible to fix that?
If I understand correctly, we won't have the final checksum until we pull the container in the ostree repo?
Or maybe we use the ostree.commit label?
Or we just don't fix it.

Previous change used the version of the current deployment instead of
the one from the pending container update.

Store the new version alongside the manifest diff to be able to return
it as part of the cached update logic.

Fixes: coreos#4923
Fixes: coreos#4711
@travier travier force-pushed the main-container-update-version branch from 5ef5d10 to 5fbb651 Compare April 22, 2024 23:11
@travier
Copy link
Member Author

travier commented Apr 23, 2024

I haven't been able to do #4923 (comment) as AFAIU, we don't have the commit in the repo yet as we haven't pulled the container yet?

@cgwalters
Copy link
Member

This notably does not fix the checksum entry in cached-update. But is it even possible to fix that?
If I understand correctly, we won't have the final checksum until we pull the container in the ostree repo?

Nothing should care about the ostree checksum when using a container image source, basically.

@cgwalters cgwalters merged commit e0cf3f7 into coreos:main Apr 24, 2024
17 checks passed
@travier travier deleted the main-container-update-version branch April 24, 2024 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants