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

buildextend-metal: set a sane default container_imgref #3700

Merged
merged 6 commits into from
Jan 22, 2024

Conversation

dustymabe
Copy link
Member

also add support to osbuild mode for passing down the imgref

And drop all the patches for upstream PRs that have merged and made it
into v104.
This is a PR upstream [1], but I'd really like it now so in local
development the cache doesn't become useless once it feels up
(because the current behavior in OSBuild is never evict anything
so the cache will fill up eventually and then never be used for
anything).

Note this patchset includes one additional patch by myself which
adds a log statement that prints out when an eviction happens. This
is purely for informational purposes so I can know when the cache
LRU eviction mechanism is working.

[1] osbuild/osbuild#1503
jmarrero
jmarrero previously approved these changes Jan 19, 2024
Copy link
Member

@jmarrero jmarrero left a comment

Choose a reason for hiding this comment

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

lgtm

@dustymabe
Copy link
Member Author

dustymabe commented Jan 19, 2024

ok - the org.osbuild.ostree.deploy.container stage doesn't accept ostree-unverified-image: - maybe we can just use ostree-image-signed: here since this is coming from a trusted place anyway and it's not ever going to be used?

If one isn't set today it gets set to some random path, which doesn't
look great.

```
[core@cosa-devsh ~]$ rpm-ostree status
State: idle
Deployments:
● ostree-unverified-image:oci-archive:/srv/builds/416.92.202401191455-0/x86_64/rhcos-416.92.202401191455-0-ostree.x86_64.ociarchive
                   Digest: sha256:f0c4175e868ba6c31f67b0ac8143f34e9eadd9f8e1a25615208e5ed18adaa456
                  Version: 416.92.202401191455-0 (2024-01-19T14:58:17Z)
```

Let's just set a default with just the ociarchive file name in it.

```
[core@cosa-devsh ~]$ rpm-ostree status
State: idle
Deployments:
● ostree-unverified-image:oci-archive:/rhcos-416.92.202401191512-0-ostree.x86_64.ociarchive
                   Digest: sha256:20757bc5bac0fbe4481760fe3878ff5397901741319caaf85035282df6a31b14
                  Version: 416.92.202401191512-0 (2024-01-19T15:15:20Z)
```
Pass in the container_imgref just like is done today for create_disk.sh.
@dustymabe
Copy link
Member Author

ok - the org.osbuild.ostree.deploy.container stage doesn't accept ostree-unverified-image: - maybe we can just use ostree-image-signed: here since this is coming from a trusted place anyway and it's not ever going to be used?

Done.. but this also meant I needed to fix a bug in the aleph osbuild stage to handle this (osbuild/osbuild#1548), which I've now backported here too.

and... since I was doing a backport for osbuild stuff I went ahead and lumped in my most recent local changes for osbuild patches/updates... I hope that is OK.

Copy link

@lukewarmtemp lukewarmtemp left a comment

Choose a reason for hiding this comment

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

LGTM

@dustymabe dustymabe merged commit 88e5c9c into coreos:main Jan 22, 2024
5 checks passed
@dustymabe dustymabe deleted the dusty-imgref branch January 22, 2024 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants