migration: add MPS device plugin settings

Signed-off-by: Matthew Yeazel <yeazelm@amazon.com>

Author: yeazelm

Release.toml

@@ -1,4 +1,4 @@
-version = "1.53.0"
+version = "1.54.0"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -453,3 +453,6 @@ version = "1.53.0"
 ]
 "(1.51.0, 1.52.0)" = []
 "(1.52.0, 1.53.0)" = []
+"(1.53.0, 1.54.0)" = [
+"migrate_v1.54.0_kubelet-device-plugins-mps-settings.lz4"
+]

Twoliter.toml

@@ -1,21 +1,21 @@
 schema-version = 2
-release-version = "1.53.0"
+release-version = "1.54.0"
 project-vendor = "Bottlerocket"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"
 
 [sdk]
 name = "bottlerocket-sdk"
-version = "0.66.0"
+version = "0.70.0"
 vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-kernel-kit"
-version = "4.7.1"
+version = "4.8.0"
 vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "12.2.0"
+version = "12.3.0"
 vendor = "bottlerocket"

sources/Cargo.lock

@@ -53,6 +53,7 @@ members = [
     "settings-migrations/v1.51.0/kubernetes-ecr-credential-provider-patterns",
     "settings-migrations/v1.51.0/kubernetes-additional-settings",
     "settings-migrations/v1.51.0/kubernetes-beta-cpu-manager-policy-options",
+    "settings-migrations/v1.54.0/kubelet-device-plugins-mps-settings",
 
     "settings-plugins/aws-dev",
     "settings-plugins/aws-ecs-2",

sources/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "kubelet-device-plugins-mps-settings"
+version = "0.1.0"
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+exclude = ["README.md"]
+
+[dependencies]
+migration-helpers.workspace = true
+serde_json.workspace = true

sources/settings-migrations/v1.54.0/kubelet-device-plugins-mps-settings/Cargo.toml

@@ -0,0 +1,43 @@
+use migration_helpers::common_migrations::AddPrefixesMigration;
+use migration_helpers::{migrate, Migration, MigrationData, Result};
+use std::process;
+
+const DEVICE_SHARING_STRATEGY_SETTING: &str =
+    "settings.kubelet-device-plugins.nvidia.device-sharing-strategy";
+
+pub struct ReplaceDeviceSharingStrategy;
+
+impl Migration for ReplaceDeviceSharingStrategy {
+    fn forward(&mut self, input: MigrationData) -> Result<MigrationData> {
+        println!("ReplaceDeviceSharingStrategy has no work to do on upgrade.");
+        Ok(input)
+    }
+
+    fn backward(&mut self, mut input: MigrationData) -> Result<MigrationData> {
+        if let Some(data) = input.data.get_mut(DEVICE_SHARING_STRATEGY_SETTING) {
+            if let serde_json::Value::String(s) = data {
+                if s == "mps" {
+                    *data = serde_json::Value::String("none".to_string());
+                    println!("Changed device-sharing-strategy from 'mps' to 'none' on downgrade.");
+                }
+            }
+        }
+        Ok(input)
+    }
+}
+
+/// We added new settings for configuring NVIDIA MPS (Multi-Process Service)
+/// GPU sharing in the device plugin.
+fn run() -> Result<()> {
+    migrate(AddPrefixesMigration(vec![
+        "settings.kubelet-device-plugins.nvidia.mps",
+    ]))?;
+    migrate(ReplaceDeviceSharingStrategy)
+}
+
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{e}");
+        process::exit(1);
+    }
+}