From ac9faa810b773ba74aaeb356fc68e5cb01d1b3a6 Mon Sep 17 00:00:00 2001
From: Vighnesh Maheshwari <vighnesh.maheshwari@gmail.com>
Date: Thu, 19 Dec 2024 21:43:30 +0000
Subject: [PATCH 1/3] feat: use kubernetes device ownership setting

---
 sources/Cargo.lock                                          | 6 +++---
 sources/Cargo.toml                                          | 2 +-
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../55-kubernetes-device-ownership-default-false.toml       | 1 +
 .../kubernetes-device-ownership-default-false.toml          | 5 +++++
 13 files changed, 19 insertions(+), 4 deletions(-)
 create mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 120000 sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml
 create mode 100644 sources/shared-defaults/kubernetes-device-ownership-default-false.toml

diff --git a/sources/Cargo.lock b/sources/Cargo.lock
index 15126e628ae..9bae8429bdd 100644
--- a/sources/Cargo.lock
+++ b/sources/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "abi_stable"
@@ -574,7 +574,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-settings-derive"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-plugin-v0.1.0#9cb0286b59cd4fcb5df9dd441aee8521ea5698e6"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
 dependencies = [
  "darling 0.20.8",
  "proc-macro2",
@@ -623,7 +623,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-settings-plugin"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-plugin-v0.1.0#9cb0286b59cd4fcb5df9dd441aee8521ea5698e6"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
 dependencies = [
  "abi_stable",
  "bottlerocket-settings-derive",
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
index d59c84dfe04..749965093d7 100644
--- a/sources/Cargo.toml
+++ b/sources/Cargo.toml
@@ -157,7 +157,7 @@ version = "0.6.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-plugin-v0.1.0"
+tag = "bottlerocket-settings-models-v0.6.0"
 version = "0.1.0"
 
 [workspace.dependencies.settings-extension-oci-defaults]
diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.25/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.26/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/aws-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/metal-k8s-1.30/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml
new file mode 120000
index 00000000000..fd989ade11e
--- /dev/null
+++ b/sources/settings-defaults/vmware-k8s-1.31/defaults.d/55-kubernetes-device-ownership-default-false.toml
@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-device-ownership-default-false.toml
\ No newline at end of file
diff --git a/sources/shared-defaults/kubernetes-device-ownership-default-false.toml b/sources/shared-defaults/kubernetes-device-ownership-default-false.toml
new file mode 100644
index 00000000000..38975701ab1
--- /dev/null
+++ b/sources/shared-defaults/kubernetes-device-ownership-default-false.toml
@@ -0,0 +1,5 @@
+[settings.kubernetes]
+device-ownership-from-security-context = false
+
+[metadata.settings.kubernetes.device-ownership-from-security-context]
+affected-services = ["containerd"]

From 7814cfdeeb4336e57fccc3a144be9c647b578f51 Mon Sep 17 00:00:00 2001
From: Vighnesh Maheshwari <vighnesh.maheshwari@gmail.com>
Date: Thu, 19 Dec 2024 21:44:37 +0000
Subject: [PATCH 2/3] migrations: add migrations for kubernete device ownership

---
 Release.toml                                  |  6 ++++-
 Twoliter.toml                                 |  2 +-
 sources/Cargo.lock                            | 14 ++++++++++++
 sources/Cargo.toml                            |  2 ++
 .../Cargo.toml                                | 15 +++++++++++++
 .../src/main.rs                               | 21 ++++++++++++++++++
 .../Cargo.toml                                | 15 +++++++++++++
 .../src/main.rs                               | 22 +++++++++++++++++++
 8 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/Cargo.toml
 create mode 100644 sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/src/main.rs
 create mode 100644 sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/Cargo.toml
 create mode 100644 sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/src/main.rs

diff --git a/Release.toml b/Release.toml
index 8e63eb79a9f..6fa357ff48b 100644
--- a/Release.toml
+++ b/Release.toml
@@ -1,4 +1,4 @@
-version = "1.29.0"
+version = "1.30.0"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -380,3 +380,7 @@ version = "1.29.0"
     "migrate_v1.28.0_public-control-container-v0-7-18.lz4",
 ]
 "(1.28.0, 1.29.0)" = []
+"(1.29.0, 1.30.0)" = [
+    "migrate_v1.30.0_kubernetes-device-ownership-metadata.lz4",
+    "migrate_v1.30.0_kubernetes-device-ownership-settings.lz4"
+]
diff --git a/Twoliter.toml b/Twoliter.toml
index d4212e380cb..70bd2a83f1c 100644
--- a/Twoliter.toml
+++ b/Twoliter.toml
@@ -1,5 +1,5 @@
 schema-version = 1
-release-version = "1.29.0"
+release-version = "1.30.0"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
index 9bae8429bdd..9df5ecc1145 100644
--- a/sources/Cargo.lock
+++ b/sources/Cargo.lock
@@ -1605,6 +1605,20 @@ dependencies = [
  "migration-helpers",
 ]
 
+[[package]]
+name = "kubernetes-device-ownership-metadata"
+version = "0.1.0"
+dependencies = [
+ "migration-helpers",
+]
+
+[[package]]
+name = "kubernetes-device-ownership-settings"
+version = "0.1.0"
+dependencies = [
+ "migration-helpers",
+]
+
 [[package]]
 name = "kubernetes-service-config"
 version = "0.1.0"
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
index 749965093d7..961a9bb542e 100644
--- a/sources/Cargo.toml
+++ b/sources/Cargo.toml
@@ -71,6 +71,8 @@ members = [
     "settings-migrations/v1.28.0/public-admin-container-v0-11-14",
     "settings-migrations/v1.28.0/aws-control-container-v0-7-18",
     "settings-migrations/v1.28.0/public-control-container-v0-7-18",
+    "settings-migrations/v1.29.1/kubernetes-device-ownership-settings",
+    "settings-migrations/v1.29.1/kubernetes-device-ownership-metadata",
 
     "settings-plugins/aws-dev",
     "settings-plugins/aws-ecs-1",
diff --git a/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/Cargo.toml b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/Cargo.toml
new file mode 100644
index 00000000000..5014b7bcbd9
--- /dev/null
+++ b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "kubernetes-device-ownership-metadata"
+version = "0.1.0"
+authors = ["Vighnesh Maheshwari <vighmah@amazon.com>"]
+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.workspace = true
diff --git a/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/src/main.rs b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/src/main.rs
new file mode 100644
index 00000000000..1e3de69b5d2
--- /dev/null
+++ b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-metadata/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, `settings.kubernetes.device-ownership-from-security-context` to allow containers to gain
+/// ownership of the requested device
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&[
+        "settings.kubernetes.device-ownership-from-security-context",
+    ]))
+}
+
+// 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/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/Cargo.toml b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/Cargo.toml
new file mode 100644
index 00000000000..41f39a8755a
--- /dev/null
+++ b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "kubernetes-device-ownership-settings"
+version = "0.1.0"
+authors = ["Vighnesh Maheshwari <vighmah@amazon.com>"]
+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.workspace = true
diff --git a/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/src/main.rs b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/src/main.rs
new file mode 100644
index 00000000000..b46bdcbefcd
--- /dev/null
+++ b/sources/settings-migrations/v1.30.0/kubernetes-device-ownership-settings/src/main.rs
@@ -0,0 +1,22 @@
+use migration_helpers::common_migrations::{AddMetadataMigration, SettingMetadata};
+use migration_helpers::{migrate, Result};
+use std::process;
+
+///  We added a new setting, `settings.kubernetes.device-ownership-from-security-context` to allow containers to gain
+/// ownership of the requested device
+fn run() -> Result<()> {
+    migrate(AddMetadataMigration(&[SettingMetadata {
+        metadata: &["affected-services"],
+        setting: "settings.kubernetes.device-ownership-from-security-context",
+    }]))
+}
+
+// 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);
+    }
+}

From edadf828d559d4e3f95cb65ffe88fa7696f9460d Mon Sep 17 00:00:00 2001
From: Vighnesh Maheshwari <vighnesh.maheshwari@gmail.com>
Date: Thu, 26 Dec 2024 18:31:18 +0000
Subject: [PATCH 3/3] settings-sdk: Update tagged version

---
 sources/Cargo.lock | 70 +++++++++++++++++++++++-----------------------
 sources/Cargo.toml | 16 +++++------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/sources/Cargo.lock b/sources/Cargo.lock
index 9df5ecc1145..aceacfe8bf1 100644
--- a/sources/Cargo.lock
+++ b/sources/Cargo.lock
@@ -506,7 +506,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-model-derive"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "darling 0.20.8",
  "quote",
@@ -515,8 +515,8 @@ dependencies = [
 
 [[package]]
 name = "bottlerocket-modeled-types"
-version = "0.6.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+version = "0.7.0"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "base64 0.22.1",
  "bottlerocket-model-derive",
@@ -551,7 +551,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-scalar"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "serde",
  "serde_plain",
@@ -560,7 +560,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-scalar-derive"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-scalar",
  "darling 0.20.8",
@@ -574,7 +574,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-settings-derive"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "darling 0.20.8",
  "proc-macro2",
@@ -584,8 +584,8 @@ dependencies = [
 
 [[package]]
 name = "bottlerocket-settings-models"
-version = "0.6.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+version = "0.7.0"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -623,7 +623,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-settings-plugin"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "abi_stable",
  "bottlerocket-settings-derive",
@@ -635,7 +635,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-settings-sdk"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "argh",
  "bottlerocket-template-helper",
@@ -648,7 +648,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-string-impls-for"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "serde",
 ]
@@ -656,7 +656,7 @@ dependencies = [
 [[package]]
 name = "bottlerocket-template-helper"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "darling 0.20.8",
  "proc-macro2",
@@ -2723,7 +2723,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-autoscaling"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2736,7 +2736,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-aws"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2749,7 +2749,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-bootstrap-commands"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2763,7 +2763,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-bootstrap-containers"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2776,7 +2776,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-cloudformation"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2789,7 +2789,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-container-registry"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2802,7 +2802,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-container-runtime"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2815,7 +2815,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-dns"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2828,7 +2828,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-ecs"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2841,7 +2841,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-host-containers"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2854,7 +2854,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-kernel"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2867,7 +2867,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-kubelet-device-plugins"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2879,8 +2879,8 @@ dependencies = [
 
 [[package]]
 name = "settings-extension-kubernetes"
-version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+version = "0.2.0"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2894,7 +2894,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-metrics"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2907,7 +2907,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-motd"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-settings-sdk",
  "bottlerocket-string-impls-for",
@@ -2919,7 +2919,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-network"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2932,7 +2932,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-ntp"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2945,7 +2945,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-nvidia-container-runtime"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2958,7 +2958,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-oci-defaults"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2972,7 +2972,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-oci-hooks"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2985,7 +2985,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-pki"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
@@ -2998,7 +2998,7 @@ dependencies = [
 [[package]]
 name = "settings-extension-updates"
 version = "0.1.0"
-source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.6.0#276b8e8f6db01c9a03469613e82ece11d729b908"
+source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.7.0#2a7c0986846eb98122e6812634d0526988a72c64"
 dependencies = [
  "bottlerocket-model-derive",
  "bottlerocket-modeled-types",
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
index 961a9bb542e..056adffc0f9 100644
--- a/sources/Cargo.toml
+++ b/sources/Cargo.toml
@@ -71,8 +71,8 @@ members = [
     "settings-migrations/v1.28.0/public-admin-container-v0-11-14",
     "settings-migrations/v1.28.0/aws-control-container-v0-7-18",
     "settings-migrations/v1.28.0/public-control-container-v0-7-18",
-    "settings-migrations/v1.29.1/kubernetes-device-ownership-settings",
-    "settings-migrations/v1.29.1/kubernetes-device-ownership-metadata",
+    "settings-migrations/v1.30.0/kubernetes-device-ownership-settings",
+    "settings-migrations/v1.30.0/kubernetes-device-ownership-metadata",
 
     "settings-plugins/aws-dev",
     "settings-plugins/aws-ecs-1",
@@ -149,22 +149,22 @@ version = "0.1.0"
 
 [workspace.dependencies.bottlerocket-modeled-types]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.6.0"
-version = "0.6.0"
+tag = "bottlerocket-settings-models-v0.7.0"
+version = "0.7.0"
 
 [workspace.dependencies.bottlerocket-settings-models]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.6.0"
-version = "0.6.0"
+tag = "bottlerocket-settings-models-v0.7.0"
+version = "0.7.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.6.0"
+tag = "bottlerocket-settings-models-v0.7.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.6.0"
+tag = "bottlerocket-settings-models-v0.7.0"
 version = "0.1.0"
 
 [profile.release]