diff --git a/Release.toml b/Release.toml index 98568636dce..205b10b5b00 100644 --- a/Release.toml +++ b/Release.toml @@ -486,4 +486,6 @@ version = "1.68.0" "migrate_v1.66.0_kubelet-dra-drivers-nvidia-enabled.lz4" ] "(1.66.0, 1.67.0)" = [] -"(1.67.0, 1.68.0)" = [] +"(1.67.0, 1.68.0)" = [ + "migrate_v1.68.0_ecs-instance-ip-compatibility.lz4" +] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 2319e1c64a3..0641bf28037 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -813,6 +813,13 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" +[[package]] +name = "ecs-instance-ip-compatibility" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "env_filter" version = "1.0.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index d51e14587f9..4c377ce4469 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -75,6 +75,7 @@ members = [ "settings-migrations/v1.66.0/kubernetes-memory-qos-settings", "settings-migrations/v1.66.0/nvidia-driver-branch-setting", "settings-migrations/v1.66.0/kubelet-dra-drivers-nvidia-enabled", + "settings-migrations/v1.68.0/ecs-instance-ip-compatibility", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-2", diff --git a/sources/settings-migrations/v1.68.0/ecs-instance-ip-compatibility/Cargo.toml b/sources/settings-migrations/v1.68.0/ecs-instance-ip-compatibility/Cargo.toml new file mode 100644 index 00000000000..6201780c394 --- /dev/null +++ b/sources/settings-migrations/v1.68.0/ecs-instance-ip-compatibility/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "ecs-instance-ip-compatibility" +version = "0.1.0" +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +exclude = ["README.md"] + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.68.0/ecs-instance-ip-compatibility/src/main.rs b/sources/settings-migrations/v1.68.0/ecs-instance-ip-compatibility/src/main.rs new file mode 100644 index 00000000000..0251d3eff76 --- /dev/null +++ b/sources/settings-migrations/v1.68.0/ecs-instance-ip-compatibility/src/main.rs @@ -0,0 +1,21 @@ +use migration_helpers::common_migrations::AddSettingsMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +/// We added a new setting for overriding the IP family the ECS agent registers with: +/// - settings.ecs.instance-ip-compatibility +fn run() -> Result<()> { + migrate(AddSettingsMigration(&[ + "settings.ecs.instance-ip-compatibility", + ])) +} + +// 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); + } +}