Merge pull request #4118 from tzneal/add-hostname-override-source

update to bottlerocket-settings-models v0.2.0

sources/Cargo.toml

@@ -40,6 +40,7 @@ members = [
     "settings-migrations/v1.21.0/pod-infra-container-image-remove-settings-generator",
     "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-plugins/aws-dev",
     "settings-plugins/aws-ecs-1",
@@ -60,13 +61,13 @@ version = "0.1.0"
 
 [workspace.dependencies.bottlerocket-modeled-types]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.1.0"
-version = "0.1.0"
+tag = "bottlerocket-settings-models-v0.2.0"
+version = "0.2.0"
 
 [workspace.dependencies.bottlerocket-settings-models]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.1.0"
-version = "0.1.0"
+tag = "bottlerocket-settings-models-v0.2.0"
+version = "0.2.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
@@ -75,7 +76,7 @@ version = "0.1.0"
 
 [workspace.dependencies.settings-extension-oci-defaults]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.1.0"
+tag = "bottlerocket-settings-models-v0.2.0"
 version = "0.1.0"
 
 [profile.release]

sources/settings-migrations/v1.21.0/add-hostname-override-source/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "add-hostname-override-source"
+version = "0.1.0"
+authors = ["Todd Neal <[email protected]>"]
+license = "Apache-2.0 OR MIT"
+edition = "2018"
+publish = false
+
+[dependencies]
+migration-helpers = { path = "../../../api/migration/migration-helpers", version = "0.1.0" }

sources/settings-migrations/v1.21.0/add-hostname-override-source/src/main.rs

@@ -0,0 +1,21 @@
+use migration_helpers::common_migrations::AddSettingsMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+/// We added one new settings for configuring the override method for the method used to determine
+/// the node
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&[
+        "settings.kubernetes.hostname-override-source",
+    ]))
+}
+
+// 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);
+    }
+}

sources/shared-defaults/kubernetes-aws-external-cloud-provider.toml

@@ -1,2 +1,3 @@
 [settings.kubernetes]
 cloud-provider = "external"
+hostname-override-source = "private-dns-name"