From 125c379d47f1aef6137b3af1a8df4806b315ae4a Mon Sep 17 00:00:00 2001 From: Markus Boehme Date: Mon, 31 Jul 2023 15:30:57 +0000 Subject: [PATCH 1/4] host-containers: update admin container to v0.10.2 Signed-off-by: Markus Boehme --- sources/models/shared-defaults/aws-host-containers.toml | 2 +- sources/models/shared-defaults/public-host-containers.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/models/shared-defaults/aws-host-containers.toml b/sources/models/shared-defaults/aws-host-containers.toml index f3e24a6bbe9..7147bac4700 100644 --- a/sources/models/shared-defaults/aws-host-containers.toml +++ b/sources/models/shared-defaults/aws-host-containers.toml @@ -4,7 +4,7 @@ superpowered = true [metadata.settings.host-containers.admin.source] setting-generator = "schnauzer settings.host-containers.admin.source" -template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.10.1" +template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.10.2" [metadata.settings.host-containers.admin.user-data] setting-generator = "shibaken generate-admin-userdata" diff --git a/sources/models/shared-defaults/public-host-containers.toml b/sources/models/shared-defaults/public-host-containers.toml index acc4ad38421..cd7695dd39f 100644 --- a/sources/models/shared-defaults/public-host-containers.toml +++ b/sources/models/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.10.1" +source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2" [settings.host-containers.control] enabled = false From eb8f3ada9f99fa5535172bb671859f213da9d280 Mon Sep 17 00:00:00 2001 From: Markus Boehme Date: Mon, 31 Jul 2023 15:30:57 +0000 Subject: [PATCH 2/4] host-containers: update control container to v0.7.3 Signed-off-by: Markus Boehme --- sources/models/shared-defaults/aws-host-containers.toml | 2 +- sources/models/shared-defaults/public-host-containers.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/models/shared-defaults/aws-host-containers.toml b/sources/models/shared-defaults/aws-host-containers.toml index 7147bac4700..04bc47c3a40 100644 --- a/sources/models/shared-defaults/aws-host-containers.toml +++ b/sources/models/shared-defaults/aws-host-containers.toml @@ -15,4 +15,4 @@ superpowered = false [metadata.settings.host-containers.control.source] setting-generator = "schnauzer settings.host-containers.control.source" -template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.2" +template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.3" diff --git a/sources/models/shared-defaults/public-host-containers.toml b/sources/models/shared-defaults/public-host-containers.toml index cd7695dd39f..11f8440a6d0 100644 --- a/sources/models/shared-defaults/public-host-containers.toml +++ b/sources/models/shared-defaults/public-host-containers.toml @@ -11,4 +11,4 @@ source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2" [settings.host-containers.control] enabled = false superpowered = false -source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.2" +source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3" From 8b7e86a1d41cf0ee2a992be205f303477de4e964 Mon Sep 17 00:00:00 2001 From: Markus Boehme Date: Mon, 31 Jul 2023 15:36:48 +0000 Subject: [PATCH 3/4] migrations: migrate to admin container v0.10.2 Signed-off-by: Markus Boehme --- Release.toml | 5 +++- sources/Cargo.lock | 14 ++++++++++ sources/Cargo.toml | 2 ++ .../aws-admin-container-v0-10-2/Cargo.toml | 12 +++++++++ .../aws-admin-container-v0-10-2/src/main.rs | 27 +++++++++++++++++++ .../public-admin-container-v0-10-2/Cargo.toml | 12 +++++++++ .../src/main.rs | 25 +++++++++++++++++ 7 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/Cargo.toml create mode 100644 sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/src/main.rs create mode 100644 sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/Cargo.toml create mode 100644 sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/src/main.rs diff --git a/Release.toml b/Release.toml index 0ff123f00ab..6d664dae326 100644 --- a/Release.toml +++ b/Release.toml @@ -215,5 +215,8 @@ version = "1.15.0" "(1.14.1, 1.14.2)" = [ "migrate_v1.14.2_ecs-images-cleanup.lz4", ] -"(1.14.2, 1.14.3)" = [] +"(1.14.2, 1.14.3)" = [ + "migrate_v1.14.3_aws-admin-container-v0-10-2.lz4", + "migrate_v1.14.3_public-admin-container-v0-10-2.lz4", +] "(1.14.3, 1.15.0)" = [] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 2db8ac1359c..257ed562d16 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -501,6 +501,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-admin-container-v0-10-2" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-admin-container-v0-9-4" version = "0.1.0" @@ -2998,6 +3005,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-admin-container-v0-10-2" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "public-admin-container-v0-9-4" version = "0.1.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 52aff72bffe..4a838a4dc4b 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -53,6 +53,8 @@ members = [ "api/migration/migrations/v1.14.0/aws-control-container-v0-7-2", "api/migration/migrations/v1.14.0/public-control-container-v0-7-2", "api/migration/migrations/v1.14.2/ecs-images-cleanup", + "api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2", + "api/migration/migrations/v1.14.3/public-admin-container-v0-10-2", "bloodhound", diff --git a/sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/Cargo.toml b/sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/Cargo.toml new file mode 100644 index 00000000000..5a6a76d9a93 --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "aws-admin-container-v0-10-2" +version = "0.1.0" +authors = ["Markus Boehme "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[dependencies] +migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/src/main.rs b/sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/src/main.rs new file mode 100644 index 00000000000..948dcb68ca2 --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2/src/main.rs @@ -0,0 +1,27 @@ +use migration_helpers::common_migrations::ReplaceTemplateMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +const OLD_ADMIN_CTR_TEMPLATE: &str = + "{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.10.1"; +const NEW_ADMIN_CTR_TEMPLATE: &str = + "{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.10.2"; + +/// We bumped the version of the default admin container +fn run() -> Result<()> { + migrate(ReplaceTemplateMigration { + setting: "settings.host-containers.admin.source", + old_template: OLD_ADMIN_CTR_TEMPLATE, + new_template: NEW_ADMIN_CTR_TEMPLATE, + }) +} + +// 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/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/Cargo.toml b/sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/Cargo.toml new file mode 100644 index 00000000000..2b05b86cdf8 --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "public-admin-container-v0-10-2" +version = "0.1.0" +authors = ["Markus Boehme "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[dependencies] +migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/src/main.rs b/sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/src/main.rs new file mode 100644 index 00000000000..c3ef332e08f --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/public-admin-container-v0-10-2/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.10.1"; +const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2"; + +/// 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 d9a03fe9900fd6287140bf547aab8a431812aa2d Mon Sep 17 00:00:00 2001 From: Markus Boehme Date: Mon, 31 Jul 2023 15:38:33 +0000 Subject: [PATCH 4/4] migrations: migrate to control container v0.7.3 Signed-off-by: Markus Boehme --- Release.toml | 2 ++ sources/Cargo.lock | 14 ++++++++++ sources/Cargo.toml | 2 ++ .../aws-control-container-v0-7-3/Cargo.toml | 12 +++++++++ .../aws-control-container-v0-7-3/src/main.rs | 27 +++++++++++++++++++ .../Cargo.toml | 12 +++++++++ .../src/main.rs | 25 +++++++++++++++++ 7 files changed, 94 insertions(+) create mode 100644 sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/Cargo.toml create mode 100644 sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/src/main.rs create mode 100644 sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/Cargo.toml create mode 100644 sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/src/main.rs diff --git a/Release.toml b/Release.toml index 6d664dae326..1a7b8c2ca9e 100644 --- a/Release.toml +++ b/Release.toml @@ -218,5 +218,7 @@ version = "1.15.0" "(1.14.2, 1.14.3)" = [ "migrate_v1.14.3_aws-admin-container-v0-10-2.lz4", "migrate_v1.14.3_public-admin-container-v0-10-2.lz4", + "migrate_v1.14.3_aws-control-container-v0-7-3.lz4", + "migrate_v1.14.3_public-control-container-v0-7-3.lz4", ] "(1.14.3, 1.15.0)" = [] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 257ed562d16..6c04bacedfb 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -565,6 +565,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-control-container-v0-7-3" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-credential-types" version = "0.54.1" @@ -3040,6 +3047,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-control-container-v0-7-3" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "quick-xml" version = "0.26.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 4a838a4dc4b..3198c5efb6d 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -55,6 +55,8 @@ members = [ "api/migration/migrations/v1.14.2/ecs-images-cleanup", "api/migration/migrations/v1.14.3/aws-admin-container-v0-10-2", "api/migration/migrations/v1.14.3/public-admin-container-v0-10-2", + "api/migration/migrations/v1.14.3/aws-control-container-v0-7-3", + "api/migration/migrations/v1.14.3/public-control-container-v0-7-3", "bloodhound", diff --git a/sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/Cargo.toml b/sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/Cargo.toml new file mode 100644 index 00000000000..29b768fcdea --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "aws-control-container-v0-7-3" +version = "0.1.0" +authors = ["Markus Boehme "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[dependencies] +migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/src/main.rs b/sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/src/main.rs new file mode 100644 index 00000000000..0483cb51c1f --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/aws-control-container-v0-7-3/src/main.rs @@ -0,0 +1,27 @@ +use migration_helpers::common_migrations::ReplaceTemplateMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +const OLD_CONTROL_CTR_TEMPLATE: &str = + "{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.2"; +const NEW_CONTROL_CTR_TEMPLATE: &str = + "{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.3"; + +/// We bumped the version of the default control container +fn run() -> Result<()> { + migrate(ReplaceTemplateMigration { + setting: "settings.host-containers.control.source", + old_template: OLD_CONTROL_CTR_TEMPLATE, + new_template: NEW_CONTROL_CTR_TEMPLATE, + }) +} + +// 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/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/Cargo.toml b/sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/Cargo.toml new file mode 100644 index 00000000000..59d6818ab9e --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "public-control-container-v0-7-3" +version = "0.1.0" +authors = ["Markus Boehme "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[dependencies] +migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/src/main.rs b/sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/src/main.rs new file mode 100644 index 00000000000..260653be8fb --- /dev/null +++ b/sources/api/migration/migrations/v1.14.3/public-control-container-v0-7-3/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.2"; +const NEW_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3"; + +/// 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); + } +}