add and remove image features #318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The cgroup v2 feature was used to conditionally compile systemd and select the default cgroup hierarchy - either "hybrid" or "unified" - at build time. Packages no longer have access to conditional compilation assisted by the build tool, so this feature flag is obsolete. Instead, the cgroup hierarchy can be selected through kernel command line parameters in the variant definition. Signed-off-by: Ben Cressey <bcressey@amazon.com>
bcressey
force-pushed
the
more-image-features
branch
from
8a09cc0
to
44181fd
Compare
Promote "in-place-updates" and "host-containers" to feature flags, and enable them by default for backwards compatibility. The in-place update feature requires two sets of partitions, which wastes disk space if the variant will only ever run on nodes that are replaced rather than updated in-place. The host containers feature supports execution of containers at fixed points during the host's lifecycle: during boot, and as background services once the host is fully configured. This may not be desirable for variants looking for stronger guarantees that only the software included in the immutable root filesystem will ever run. Expose these as feature flags so that variants can opt-out. Signed-off-by: Ben Cressey <bcressey@amazon.com>
`buildsys` no longer sets this feature flag for any build, so do not look for it during bcond generation or apply it to the metadata RPM. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Add the "in-place-updates" and "host-containers" features to the metadata spec so that packages can arrange to be installed based on whether they are enabled or disabled. Disabling in-place update support implies removing the second set of partitions that will never be used. Adjust the partition sizing logic to double the size of the first set of partitions when the second set is omitted. Overhaul the "get_partition_sizes" logic in partyplanner to avoid making assumptions about the partition layout of input images, such as how many there will be, and instead to just record details about each partition. Signed-off-by: Ben Cressey <bcressey@amazon.com>
bcressey
force-pushed
the
more-image-features
branch
from
44181fd
to
828198d
Compare
arnaldo2792
approved these changes
Jul 2, 2024
| pp_offset["BOOT-${bank}"]="${offset}" | ||
| pp_size["BOOT-${bank}"]="${boot_mib}" | ||
| ((offset += boot_mib)) | ||
| pp_offset["BOOT-${bank}"]="${offset}" |
There was a problem hiding this comment.
This spacing seem suspicious, are they spaces or tabs?
There was a problem hiding this comment.
This spacing seem suspicious, are they spaces or tabs?
There are no tabs in this file. It's just following the two space indentation convention of the rest of the file.
yeazelm
approved these changes
Jul 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
N/A
Description of changes:
Remove support for the
unified-cgroup-hierarchyimage feature, which is effectively no longer implemented.Add support for two new features that are enabled by default:
in-place-updates, which affects the partition layouthost-containers, which only affects what software might be installedThese features can be targeted by RPM boolean dependencies in package specs to arrange for software to be installed only if the feature is enabled for a given variant.
Most of the non-boilerplate work was in
partyplanner.get_partition_sizesneeded better handling for theRESERVEDpartitions (rather than assuming there would always be two), andset_partition_sizesneeded a new mode for laying out partitions.Testing done:
Built
aws-devwith both new features disabled, andaws-k8s-1.24with both enabled.aws-devpartition layout:aws-k8s-1.24partition layout:cargo make repack-variantworked for both.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.