Merge pull request #23 from bcressey/make-features-optional

enable host containers and in-place updates to be optional
bottlerocket-os · Jul 3, 2024 · a4226f4 · a4226f4
2 parents e4f9f14 + 095acef
commit a4226f4
Show file tree

Hide file tree

Showing 14 changed files with 192 additions and 90 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/os/Cargo.toml b/packages/os/Cargo.toml
@@ -33,8 +33,8 @@ glibc = { path = "../glibc" }
 
 # RPM Requires
 [dependencies]
-# We depend on these packages at runtime, and are expected to be pulled in
-# by way of the `release` package.
+# We depend on these packages at runtime, and they are expected to be built
+# because they are included in the core kit.
 # `host-ctr` for host containers functionality
 # host-ctr = { path = "../host-ctr" }
 # kexec-tools and makedumpfile required for prairiedog functionality

diff --git a/packages/os/apiserver.service b/packages/os/apiserver.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Bottlerocket API server
-After=storewolf.service migrator.service
-Requires=storewolf.service migrator.service
+After=storewolf.service
+Requires=storewolf.service
 
 [Service]
 Type=notify

diff --git a/packages/os/mark-successful-boot.service b/packages/os/mark-successful-boot.service
@@ -3,7 +3,6 @@ Description=Call signpost to mark the boot as successful after all required targ
 # This unit is in charge of updating the partitions on successful boots. Use other service
 # units instead of adding more `ExecStart*` lines to prevent indirect dependencies on
 # other units not listed in the `RequiredBy` section.
-Requires=migrator.service
 # Block manual interactions with this service, manually running it could leave the system in an
 # unexpected state
 RefuseManualStart=true

diff --git a/packages/os/migrator.service b/packages/os/migrator.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Bottlerocket data store migrator
+Before=apiserver.service mark-successful-boot.service storewolf.service
+
 RefuseManualStart=true
 RefuseManualStop=true
 
@@ -16,4 +18,4 @@ StandardOutput=journal+console
 StandardError=journal+console
 
 [Install]
-RequiredBy=preconfigured.target
+RequiredBy=preconfigured.target apiserver.service mark-successful-boot.service storewolf.service
diff --git a/packages/os/os.spec b/packages/os/os.spec
@@ -74,15 +74,11 @@ BuildRequires: %{_cross_os}glibc-devel
 Requires: %{_cross_os}apiclient
 Requires: %{_cross_os}apiserver
 Requires: %{_cross_os}bloodhound
-Requires: %{_cross_os}bootstrap-containers
-Requires: %{_cross_os}bork
 Requires: %{_cross_os}corndog
 Requires: %{_cross_os}certdog
 Requires: %{_cross_os}ghostdog
-Requires: %{_cross_os}host-containers
 Requires: %{_cross_os}logdog
 Requires: %{_cross_os}metricdog
-Requires: %{_cross_os}migration
 Requires: %{_cross_os}prairiedog
 Requires: %{_cross_os}schnauzer
 Requires: %{_cross_os}settings-committer
@@ -92,8 +88,14 @@ Requires: %{_cross_os}storewolf
 Requires: %{_cross_os}sundog
 Requires: %{_cross_os}xfscli
 Requires: %{_cross_os}thar-be-settings
-Requires: %{_cross_os}thar-be-updates
-Requires: %{_cross_os}updog
+
+Requires: (%{_cross_os}bootstrap-containers or %{_cross_os}image-feature(no-host-containers))
+Requires: (%{_cross_os}host-containers or %{_cross_os}image-feature(no-host-containers))
+
+Requires: (%{_cross_os}bork or %{_cross_os}image-feature(no-in-place-updates))
+Requires: (%{_cross_os}migration or %{_cross_os}image-feature(no-in-place-updates))
+Requires: (%{_cross_os}thar-be-updates or %{_cross_os}image-feature(no-in-place-updates))
+Requires: (%{_cross_os}updog or %{_cross_os}image-feature(no-in-place-updates))
 
 Requires: (%{_cross_os}pluto if %{_cross_os}variant-family(aws-k8s))
 Requires: (%{_cross_os}shibaken if %{_cross_os}variant-platform(aws))
@@ -124,6 +126,7 @@ Summary: Updates settings dynamically based on user-specified generators
 
 %package -n %{_cross_os}bork
 Summary: Dynamic setting generator for updog
+Conflicts: %{_cross_os}image-feature(no-in-place-updates)
 %description -n %{_cross_os}bork
 %{summary}.
 
@@ -144,12 +147,14 @@ Summary: Applies changed settings to a Bottlerocket system
 
 %package -n %{_cross_os}thar-be-updates
 Summary: Dispatches Bottlerocket update commands
+Conflicts: %{_cross_os}image-feature(no-in-place-updates)
 %description -n %{_cross_os}thar-be-updates
 %{summary}.
 
 %package -n %{_cross_os}host-containers
 Summary: Manages system- and user-defined host containers
 Requires: %{_cross_os}host-ctr
+Conflicts: %{_cross_os}image-feature(no-host-containers)
 %description -n %{_cross_os}host-containers
 %{summary}.
 
@@ -161,6 +166,7 @@ Requires: %{_cross_os}settings-defaults
 
 %package -n %{_cross_os}migration
 Summary: Tools to migrate version formats
+Conflicts: %{_cross_os}image-feature(no-in-place-updates)
 %description -n %{_cross_os}migration
 
 %package -n %{_cross_os}settings-committer
@@ -181,6 +187,7 @@ Summary: Bottlerocket GPT priority querier/switcher
 
 %package -n %{_cross_os}updog
 Summary: Bottlerocket updater CLI
+Conflicts: %{_cross_os}image-feature(no-in-place-updates)
 %description -n %{_cross_os}updog
 not much what's up with you
 
@@ -241,6 +248,8 @@ Requires: %{_cross_os}binutils
 
 %package -n %{_cross_os}bootstrap-containers
 Summary: Manages bootstrap-containers
+Requires: %{_cross_os}host-ctr
+Conflicts: %{_cross_os}image-feature(no-host-containers)
 %description -n %{_cross_os}bootstrap-containers
 %{summary}.
 
@@ -515,7 +524,6 @@ install -p -m 0644 %{S:400} %{S:401} %{S:402} %{buildroot}%{_cross_licensedir}
 %files -n %{_cross_os}apiserver
 %{_cross_bindir}/apiserver
 %{_cross_unitdir}/apiserver.service
-%{_cross_unitdir}/migrator.service
 %{_cross_sysusersdir}/api.conf
 
 %files -n %{_cross_os}apiclient
@@ -560,6 +568,7 @@ install -p -m 0644 %{S:400} %{S:401} %{S:402} %{buildroot}%{_cross_licensedir}
 
 %files -n %{_cross_os}migration
 %{_cross_bindir}/migrator
+%{_cross_unitdir}/migrator.service
 %{_cross_tmpfilesdir}/migration.conf
 
 %files -n %{_cross_os}settings-committer

diff --git a/packages/os/storewolf.service b/packages/os/storewolf.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Datastore creator
-After=migrator.service
-Requires=migrator.service
 # Block manual interactions with this service, since it could leave the system in an
 # unexpected state
 RefuseManualStart=true

diff --git a/packages/release/Cargo.toml b/packages/release/Cargo.toml
@@ -31,7 +31,6 @@ findutils = { path = "../findutils" }
 glibc = { path = "../glibc" }
 grep = { path = "../grep" }
 grub = { path = "../grub" }
-host-ctr = { path = "../host-ctr" }
 iproute = { path = "../iproute" }
 iptables = { path = "../iptables" }
 kexec-tools = { path = "../../packages/kexec-tools" }

diff --git a/packages/release/release.spec b/packages/release/release.spec
@@ -115,7 +115,6 @@ Requires: %{_cross_os}findutils
 Requires: %{_cross_os}glibc
 Requires: %{_cross_os}grep
 Requires: %{_cross_os}grub
-Requires: %{_cross_os}host-ctr
 Requires: %{_cross_os}iproute
 Requires: %{_cross_os}iptables
 Requires: %{_cross_os}kexec-tools

diff --git a/sources/updater/signpost/src/error.rs b/sources/updater/signpost/src/error.rs
@@ -22,6 +22,9 @@ pub enum Error {
         source: block_party::Error,
     },
 
+    #[snafu(display("Failed to convert vec to array"))]
+    ConvertVec {},
+
     #[snafu(display("Failed to get disk from partition {}: {}", device.display(), source))]
     DiskFromPartition {
         device: PathBuf,
@@ -43,6 +46,9 @@ pub enum Error {
     #[snafu(display("Inactive partition {} is already marked for upgrade", inactive.display()))]
     InactiveAlreadyMarked { inactive: PathBuf },
 
+    #[snafu(display("Inactive partition {} is not available", inactive.display()))]
+    InactiveNotAvailable { inactive: PathBuf },
+
     #[snafu(display("Inactive partition {} has not been marked valid for upgrade", inactive.display()))]
     InactiveNotValid { inactive: PathBuf },
 

diff --git a/sources/updater/signpost/src/main.rs b/sources/updater/signpost/src/main.rs
@@ -43,23 +43,23 @@ fn main() {
         match command {
             Command::Status => println!("{state}"),
             Command::ClearInactive => {
-                state.clear_inactive();
+                state.clear_inactive()?;
                 state.write()?;
             }
             Command::MarkSuccessfulBoot => {
                 state.mark_successful_boot();
                 state.write()?;
             }
             Command::MarkInactiveValid => {
-                state.mark_inactive_valid();
+                state.mark_inactive_valid()?;
                 state.write()?;
             }
             Command::UpgradeToInactive => {
                 state.upgrade_to_inactive()?;
                 state.write()?;
             }
             Command::CancelUpgrade => {
-                state.cancel_upgrade();
+                state.cancel_upgrade()?;
                 state.write()?;
             }
             Command::RollbackToInactive => {