Merge pull request #132 from arnaldo2792/nvidia-settings-api

Use kubelet-device-plugin API
bottlerocket-os · Sep 11, 2024 · 557a7e5 · 557a7e5
2 parents edc6a35 + 686a1b5
commit 557a7e5
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 43 deletions.
diff --git a/Twoliter.toml b/Twoliter.toml
@@ -1,5 +1,5 @@
 schema-version = 1
-release-version = "2.4.1"
+release-version = "2.5.0"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"

diff --git a/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-conf b/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-conf
@@ -1,5 +1,5 @@
 [required-extensions]
-kubernetes = "v1"
+kubelet-device-plugins = "v1"
 std = { version = "v1", helpers = ["default"] }
 
 +++
@@ -8,6 +8,6 @@ flags:
   migStrategy: "none"
   failOnInitError: true
   plugin:
-    passDeviceSpecs: {{default true settings.kubernetes.device-plugins.nvidia.pass-device-specs}}
-    deviceListStrategy: {{default "volume-mounts" settings.kubernetes.device-plugins.nvidia.device-list-strategy}}
-    deviceIDStrategy: {{default "index" settings.kubernetes.device-plugins.nvidia.device-id-strategy}}
+    passDeviceSpecs: {{default true settings.kubelet-device-plugins.nvidia.pass-device-specs}}
+    deviceListStrategy: {{default "volume-mounts" settings.kubelet-device-plugins.nvidia.device-list-strategy}}
+    deviceIDStrategy: {{default "index" settings.kubelet-device-plugins.nvidia.device-id-strategy}}
diff --git a/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-exec-start-conf b/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-exec-start-conf
@@ -1,8 +1,8 @@
 [required-extensions]
-kubernetes = "v1"
+kubelet-device-plugins = "v1"
 +++
 [Service]
-{{#if settings.kubernetes.device-plugins.nvidia}}
+{{#if settings.kubelet-device-plugins.nvidia}}
 ExecStart=
 ExecStart=/usr/bin/nvidia-device-plugin --config-file=/etc/nvidia-k8s-device-plugin/settings.yaml
 {{/if}}
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -194,13 +194,13 @@ base64 = "0.22"
 
 [workspace.dependencies.bottlerocket-modeled-types]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.4.0"
-version = "0.4.0"
+tag = "bottlerocket-settings-models-v0.5.0"
+version = "0.5.0"
 
 [workspace.dependencies.bottlerocket-settings-models]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
-tag = "bottlerocket-settings-models-v0.4.0"
-version = "0.4.0"
+tag = "bottlerocket-settings-models-v0.5.0"
+version = "0.5.0"
 
 [workspace.dependencies.bottlerocket-settings-plugin]
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
@@ -209,7 +209,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.4.0"
+tag = "bottlerocket-settings-models-v0.5.0"
 version = "0.1.0"
 
 [profile.release]