diff --git a/Release.toml b/Release.toml index 94dfdb489b2..98b90ab0187 100644 --- a/Release.toml +++ b/Release.toml @@ -282,7 +282,13 @@ version = "1.20.0" "migrate_v1.19.3_public-control-container-v0-7-10.lz4", ] "(1.19.3, 1.19.4)" = [] -"(1.19.4, 1.20.0)" = [ +"(1.19.4, 1.19.5)" = [ + "migrate_v1.19.5_aws-admin-container-v0-11-7.lz4", + "migrate_v1.19.5_public-admin-container-v0-11-7.lz4", + "migrate_v1.19.5_aws-control-container-v0-7-11.lz4", + "migrate_v1.19.5_public-control-container-v0-7-11.lz4", +] +"(1.19.5, 1.20.0)" = [ "migrate_v1.20.0_prairiedog-config-file-v0-1-0.lz4", "migrate_v1.20.0_prairiedog-services-cfg-v0-1-0.lz4", "migrate_v1.20.0_thar-be-updates-config-file-v0-1-0.lz4", diff --git a/sources/Cargo.lock b/sources/Cargo.lock index cae707e4e5d..a3ede8d064b 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -575,6 +575,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-admin-container-v0-11-7" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-config" version = "1.1.8" @@ -612,6 +619,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "aws-control-container-v0-7-11" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "aws-control-container-v0-7-4" version = "0.1.0" @@ -3297,6 +3311,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-admin-container-v0-11-7" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "public-control-container-v0-7-10" version = "0.1.0" @@ -3304,6 +3325,13 @@ dependencies = [ "migration-helpers", ] +[[package]] +name = "public-control-container-v0-7-11" +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 f6b69248da2..20fae70db6a 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -82,6 +82,10 @@ members = [ "api/migration/migrations/v1.20.0/add-ntp-default-options-v0-1-0", "api/migration/migrations/v1.20.0/static-pods-add-prefix-v0-1-0", "api/migration/migrations/v1.20.0/static-pods-services-cfg-v0-1-0", + "api/migration/migrations/v1.19.5/aws-control-container-v0-7-11", + "api/migration/migrations/v1.19.5/public-control-container-v0-7-11", + "api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7", + "api/migration/migrations/v1.19.5/public-admin-container-v0-11-7", "bloodhound", diff --git a/sources/api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7/Cargo.toml b/sources/api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7/Cargo.toml new file mode 100644 index 00000000000..66655fd9f4d --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-admin-container-v0-11-7" +version = "0.1.0" +authors = ["Shikha Vyaghra "] +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 = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7/src/main.rs b/sources/api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7/src/main.rs new file mode 100644 index 00000000000..8e34d928a36 --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/aws-admin-container-v0-11-7/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.6'"; +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.7'"; + +/// 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.19.5/aws-control-container-v0-7-11/Cargo.toml b/sources/api/migration/migrations/v1.19.5/aws-control-container-v0-7-11/Cargo.toml new file mode 100644 index 00000000000..8d9a5e1c14a --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/aws-control-container-v0-7-11/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aws-control-container-v0-7-11" +version = "0.1.0" +authors = ["Shikha Vyaghra "] +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 = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.19.5/aws-control-container-v0-7-11/src/main.rs b/sources/api/migration/migrations/v1.19.5/aws-control-container-v0-7-11/src/main.rs new file mode 100644 index 00000000000..ab0b7fec060 --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/aws-control-container-v0-7-11/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.10'"; +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.11'"; + +/// 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/api/migration/migrations/v1.19.5/public-admin-container-v0-11-7/Cargo.toml b/sources/api/migration/migrations/v1.19.5/public-admin-container-v0-11-7/Cargo.toml new file mode 100644 index 00000000000..2fd13dedd6b --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/public-admin-container-v0-11-7/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-admin-container-v0-11-7" +version = "0.1.0" +authors = ["Shikha Vyaghra "] +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 = { path = "../../../migration-helpers", version = "0.1.0"} \ No newline at end of file diff --git a/sources/api/migration/migrations/v1.19.5/public-admin-container-v0-11-7/src/main.rs b/sources/api/migration/migrations/v1.19.5/public-admin-container-v0-11-7/src/main.rs new file mode 100644 index 00000000000..fec2eba85a6 --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/public-admin-container-v0-11-7/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.6"; +const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.7"; + +/// 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/api/migration/migrations/v1.19.5/public-control-container-v0-7-11/Cargo.toml b/sources/api/migration/migrations/v1.19.5/public-control-container-v0-7-11/Cargo.toml new file mode 100644 index 00000000000..09f7325ec5d --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/public-control-container-v0-7-11/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "public-control-container-v0-7-11" +version = "0.1.0" +authors = ["Shikha Vyaghra "] +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 = { path = "../../../migration-helpers", version = "0.1.0"} diff --git a/sources/api/migration/migrations/v1.19.5/public-control-container-v0-7-11/src/main.rs b/sources/api/migration/migrations/v1.19.5/public-control-container-v0-7-11/src/main.rs new file mode 100644 index 00000000000..79086ef92d9 --- /dev/null +++ b/sources/api/migration/migrations/v1.19.5/public-control-container-v0-7-11/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.10"; +const NEW_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.11"; + +/// 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/models/shared-defaults/aws-host-containers.toml b/sources/models/shared-defaults/aws-host-containers.toml index 9bd3814639c..fa1f1a500ce 100644 --- a/sources/models/shared-defaults/aws-host-containers.toml +++ b/sources/models/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.6'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.7'" [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.10'" +setting-generator = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.11'" diff --git a/sources/models/shared-defaults/public-host-containers.toml b/sources/models/shared-defaults/public-host-containers.toml index 14e89ab89eb..abc0f48767f 100644 --- a/sources/models/shared-defaults/public-host-containers.toml +++ b/sources/models/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.6" +source = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.7" [settings.host-containers.control] enabled = false superpowered = false -source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.10" +source = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.11"