From 94faf5a29512b8c8faa3ce5a36d3eb8443db1592 Mon Sep 17 00:00:00 2001 From: Arnaldo Garcia Rincon Date: Fri, 6 Sep 2024 22:37:36 +0000 Subject: [PATCH 1/3] nvidia-k8s-device-plugin: drop kubernetes.device-plugin The API shape was changed to kubelet-device-plugin Signed-off-by: Arnaldo Garcia Rincon --- .../nvidia-k8s-device-plugin-conf | 8 ++++---- .../nvidia-k8s-device-plugin-exec-start-conf | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-conf b/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-conf index 6df24c4bf..5f647b6b8 100644 --- 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 index ca0bf57d6..3b4dff84a 100644 --- 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}} From 89c15f6d530f3ae508723d2fcd3a7afce0dfea7f Mon Sep 17 00:00:00 2001 From: Arnaldo Garcia Rincon Date: Fri, 6 Sep 2024 22:39:07 +0000 Subject: [PATCH 2/3] Twoliter.toml: bump core kit version --- Twoliter.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Twoliter.toml b/Twoliter.toml index d71b62351..e16afab84 100644 --- 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" From 686a1b55f6128a4b36da81891c9a40280d023f2b Mon Sep 17 00:00:00 2001 From: Arnaldo Garcia Rincon Date: Fri, 6 Sep 2024 22:38:47 +0000 Subject: [PATCH 3/3] sources: bump Settings SDK version Signed-off-by: Arnaldo Garcia Rincon --- sources/Cargo.lock | 76 +++++++++++++++++++++++++++------------------- sources/Cargo.toml | 10 +++--- 2 files changed, 50 insertions(+), 36 deletions(-) diff --git a/sources/Cargo.lock b/sources/Cargo.lock index c719ff766..b999700f5 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -1086,7 +1086,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "darling 0.20.10", "quote", @@ -1095,8 +1095,8 @@ dependencies = [ [[package]] name = "bottlerocket-modeled-types" -version = "0.4.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +version = "0.5.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "base64 0.22.1", "bottlerocket-model-derive", @@ -1130,7 +1130,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "serde", "serde_plain", @@ -1139,7 +1139,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-scalar", "darling 0.20.10", @@ -1163,8 +1163,8 @@ dependencies = [ [[package]] name = "bottlerocket-settings-models" -version = "0.4.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +version = "0.5.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -1185,6 +1185,7 @@ dependencies = [ "settings-extension-ecs", "settings-extension-host-containers", "settings-extension-kernel", + "settings-extension-kubelet-device-plugins", "settings-extension-kubernetes", "settings-extension-metrics", "settings-extension-motd", @@ -1213,7 +1214,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "argh", "bottlerocket-template-helper", @@ -1226,7 +1227,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "serde", ] @@ -1234,7 +1235,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "darling 0.20.10", "proc-macro2", @@ -3686,7 +3687,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3699,7 +3700,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3712,7 +3713,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3726,7 +3727,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3739,7 +3740,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3752,7 +3753,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3765,7 +3766,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3778,7 +3779,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3791,7 +3792,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3804,7 +3805,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3817,7 +3818,20 @@ 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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" +dependencies = [ + "bottlerocket-model-derive", + "bottlerocket-modeled-types", + "bottlerocket-settings-sdk", + "env_logger", + "serde", + "serde_json", +] + +[[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.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3830,7 +3844,7 @@ 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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3844,7 +3858,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3857,7 +3871,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-settings-sdk", "bottlerocket-string-impls-for", @@ -3869,7 +3883,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3882,7 +3896,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3895,7 +3909,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3908,7 +3922,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3922,7 +3936,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3935,7 +3949,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -3948,7 +3962,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.4.0#28f3c66b979bc48d32120b4e82d2c81b5841d7aa" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.5.0#ae697ef73e494a789fc2bed9c0f6f03629048c32" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", diff --git a/sources/Cargo.toml b/sources/Cargo.toml index f8f16cddb..8a3aae6ea 100644 --- 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]