diff --git a/Release.toml b/Release.toml index f9d1128709a..0828ec3708d 100644 --- a/Release.toml +++ b/Release.toml @@ -330,4 +330,9 @@ version = "1.21.1" "migrate_v1.21.0_k8s-reserved-cpus-v0-1-0.lz4", "migrate_v1.21.0_add-hostname-override-source.lz4", ] -"(1.21.0, 1.21.1)" = [] +"(1.21.0, 1.21.1)" = [ + "migrate_v1.21.1_aws-admin-container-v0-11-10.lz4", + "migrate_v1.21.1_public-admin-container-v0-11-10.lz4", + "migrate_v1.21.1_aws-control-container-v0-7-14.lz4", + "migrate_v1.21.1_public-control-container-v0-7-14.lz4", +] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 8109ebdadd6..7125373006c 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -285,6 +285,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "aws-admin-container-v0-11-10" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + +[[package]] +name = "aws-control-container-v0-7-14" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -1620,6 +1634,20 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "public-admin-container-v0-11-10" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + +[[package]] +name = "public-control-container-v0-7-14" +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 1427db53bae..ce392b8e7c5 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -41,6 +41,10 @@ members = [ "settings-migrations/v1.21.0/pod-infra-container-image-services", "settings-migrations/v1.21.0/k8s-reserved-cpus-v0-1-0", "settings-migrations/v1.21.0/add-hostname-override-source", + "settings-migrations/v1.21.1/aws-admin-container-v0-11-10", + "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-plugins/aws-dev", "settings-plugins/aws-ecs-1", diff --git a/sources/settings-migrations/v1.21.1/aws-admin-container-v0-11-10/Cargo.toml b/sources/settings-migrations/v1.21.1/aws-admin-container-v0-11-10/Cargo.toml new file mode 100644 index 00000000000..0c2e868ad7d --- /dev/null +++ b/sources/settings-migrations/v1.21.1/aws-admin-container-v0-11-10/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-admin-container-v0-11-10" +version = "0.1.0" +authors = ["Yutong Sun "] +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.21.1/aws-admin-container-v0-11-10/src/main.rs b/sources/settings-migrations/v1.21.1/aws-admin-container-v0-11-10/src/main.rs new file mode 100644 index 00000000000..b9b2ad5b389 --- /dev/null +++ b/sources/settings-migrations/v1.21.1/aws-admin-container-v0-11-10/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.9'"; +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.10'"; + +/// 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.21.1/aws-control-container-v0-7-14/Cargo.toml b/sources/settings-migrations/v1.21.1/aws-control-container-v0-7-14/Cargo.toml new file mode 100644 index 00000000000..c6179bde1be --- /dev/null +++ b/sources/settings-migrations/v1.21.1/aws-control-container-v0-7-14/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-control-container-v0-7-14" +version = "0.1.0" +authors = ["Yutong Sun "] +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.21.1/aws-control-container-v0-7-14/src/main.rs b/sources/settings-migrations/v1.21.1/aws-control-container-v0-7-14/src/main.rs new file mode 100644 index 00000000000..4843d56a4e9 --- /dev/null +++ b/sources/settings-migrations/v1.21.1/aws-control-container-v0-7-14/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.13'"; +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.14'"; + +/// 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.21.1/public-admin-container-v0-11-10/Cargo.toml b/sources/settings-migrations/v1.21.1/public-admin-container-v0-11-10/Cargo.toml new file mode 100644 index 00000000000..3dbc2239b9f --- /dev/null +++ b/sources/settings-migrations/v1.21.1/public-admin-container-v0-11-10/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-admin-container-v0-11-10" +version = "0.1.0" +authors = ["Yutong Sun "] +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.21.1/public-admin-container-v0-11-10/src/main.rs b/sources/settings-migrations/v1.21.1/public-admin-container-v0-11-10/src/main.rs new file mode 100644 index 00000000000..e78550a7cb7 --- /dev/null +++ b/sources/settings-migrations/v1.21.1/public-admin-container-v0-11-10/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.9"; +const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.10"; + +/// 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); + } +} diff --git a/sources/settings-migrations/v1.21.1/public-control-container-v0-7-14/Cargo.toml b/sources/settings-migrations/v1.21.1/public-control-container-v0-7-14/Cargo.toml new file mode 100644 index 00000000000..0fbe78f3ca1 --- /dev/null +++ b/sources/settings-migrations/v1.21.1/public-control-container-v0-7-14/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-control-container-v0-7-14" +version = "0.1.0" +authors = ["Yutong Sun "] +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.21.1/public-control-container-v0-7-14/src/main.rs b/sources/settings-migrations/v1.21.1/public-control-container-v0-7-14/src/main.rs new file mode 100644 index 00000000000..fc919b6d017 --- /dev/null +++ b/sources/settings-migrations/v1.21.1/public-control-container-v0-7-14/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.13"; +const NEW_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.14"; + +/// 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); + } +} diff --git a/sources/shared-defaults/aws-host-containers.toml b/sources/shared-defaults/aws-host-containers.toml index d58f3ae1f31..375764cf68b 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.9'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.10'" [metadata.settings.host-containers.admin.user-data] setting-generator = "shibaken generate-admin-userdata" @@ -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.13'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.14'" diff --git a/sources/shared-defaults/public-host-containers.toml b/sources/shared-defaults/public-host-containers.toml index fc12119ec1c..8801a0c9432 100644 --- a/sources/shared-defaults/public-host-containers.toml +++ b/sources/shared-defaults/public-host-containers.toml @@ -6,9 +6,9 @@ [settings.host-containers.admin] enabled = false superpowered = true -source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.9" +source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.10" [settings.host-containers.control] enabled = false superpowered = false -source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.13" +source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.14"