diff --git a/Release.toml b/Release.toml index 0d323224e9f..91c1682430a 100644 --- a/Release.toml +++ b/Release.toml @@ -1,4 +1,4 @@ -version = "1.63.0" +version = "1.64.0" [migrations] "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"] @@ -475,3 +475,6 @@ version = "1.63.0" "migrate_v1.63.0_image-verifier-plugins-settings.lz4", "migrate_v1.63.0_nvidia-k8s-device-plugin-enabled.lz4", ] +"(1.63.0, 1.64.0)" = [ + "migrate_v1.64.0_measurement-excluded-settings.lz4", +] diff --git a/Twoliter.toml b/Twoliter.toml index 32e5444a73f..139cce401ea 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -1,5 +1,5 @@ schema-version = 2 -release-version = "1.63.0" +release-version = "1.64.0" project-vendor = "Bottlerocket" [vendor.bottlerocket] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index f8ea5be548c..90ba48e68a3 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -1294,6 +1294,13 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +[[package]] +name = "measurement-excluded-settings" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "memchr" version = "2.8.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 8c72f0ee115..4bc5867ea1f 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -65,6 +65,7 @@ members = [ "settings-migrations/v1.60.0/container-runtime-max-concurrent-unpacks", "settings-migrations/v1.63.0/image-verifier-plugins-settings", "settings-migrations/v1.63.0/nvidia-k8s-device-plugin-enabled", + "settings-migrations/v1.64.0/measurement-excluded-settings", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-2", diff --git a/sources/settings-migrations/v1.64.0/measurement-excluded-settings/Cargo.toml b/sources/settings-migrations/v1.64.0/measurement-excluded-settings/Cargo.toml new file mode 100644 index 00000000000..ae0341b6edf --- /dev/null +++ b/sources/settings-migrations/v1.64.0/measurement-excluded-settings/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "measurement-excluded-settings" +version = "0.1.0" +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +exclude = ["README.md"] + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.64.0/measurement-excluded-settings/src/main.rs b/sources/settings-migrations/v1.64.0/measurement-excluded-settings/src/main.rs new file mode 100644 index 00000000000..4c28a25bdab --- /dev/null +++ b/sources/settings-migrations/v1.64.0/measurement-excluded-settings/src/main.rs @@ -0,0 +1,21 @@ +use migration_helpers::common_migrations::AddSettingsMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +/// We added a new setting for configuring which settings are excluded from PCR 8 measurement: +/// - settings.measurement.excluded-settings +fn run() -> Result<()> { + migrate(AddSettingsMigration(&[ + "settings.measurement.excluded-settings", + ])) +} + +// Returning a Result from main makes it print a Debug representation of the error, but with Snafu +// we have nice Display representations of the error, so we wrap "main" (run) and print any error. +// https://github.com/shepmaster/snafu/issues/110 +fn main() { + if let Err(e) = run() { + eprintln!("{e}"); + process::exit(1); + } +} diff --git a/sources/settings-plugins/aws-dev/src/lib.rs b/sources/settings-plugins/aws-dev/src/lib.rs index c54a965d79e..6516a6e8bb5 100644 --- a/sources/settings-plugins/aws-dev/src/lib.rs +++ b/sources/settings-plugins/aws-dev/src/lib.rs @@ -19,4 +19,5 @@ struct AwsDevSettings { oci_hooks: bottlerocket_settings_models::OciHooksSettingsV1, cloudformation: bottlerocket_settings_models::CloudFormationSettingsV1, dns: bottlerocket_settings_models::DnsSettingsV1, + measurement: bottlerocket_settings_models::MeasurementSettingsV1, } diff --git a/sources/settings-plugins/aws-ecs-3/src/lib.rs b/sources/settings-plugins/aws-ecs-3/src/lib.rs index 46369c12d26..85d0d7d2dba 100644 --- a/sources/settings-plugins/aws-ecs-3/src/lib.rs +++ b/sources/settings-plugins/aws-ecs-3/src/lib.rs @@ -24,4 +24,5 @@ struct AwsEcs3Settings { autoscaling: bottlerocket_settings_models::AutoScalingSettingsV1, dns: bottlerocket_settings_models::DnsSettingsV1, image_verifier_plugins: bottlerocket_settings_models::ImageVerifierPluginsSettingsV1, + measurement: bottlerocket_settings_models::MeasurementSettingsV1, } diff --git a/sources/settings-plugins/aws-ecs-4/src/lib.rs b/sources/settings-plugins/aws-ecs-4/src/lib.rs index 0fa7fd87e6e..cd34489c958 100644 --- a/sources/settings-plugins/aws-ecs-4/src/lib.rs +++ b/sources/settings-plugins/aws-ecs-4/src/lib.rs @@ -24,4 +24,5 @@ struct AwsEcs4Settings { autoscaling: bottlerocket_settings_models::AutoScalingSettingsV1, dns: bottlerocket_settings_models::DnsSettingsV1, image_verifier_plugins: bottlerocket_settings_models::ImageVerifierPluginsSettingsV1, + measurement: bottlerocket_settings_models::MeasurementSettingsV1, } diff --git a/sources/settings-plugins/vmware-dev/src/lib.rs b/sources/settings-plugins/vmware-dev/src/lib.rs index e4a37ac4ed7..005f6fcdaf2 100644 --- a/sources/settings-plugins/vmware-dev/src/lib.rs +++ b/sources/settings-plugins/vmware-dev/src/lib.rs @@ -17,4 +17,5 @@ struct VmwareDevSettings { container_registry: bottlerocket_settings_models::RegistrySettingsV1, oci_hooks: bottlerocket_settings_models::OciHooksSettingsV1, dns: bottlerocket_settings_models::DnsSettingsV1, + measurement: bottlerocket_settings_models::MeasurementSettingsV1, }