Skip to content

Update supported blueprint options for Fedora image types #1838

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.

Sign up for GitHub

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

Merged
thozza merged 2 commits into from
Sep 8, 2025
Merged

Update supported blueprint options for Fedora image types #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef4d77
distrodefs/fedora: support iot-commit options in iot-bootable-container
achilleas-k Sep 4, 2025
50f4851
distrodefs/fedora: support customizations in container types
achilleas-k Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 24 additions & 27 deletions data/distrodefs/fedora/imagetypes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,27 @@
- "customizations.services"
- "customizations.timezone"

# supported options for container types (container and wsl)
supported_options_container: &supported_options_container
- "distro"
- "packages"
- "modules"
- "groups"
- "enabled_modules"
- "minimal"
- "containers"
- "customizations.directories"
- "customizations.files"
- "customizations.firewall"
- "customizations.user"
- "customizations.sshkey"
- "customizations.group"
- "customizations.hostname"
- "customizations.locale"
- "customizations.repositories"
- "customizations.services"
- "customizations.timezone"

# options supported by ostree disk (deployment) image types
supported_options_ostree_disk: &supported_options_ostree_disk
- "distro"
Expand Down Expand Up @@ -1489,15 +1510,7 @@ image_types:
exclude:
- "perl"
- "perl-interpreter"
supported_blueprint_options:
# Only supporting a few basic options for now because we never tested any
# other customization with this image type
- "distro"
- "packages"
- "modules"
- "groups"
- "enabled_modules"
- "minimal"
supported_blueprint_options: *supported_options_ostree_commit

"minimal-raw-xz": &minimal_raw_xz
name_aliases: ["minimal-raw"]
Expand Down Expand Up @@ -1812,15 +1825,7 @@ image_types:
- "trousers"
- "whois-nls"
- "xkeyboard-config"
supported_blueprint_options:
# Only supporting a few basic options for now because we never tested any
# other customization with this image type
- "distro"
- "packages"
- "modules"
- "groups"
- "enabled_modules"
- "minimal"
supported_blueprint_options: *supported_options_container

wsl:
# this is the eventual name, and `wsl` the alias but we've been
Expand Down Expand Up @@ -1926,15 +1931,7 @@ image_types:
append:
exclude:
- "fuse-libs"
supported_blueprint_options:
# Only supporting a few basic options for now because we never tested any
# other customization with this image type
- "distro"
- "packages"
- "modules"
- "groups"
- "enabled_modules"
- "minimal"
supported_blueprint_options: *supported_options_container

"iot-simplified-installer":
<<: *rpm_ostree_imgtype_common
Expand Down
4 changes: 1 addition & 3 deletions pkg/distro/distro_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,8 @@ func TestDistro_ManifestFIPSWarning(t *testing.T) {
// functionality which produces different error
// messages. These will be added to RHEL as well soon.
switch imgTypeName {
case "workstation-live-installer":
case "workstation-live-installer", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.fips: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.Equal(t, slices.Contains(warn, msg), !common.IsBuildHostFIPSEnabled(),
"FIPS warning not shown for image: distro='%s', imgTypeName='%s', archName='%s', warn='%v'", distroName, imgTypeName, archName, warn)
Expand Down
34 changes: 10 additions & 24 deletions pkg/distro/generic/fedora_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,16 +506,16 @@ func TestFedoraDistro_ManifestError(t *testing.T) {
}
_, _, err := imgType.Manifest(&bp, imgOpts, nil, nil)
switch imgTypeName {
case "iot-commit", "iot-container":
case "iot-commit", "iot-container", "iot-bootable-container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.kernel.append: not supported", imgTypeName))
case "minimal-installer", "iot-installer", "workstation-live-installer", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.kernel: not supported", imgTypeName))
case "iot-simplified-installer":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.installation_device: required", imgTypeName))
case "iot-raw-xz", "iot-qcow2":
assert.EqualError(t, err, fmt.Sprintf("options validation failed for image type %q: ostree.url: required", imgTypeName))
case "container", "wsl", "iot-bootable-container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
case "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.kernel: not supported", imgTypeName))
default:
assert.NoError(t, err)
}
Expand Down Expand Up @@ -719,10 +719,8 @@ func TestFedoraDistro_CustomFileSystemManifestError(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "iot-installer", "workstation-live-installer", "iot-simplified-installer", "iot-commit", "iot-container", "everything-netinst":
case "minimal-installer", "iot-installer", "workstation-live-installer", "iot-simplified-installer", "iot-commit", "iot-container", "iot-bootable-container", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "container", "wsl", "iot-bootable-container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
// TODO: this error message is a bit clunky; bring it more in line with the other messages (remove "The following errors ...")
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: The following custom mountpoints are not supported [\"/etc\"]", imgTypeName))
Expand Down Expand Up @@ -750,10 +748,8 @@ func TestFedoraDistro_TestRootMountPoint(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "iot-bootable-container", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
}
Expand Down Expand Up @@ -784,10 +780,8 @@ func TestFedoraDistro_CustomFileSystemSubDirectories(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "iot-bootable-container", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
}
Expand Down Expand Up @@ -826,10 +820,8 @@ func TestFedoraDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "iot-bootable-container", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
}
Expand Down Expand Up @@ -864,10 +856,8 @@ func TestFedoraDistro_DirtyMountpointsNotAllowed(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "iot-bootable-container", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
// TODO: this error message is a bit clunky; bring it more in line with the other messages (remove "The following errors ...")
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: The following custom mountpoints are not supported [\"//\" \"/var//\" \"/var//log/audit/\"]", imgTypeName))
Expand Down Expand Up @@ -898,10 +888,8 @@ func TestFedoraDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, options, nil, nil)
switch imgTypeName {
case "workstation-live-installer", "iot-container", "iot-commit", "iot-installer", "iot-simplified-installer", "minimal-installer", "everything-netinst":
case "workstation-live-installer", "iot-container", "iot-commit", "iot-bootable-container", "iot-installer", "iot-simplified-installer", "minimal-installer", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
}
Expand Down Expand Up @@ -942,10 +930,8 @@ func TestFedoraDistro_PartitioningConflict(t *testing.T) {
}
_, _, err := imgType.Manifest(&bp, options, nil, nil)
switch imgTypeName {
case "workstation-live-installer", "iot-container", "iot-commit", "iot-installer", "iot-simplified-installer", "minimal-installer", "everything-netinst":
case "workstation-live-installer", "iot-container", "iot-commit", "iot-bootable-container", "iot-installer", "iot-simplified-installer", "minimal-installer", "everything-netinst", "container", "wsl":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.disk cannot be used with customizations.filesystem", imgTypeName))
}
Expand Down
Loading