diff --git a/Release.toml b/Release.toml index 8fd569c0223..649763af15e 100644 --- a/Release.toml +++ b/Release.toml @@ -360,4 +360,8 @@ version = "1.25.0" "(1.24.1, 1.25.0)" = [ "migrate_v1.25.0_kubernetes-service-config.lz4", "migrate_v1.25.0_kubelet-device-plugins-time-slicing-settings.lz4", + "migrate_v1.25.0_aws-admin-container-v0-11-13.lz4", + "migrate_v1.25.0_public-admin-container-v0-11-13.lz4", + "migrate_v1.25.0_aws-control-container-v0-7-17.lz4", + "migrate_v1.25.0_public-control-container-v0-7-17.lz4", ] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 93ebd31ef10..603355c6a1a 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -306,6 +306,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-admin-container-v0-11-13" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-control-container-v0-7-14" version = "0.1.0" @@ -327,6 +334,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-control-container-v0-7-17" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -1751,6 +1765,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-admin-container-v0-11-13" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "public-control-container-v0-7-14" version = "0.1.0" @@ -1772,6 +1793,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-control-container-v0-7-17" +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 ba61c1cda66..acfa15b6512 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -61,7 +61,10 @@ members = [ "settings-migrations/v1.24.1/public-control-container-v0-7-16", "settings-migrations/v1.25.0/kubernetes-service-config", "settings-migrations/v1.25.0/kubelet-device-plugins-time-slicing-settings", - + "settings-migrations/v1.25.0/aws-admin-container-v0-11-13", + "settings-migrations/v1.25.0/public-admin-container-v0-11-13", + "settings-migrations/v1.25.0/aws-control-container-v0-7-17", + "settings-migrations/v1.25.0/public-control-container-v0-7-17", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-1", "settings-plugins/aws-ecs-2", diff --git a/sources/settings-migrations/v1.25.0/aws-admin-container-v0-11-13/Cargo.toml b/sources/settings-migrations/v1.25.0/aws-admin-container-v0-11-13/Cargo.toml new file mode 100644 index 00000000000..26497b74a73 --- /dev/null +++ b/sources/settings-migrations/v1.25.0/aws-admin-container-v0-11-13/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-admin-container-v0-11-13" +version = "0.1.0" +authors = ["Gavin Inglis "] +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.25.0/aws-admin-container-v0-11-13/src/main.rs b/sources/settings-migrations/v1.25.0/aws-admin-container-v0-11-13/src/main.rs new file mode 100644 index 00000000000..62531c25b0c --- /dev/null +++ b/sources/settings-migrations/v1.25.0/aws-admin-container-v0-11-13/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.12'"; +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.13'"; + +/// 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.25.0/aws-control-container-v0-7-17/Cargo.toml b/sources/settings-migrations/v1.25.0/aws-control-container-v0-7-17/Cargo.toml new file mode 100644 index 00000000000..1d5f50c6b1b --- /dev/null +++ b/sources/settings-migrations/v1.25.0/aws-control-container-v0-7-17/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-control-container-v0-7-17" +version = "0.1.0" +authors = ["Gavin Inglis "] +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.25.0/aws-control-container-v0-7-17/src/main.rs b/sources/settings-migrations/v1.25.0/aws-control-container-v0-7-17/src/main.rs new file mode 100644 index 00000000000..f18f2446658 --- /dev/null +++ b/sources/settings-migrations/v1.25.0/aws-control-container-v0-7-17/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.16'"; +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.17'"; + +/// 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.25.0/public-admin-container-v0-11-13/Cargo.toml b/sources/settings-migrations/v1.25.0/public-admin-container-v0-11-13/Cargo.toml new file mode 100644 index 00000000000..884014ba921 --- /dev/null +++ b/sources/settings-migrations/v1.25.0/public-admin-container-v0-11-13/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-admin-container-v0-11-13" +version = "0.1.0" +authors = ["Gavin Inglis "] +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.25.0/public-admin-container-v0-11-13/src/main.rs b/sources/settings-migrations/v1.25.0/public-admin-container-v0-11-13/src/main.rs new file mode 100644 index 00000000000..76b313b16e2 --- /dev/null +++ b/sources/settings-migrations/v1.25.0/public-admin-container-v0-11-13/src/main.rs @@ -0,0 +1,24 @@ +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.12"; +const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.13"; +/// 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.25.0/public-control-container-v0-7-17/Cargo.toml b/sources/settings-migrations/v1.25.0/public-control-container-v0-7-17/Cargo.toml new file mode 100644 index 00000000000..a5b10c3af88 --- /dev/null +++ b/sources/settings-migrations/v1.25.0/public-control-container-v0-7-17/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-control-container-v0-7-17" +version = "0.1.0" +authors = ["Gavin Inglis "] +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.25.0/public-control-container-v0-7-17/src/main.rs b/sources/settings-migrations/v1.25.0/public-control-container-v0-7-17/src/main.rs new file mode 100644 index 00000000000..cec23136573 --- /dev/null +++ b/sources/settings-migrations/v1.25.0/public-control-container-v0-7-17/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.16"; +const NEW_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.17"; + +/// 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 94fdd2e75c9..2639be0750a 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.12'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.13'" [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.16'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.17'" diff --git a/sources/shared-defaults/public-host-containers.toml b/sources/shared-defaults/public-host-containers.toml index e43d0d94321..446c678a452 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.12" +source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.13" [settings.host-containers.control] enabled = false superpowered = false -source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.16" +source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.17"