distro: load distros from multiple files by supakeen · Pull Request #1974 · osbuild/images

supakeen · 2025-10-28T06:00:10Z

Allow for splitting up distros.yaml. Any file directly at the top level of the definitions filesystem is treated as a distros.yaml and their entries are appended together.

This allows for slightly more organization for distros.yaml.

Note that these files are read in sorted filesystem order but separately from eachother; hence anchors and such are not available across files but only within themselves.

In the future this could/might lead to drop-in distro files and/or merging of multiple filesystems.

We immediately make use of this new functionality by splitting up the current single distros.yaml into rhel.yaml and fedora.yaml.

Note, I took the most naive and straightforward approach here: listing files, reading them in a loop. fs.ReadDir sorts files (though since we're not using a MultiFileReader this doesn't quite matter here: https://pkg.go.dev/io/fs#ReadDir).

mvo5

Thank you! Tiny suggestions inline about the code, a test (e.g. one that checks that !*.yaml is ignored) would be nice.

I have no strong opinion about the split, either way is fine with me, I let the others comment/decide.

pkg/distro/defs/loader.go

Allow for splitting up `distros.yaml`. Any file directly at the top level of the definitions filesystem is treated as a `distros.yaml` and their entries are appended together. This allows for slightly more organization for `distros.yaml`. Note that these files are read in sorted filesystem order but separately from eachother; hence anchors and such are not available across files but only within themselves. In the future this could/might lead to drop-in distro files and/or merging of multiple filesystems. We immediately make use of this new functionality by splitting up the current single `distros.yaml` into `rhel.yaml` and `fedora.yaml`. Signed-off-by: Simon de Vlieger <supakeen@redhat.com>

supakeen · 2025-10-30T10:46:44Z

I think this has been rebased correctly, there was a conflict in the web ui but my local checkout rebased without problems.

thozza

LGTM

Changes with 0.210.0 ---------------- - Make bootupd metadata generation configurable per distro (osbuild/images#1958) - Author: Paul Whalen, Reviewers: Lukáš Zapletal, Simon de Vlieger - many: add support for bootc container based anaconda ISOs (HMS-9495) (osbuild/images#1906) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza - osbuild/osbuild-exec: make osbuild command a variable (osbuild/images#1965) - Author: Sanne Raymaekers, Reviewers: Lukáš Zapletal, Simon de Vlieger Changes with 0.211.0 ---------------- - Update osbuild dependency commit ID to latest (osbuild/images#1968) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - Update snapshots to 20251023 (osbuild/images#1967) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - deps: switch yaml libraries (osbuild/images#1970) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt - osbuild/monitor: increase status scanner buffer size to 16MiB (osbuild/images#1977) - Author: Sanne Raymaekers, Reviewers: Michael Vogt, Simon de Vlieger - osbuild: tweak how we can mock osbuild slightly (osbuild/images#1969) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Sanne Raymaekers - schutzbot/terraform: bump terraform sha (osbuild/images#1976) - Author: Florian Schüller, Reviewers: Achilleas Koutsou, Sanne Raymaekers, Simon de Vlieger Changes with 0.212.0 ---------------- - distro,manifest: have a single `LoraxTemplates` type (osbuild/images#1975) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - distro: cleanup/reuse YAML for bootc ISO (osbuild/images#1971) - Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger - distro: cleanup/reuse YAML for bootc distro (osbuild/images#1944) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - distro: load distros from multiple files (osbuild/images#1974) - Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza - osbuild: switch from a bufio.Scanner to a bufio.Reader (osbuild/images#1978) - Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger - reporegistry: various cleanups (osbuild/images#1980) - Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza - various: fix `make gh-action-test` and update README (osbuild/images#1981) - Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger Changes with 0.213.0 ---------------- - data: update fedora 43 repositories (osbuild/images#1983) - Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers - osbuild-exec: add buildlog and monitor support (osbuild/images#1966) - Author: Sanne Raymaekers, Reviewers: Michael Vogt, Simon de Vlieger

supakeen requested a review from a team as a code owner October 28, 2025 06:00

supakeen requested review from achilleas-k, bcl, croissanne, lzap, mvo5 and thozza October 28, 2025 06:00

supakeen force-pushed the split-distros-yaml branch 2 times, most recently from bab564d to 01f2193 Compare October 28, 2025 06:03

mvo5 reviewed Oct 28, 2025

View reviewed changes

pkg/distro/defs/loader.go Outdated Show resolved Hide resolved

pkg/distro/defs/loader.go Outdated Show resolved Hide resolved

pkg/distro/defs/loader.go Outdated Show resolved Hide resolved

pkg/distro/defs/loader.go Outdated Show resolved Hide resolved

supakeen force-pushed the split-distros-yaml branch 2 times, most recently from df56e54 to 475fb10 Compare October 28, 2025 10:38

achilleas-k previously approved these changes Oct 28, 2025

View reviewed changes

mvo5 previously approved these changes Oct 28, 2025

View reviewed changes

supakeen force-pushed the split-distros-yaml branch from 475fb10 to 711524e Compare October 29, 2025 08:35

supakeen enabled auto-merge October 29, 2025 08:35

lzap previously approved these changes Oct 29, 2025

View reviewed changes

supakeen dismissed stale reviews from lzap, mvo5, and achilleas-k via 97fff90 October 30, 2025 10:43

supakeen force-pushed the split-distros-yaml branch from 711524e to 97fff90 Compare October 30, 2025 10:43

supakeen requested review from achilleas-k, lzap and mvo5 October 30, 2025 10:46

mvo5 approved these changes Oct 30, 2025

View reviewed changes

thozza approved these changes Oct 31, 2025

View reviewed changes

supakeen added this pull request to the merge queue Oct 31, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 31, 2025

supakeen added this pull request to the merge queue Oct 31, 2025

Merged via the queue into osbuild:main with commit f150c48 Oct 31, 2025
24 checks passed

supakeen deleted the split-distros-yaml branch October 31, 2025 12:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

distro: load distros from multiple files#1974

distro: load distros from multiple files#1974
supakeen merged 1 commit intoosbuild:mainfrom
supakeen:split-distros-yaml

supakeen commented Oct 28, 2025 •

edited

Loading

Uh oh!

mvo5 left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

supakeen commented Oct 30, 2025

Uh oh!

thozza left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

supakeen commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mvo5 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

supakeen commented Oct 30, 2025

Uh oh!

thozza left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

supakeen commented Oct 28, 2025 •

edited

Loading