Merge pull request #4566 from teskje/memory-swap

Support kubernetes memory-swap-behavior setting

Author: vigh-m

Release.toml

@@ -1,4 +1,4 @@
-version = "1.41.0"
+version = "1.42.0"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -425,4 +425,6 @@ version = "1.41.0"
 "(1.40.0, 1.41.0)" = [
     "migrate_v1.41.0_kubernetes-ecr-credential-providers-correction.lz4",
 ]
-
+"(1.41.0, 1.42.0)" = [
+    "migrate_v1.42.0_kubernetes-memory-swap-behavior-setting.lz4",
+]

Twoliter.toml

@@ -1,5 +1,5 @@
 schema-version = 1
-release-version = "1.41.0"
+release-version = "1.42.0"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"

sources/Cargo.lock

@@ -37,6 +37,7 @@ members = [
     "settings-migrations/v1.39.0/kubelet-setting-container-log-single-process-oom-kill",
     "settings-migrations/v1.40.0/kubelet-device-plugins-cdi-settings",
     "settings-migrations/v1.41.0/kubernetes-ecr-credential-providers-correction",
+    "settings-migrations/v1.42.0/kubernetes-memory-swap-behavior-setting",
 
     "settings-plugins/aws-dev",
     "settings-plugins/aws-ecs-1",
@@ -111,22 +112,22 @@ version = "0.1.0"
 
 [workspace.dependencies.bottlerocket-modeled-types]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.10.0"
-version = "0.9.0"
+tag = "bottlerocket-settings-models-v0.11.0"
+version = "0.10.0"
 
 [workspace.dependencies.bottlerocket-settings-models]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.10.0"
-version = "0.10.0"
+tag = "bottlerocket-settings-models-v0.11.0"
+version = "0.11.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.9.0"
+tag = "bottlerocket-settings-models-v0.11.0"
 version = "0.1.0"
 
 [workspace.dependencies.settings-extension-oci-defaults]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.10.0"
+tag = "bottlerocket-settings-models-v0.11.0"
 version = "0.1.0"
 
 [profile.release]

sources/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "kubernetes-memory-swap-behavior-setting"
+version = "0.1.0"
+authors = ["Jan Teske <[email protected]>"]
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+# Don't rebuild crate just because of changes to README.
+exclude = ["README.md"]
+
+[dependencies]
+migration-helpers.workspace = true

sources/settings-migrations/v1.42.0/kubernetes-memory-swap-behavior-setting/Cargo.toml

@@ -0,0 +1,20 @@
+use migration_helpers::common_migrations::AddSettingsMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+// We added a new kubernetes setting controlling the memory swap behavior.
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&[
+        "settings.kubernetes.memory-swap-behavior",
+    ]))
+}
+
+// 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);
+    }
+}