diff --git a/Release.toml b/Release.toml index d920caa0d99..ef9bdc53786 100644 --- a/Release.toml +++ b/Release.toml @@ -256,4 +256,6 @@ version = "1.18.0" "migrate_v1.17.0_public-control-container-v0-7-6.lz4", ] "(1.17.0, 1.18.0)" = [ + "migrate_v1.18.0_aws-admin-container-v0-11-3.lz4", + "migrate_v1.18.0_public-admin-container-v0-11-3.lz4", ] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index f2ff4c9b48d..2a08ff43c7b 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -533,6 +533,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-admin-container-v0-11-3" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-config" version = "0.55.3" @@ -3091,6 +3098,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-admin-container-v0-11-3" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "public-control-container-v0-7-4" version = "0.1.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 0cb78fccb91..0ba4e8319e8 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -52,6 +52,8 @@ members = [ "api/migration/migrations/v1.17.0/public-admin-container-v0-11-2", "api/migration/migrations/v1.17.0/aws-control-container-v0-7-6", "api/migration/migrations/v1.17.0/public-control-container-v0-7-6", + "api/migration/migrations/v1.18.0/aws-admin-container-v0-11-3", + "api/migration/migrations/v1.18.0/public-admin-container-v0-11-3", "bloodhound", diff --git a/sources/api/migration/migrations/v1.18.0/aws-admin-container-v0-11-3/Cargo.toml b/sources/api/migration/migrations/v1.18.0/aws-admin-container-v0-11-3/Cargo.toml new file mode 100644 index 00000000000..2d484dc39d4 --- /dev/null +++ b/sources/api/migration/migrations/v1.18.0/aws-admin-container-v0-11-3/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "aws-admin-container-v0-11-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.18.0/aws-admin-container-v0-11-3/src/main.rs b/sources/api/migration/migrations/v1.18.0/aws-admin-container-v0-11-3/src/main.rs new file mode 100644 index 00000000000..47a286353f2 --- /dev/null +++ b/sources/api/migration/migrations/v1.18.0/aws-admin-container-v0-11-3/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.2'"; +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.3'"; + +/// 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/api/migration/migrations/v1.18.0/public-admin-container-v0-11-3/Cargo.toml b/sources/api/migration/migrations/v1.18.0/public-admin-container-v0-11-3/Cargo.toml new file mode 100644 index 00000000000..14d6cbe123f --- /dev/null +++ b/sources/api/migration/migrations/v1.18.0/public-admin-container-v0-11-3/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "public-admin-container-v0-11-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.18.0/public-admin-container-v0-11-3/src/main.rs b/sources/api/migration/migrations/v1.18.0/public-admin-container-v0-11-3/src/main.rs new file mode 100644 index 00000000000..04c4e4b62c3 --- /dev/null +++ b/sources/api/migration/migrations/v1.18.0/public-admin-container-v0-11-3/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.2"; +const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.3"; + +/// 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); + } +}