From 8a09abb21481613bf1d5e7b7e23af3c9ef1165eb Mon Sep 17 00:00:00 2001 From: Kyle Sessions Date: Sat, 31 Aug 2024 01:20:27 +0000 Subject: [PATCH 1/5] release: Bump release to 1.22.0 Signed-off-by: Kyle Sessions --- Release.toml | 2 +- Twoliter.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Release.toml b/Release.toml index 0828ec3708d..8499a869014 100644 --- a/Release.toml +++ b/Release.toml @@ -1,4 +1,4 @@ -version = "1.21.1" +version = "1.22.0" [migrations] "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"] diff --git a/Twoliter.toml b/Twoliter.toml index 6a6040012b8..2088b3924a4 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -1,5 +1,5 @@ schema-version = 1 -release-version = "1.21.1" +release-version = "1.22.0" [vendor.bottlerocket] registry = "public.ecr.aws/bottlerocket" From b8007795b09f2e0f703478a32ce73fe6e0113d65 Mon Sep 17 00:00:00 2001 From: Kyle Sessions Date: Sat, 31 Aug 2024 01:21:15 +0000 Subject: [PATCH 2/5] host-containers: update admin container to v0.11.11 Signed-off-by: Kyle Sessions --- sources/shared-defaults/aws-host-containers.toml | 2 +- sources/shared-defaults/public-host-containers.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/shared-defaults/aws-host-containers.toml b/sources/shared-defaults/aws-host-containers.toml index 375764cf68b..d27fde7dcdd 100644 --- a/sources/shared-defaults/aws-host-containers.toml +++ b/sources/shared-defaults/aws-host-containers.toml @@ -3,7 +3,7 @@ enabled = false superpowered = true [metadata.settings.host-containers.admin.source] -setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.10'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.11'" [metadata.settings.host-containers.admin.user-data] setting-generator = "shibaken generate-admin-userdata" diff --git a/sources/shared-defaults/public-host-containers.toml b/sources/shared-defaults/public-host-containers.toml index 8801a0c9432..e573ec66328 100644 --- a/sources/shared-defaults/public-host-containers.toml +++ b/sources/shared-defaults/public-host-containers.toml @@ -6,7 +6,7 @@ [settings.host-containers.admin] enabled = false superpowered = true -source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.10" +source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.11" [settings.host-containers.control] enabled = false From d799cb4ec484444c14b99652cdfdb2e12b0b4ec0 Mon Sep 17 00:00:00 2001 From: Kyle Sessions Date: Sat, 31 Aug 2024 01:21:40 +0000 Subject: [PATCH 3/5] host-containers: update control container to v0.7.15 Signed-off-by: Kyle Sessions --- sources/shared-defaults/aws-host-containers.toml | 2 +- sources/shared-defaults/public-host-containers.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/shared-defaults/aws-host-containers.toml b/sources/shared-defaults/aws-host-containers.toml index d27fde7dcdd..ff8f2b463bd 100644 --- a/sources/shared-defaults/aws-host-containers.toml +++ b/sources/shared-defaults/aws-host-containers.toml @@ -13,4 +13,4 @@ enabled = true superpowered = false [metadata.settings.host-containers.control.source] -setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.14'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.15'" diff --git a/sources/shared-defaults/public-host-containers.toml b/sources/shared-defaults/public-host-containers.toml index e573ec66328..1a14f9efed0 100644 --- a/sources/shared-defaults/public-host-containers.toml +++ b/sources/shared-defaults/public-host-containers.toml @@ -11,4 +11,4 @@ source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.11" [settings.host-containers.control] enabled = false superpowered = false -source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.14" +source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.15" From a951df348bd656f85469212bb4aa56506c7bc7e8 Mon Sep 17 00:00:00 2001 From: Kyle Sessions Date: Sat, 31 Aug 2024 03:51:26 +0000 Subject: [PATCH 4/5] migrations: migrate to admin container v0.11.11 Signed-off-by: Kyle Sessions --- Release.toml | 4 +++ sources/Cargo.lock | 14 ++++++++++ sources/Cargo.toml | 2 ++ .../aws-admin-container-v0-11-11/Cargo.toml | 15 +++++++++++ .../aws-admin-container-v0-11-11/src/main.rs | 27 +++++++++++++++++++ .../Cargo.toml | 15 +++++++++++ .../src/main.rs | 25 +++++++++++++++++ 7 files changed, 102 insertions(+) create mode 100644 sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/Cargo.toml create mode 100644 sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/src/main.rs create mode 100644 sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/Cargo.toml create mode 100644 sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/src/main.rs diff --git a/Release.toml b/Release.toml index 8499a869014..e744f9ccc32 100644 --- a/Release.toml +++ b/Release.toml @@ -336,3 +336,7 @@ version = "1.22.0" "migrate_v1.21.1_aws-control-container-v0-7-14.lz4", "migrate_v1.21.1_public-control-container-v0-7-14.lz4", ] +"(1.21.1, 1.22.0)" = [ + "migrate_v1.22.0_aws-admin-container-v0-11-11.lz4", + "migrate_v1.22.0_public-admin-container-v0-11-11.lz4", +] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index f49c8e52eac..b283f78f8cd 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -292,6 +292,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-admin-container-v0-11-11" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-control-container-v0-7-14" version = "0.1.0" @@ -1641,6 +1648,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-admin-container-v0-11-11" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "public-control-container-v0-7-14" version = "0.1.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 337ab352cdd..3c193ac008d 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -45,6 +45,8 @@ members = [ "settings-migrations/v1.21.1/public-admin-container-v0-11-10", "settings-migrations/v1.21.1/aws-control-container-v0-7-14", "settings-migrations/v1.21.1/public-control-container-v0-7-14", + "settings-migrations/v1.22.0/aws-admin-container-v0-11-11", + "settings-migrations/v1.22.0/public-admin-container-v0-11-11", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-1", diff --git a/sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/Cargo.toml b/sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/Cargo.toml new file mode 100644 index 00000000000..6981b6c90f6 --- /dev/null +++ b/sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-admin-container-v0-11-11" +version = "0.1.0" +authors = ["Kyle Sessions "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/src/main.rs b/sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/src/main.rs new file mode 100644 index 00000000000..e7dbcf8c3b2 --- /dev/null +++ b/sources/settings-migrations/v1.22.0/aws-admin-container-v0-11-11/src/main.rs @@ -0,0 +1,27 @@ +use migration_helpers::common_migrations::ReplaceSchnauzerMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +const OLD_ADMIN_CTR_CMDLINE: &str = + "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.10'"; +const NEW_ADMIN_CTR_CMDLINE: &str = + "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.11'"; + +/// We bumped the version of the default admin container +fn run() -> Result<()> { + migrate(ReplaceSchnauzerMigration { + setting: "settings.host-containers.admin.source", + old_schnauzer_cmdline: OLD_ADMIN_CTR_CMDLINE, + new_schnauzer_cmdline: NEW_ADMIN_CTR_CMDLINE, + }) +} + +// 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-migrations/v1.22.0/public-admin-container-v0-11-11/Cargo.toml b/sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/Cargo.toml new file mode 100644 index 00000000000..6825dce8106 --- /dev/null +++ b/sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-admin-container-v0-11-11" +version = "0.1.0" +authors = ["Kyle Sessions "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/src/main.rs b/sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/src/main.rs new file mode 100644 index 00000000000..308276b501a --- /dev/null +++ b/sources/settings-migrations/v1.22.0/public-admin-container-v0-11-11/src/main.rs @@ -0,0 +1,25 @@ +use migration_helpers::common_migrations::ReplaceStringMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +const OLD_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.10"; +const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.11"; + +/// We bumped the version of the default admin container +fn run() -> Result<()> { + migrate(ReplaceStringMigration { + setting: "settings.host-containers.admin.source", + old_val: OLD_ADMIN_CTR_SOURCE_VAL, + new_val: NEW_ADMIN_CTR_SOURCE_VAL, + }) +} + +// 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); + } +} From b6430bd583675a1458ae302c8f99d7f408737c5f Mon Sep 17 00:00:00 2001 From: Kyle Sessions Date: Sat, 31 Aug 2024 03:52:13 +0000 Subject: [PATCH 5/5] migrations: migrate to control container v0.7.15 Signed-off-by: Kyle Sessions --- Release.toml | 2 ++ sources/Cargo.lock | 14 ++++++++++ sources/Cargo.toml | 2 ++ .../aws-control-container-v0-7-15/Cargo.toml | 15 +++++++++++ .../aws-control-container-v0-7-15/src/main.rs | 27 +++++++++++++++++++ .../Cargo.toml | 15 +++++++++++ .../src/main.rs | 25 +++++++++++++++++ 7 files changed, 100 insertions(+) create mode 100644 sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/Cargo.toml create mode 100644 sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/src/main.rs create mode 100644 sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/Cargo.toml create mode 100644 sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/src/main.rs diff --git a/Release.toml b/Release.toml index e744f9ccc32..0618691614b 100644 --- a/Release.toml +++ b/Release.toml @@ -339,4 +339,6 @@ version = "1.22.0" "(1.21.1, 1.22.0)" = [ "migrate_v1.22.0_aws-admin-container-v0-11-11.lz4", "migrate_v1.22.0_public-admin-container-v0-11-11.lz4", + "migrate_v1.22.0_aws-control-container-v0-7-15.lz4", + "migrate_v1.22.0_public-control-container-v0-7-15.lz4", ] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index b283f78f8cd..2612ba4c78d 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -306,6 +306,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-control-container-v0-7-15" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -1662,6 +1669,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-control-container-v0-7-15" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "quote" version = "1.0.36" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 3c193ac008d..497ddfb87e8 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -47,6 +47,8 @@ members = [ "settings-migrations/v1.21.1/public-control-container-v0-7-14", "settings-migrations/v1.22.0/aws-admin-container-v0-11-11", "settings-migrations/v1.22.0/public-admin-container-v0-11-11", + "settings-migrations/v1.22.0/aws-control-container-v0-7-15", + "settings-migrations/v1.22.0/public-control-container-v0-7-15", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-1", diff --git a/sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/Cargo.toml b/sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/Cargo.toml new file mode 100644 index 00000000000..2d9e942d2ce --- /dev/null +++ b/sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-control-container-v0-7-15" +version = "0.1.0" +authors = ["Kyle Sessions "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/src/main.rs b/sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/src/main.rs new file mode 100644 index 00000000000..1f8a4e4d198 --- /dev/null +++ b/sources/settings-migrations/v1.22.0/aws-control-container-v0-7-15/src/main.rs @@ -0,0 +1,27 @@ +use migration_helpers::common_migrations::ReplaceSchnauzerMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +const OLD_CONTROL_CTR_CMDLINE: &str = + "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.14'"; +const NEW_CONTROL_CTR_CMDLINE: &str = + "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.15'"; + +/// We bumped the version of the default control container +fn run() -> Result<()> { + migrate(ReplaceSchnauzerMigration { + setting: "settings.host-containers.control.source", + old_schnauzer_cmdline: OLD_CONTROL_CTR_CMDLINE, + new_schnauzer_cmdline: NEW_CONTROL_CTR_CMDLINE, + }) +} + +// 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-migrations/v1.22.0/public-control-container-v0-7-15/Cargo.toml b/sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/Cargo.toml new file mode 100644 index 00000000000..7241d479df2 --- /dev/null +++ b/sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-control-container-v0-7-15" +version = "0.1.0" +authors = ["Kyle Sessions "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/src/main.rs b/sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/src/main.rs new file mode 100644 index 00000000000..edc951a4a37 --- /dev/null +++ b/sources/settings-migrations/v1.22.0/public-control-container-v0-7-15/src/main.rs @@ -0,0 +1,25 @@ +use migration_helpers::common_migrations::ReplaceStringMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +const OLD_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.14"; +const NEW_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.15"; + +/// We bumped the version of the default control container +fn run() -> Result<()> { + migrate(ReplaceStringMigration { + setting: "settings.host-containers.control.source", + old_val: OLD_CONTROL_CTR_SOURCE_VAL, + new_val: NEW_CONTROL_CTR_SOURCE_VAL, + }) +} + +// 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); + } +}