diff --git a/Release.toml b/Release.toml index febc04d55a8..96c9c4119d5 100644 --- a/Release.toml +++ b/Release.toml @@ -481,5 +481,6 @@ version = "1.66.0" ] "(1.64.0, 1.65.0)" = [] "(1.65.0, 1.66.0)" = [ - "migrate_v1.66.0_kubernetes-memory-qos-settings.lz4" + "migrate_v1.66.0_kubernetes-memory-qos-settings.lz4", + "migrate_v1.66.0_nvidia-driver-branch-setting.lz4", ] diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 08e5e14291d..a060a10f2c0 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "bottlerocket-defaults-helper" version = "0.1.1" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "snafu", "toml", @@ -313,7 +313,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "darling", "quote", @@ -322,8 +322,8 @@ dependencies = [ [[package]] name = "bottlerocket-modeled-types" -version = "0.17.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +version = "0.19.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "base64", "bottlerocket-model-derive", @@ -359,7 +359,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "serde", "serde_plain", @@ -368,7 +368,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-scalar", "darling", @@ -382,7 +382,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "darling", "proc-macro2", @@ -392,8 +392,8 @@ dependencies = [ [[package]] name = "bottlerocket-settings-models" -version = "0.25.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +version = "0.29.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -417,6 +417,7 @@ dependencies = [ "settings-extension-image-verifier-plugins", "settings-extension-kernel", "settings-extension-kubelet-device-plugins", + "settings-extension-kubelet-dra-drivers", "settings-extension-kubernetes", "settings-extension-measurement", "settings-extension-metrics", @@ -434,7 +435,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "abi_stable", "bottlerocket-settings-derive", @@ -446,7 +447,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "argh", "bottlerocket-template-helper", @@ -459,7 +460,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "serde", ] @@ -467,7 +468,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "darling", "proc-macro2", @@ -1412,6 +1413,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "nvidia-driver-branch-setting" +version = "0.1.0" +dependencies = [ + "migration-helpers", +] + [[package]] name = "nvidia-k8s-device-plugin-enabled" version = "0.1.0" @@ -2144,7 +2152,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2157,7 +2165,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2170,7 +2178,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2184,7 +2192,7 @@ dependencies = [ [[package]] name = "settings-extension-bootstrap-containers" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2197,7 +2205,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2210,7 +2218,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2223,7 +2231,7 @@ dependencies = [ [[package]] name = "settings-extension-container-runtime" version = "0.4.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2236,7 +2244,7 @@ dependencies = [ [[package]] name = "settings-extension-container-runtime-plugins" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2252,7 +2260,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2265,7 +2273,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2278,7 +2286,7 @@ dependencies = [ [[package]] name = "settings-extension-host-containers" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2291,7 +2299,7 @@ dependencies = [ [[package]] name = "settings-extension-image-verifier-plugins" version = "0.2.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2303,8 +2311,8 @@ 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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +version = "0.3.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2317,7 +2325,7 @@ dependencies = [ [[package]] name = "settings-extension-kubelet-device-plugins" version = "0.4.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2327,10 +2335,22 @@ dependencies = [ "serde_json", ] +[[package]] +name = "settings-extension-kubelet-dra-drivers" +version = "0.1.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" +dependencies = [ + "bottlerocket-model-derive", + "bottlerocket-settings-sdk", + "env_logger", + "serde", + "serde_json", +] + [[package]] name = "settings-extension-kubernetes" -version = "0.10.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +version = "0.11.0" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2344,7 +2364,7 @@ dependencies = [ [[package]] name = "settings-extension-measurement" version = "0.1.0" -source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2358,7 +2378,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2371,7 +2391,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-settings-sdk", "bottlerocket-string-impls-for", @@ -2384,7 +2404,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2397,7 +2417,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2410,7 +2430,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2423,7 +2443,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2437,7 +2457,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2450,7 +2470,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", @@ -2463,7 +2483,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.25.0#797f2d460eb32b204f7aa1b72be38f6106edb9c4" +source = "git+https://github.com/bottlerocket-os/bottlerocket-settings-sdk?tag=bottlerocket-settings-models-v0.29.0#37f4116d3864332046143e862c0e9425923395fa" dependencies = [ "bottlerocket-model-derive", "bottlerocket-modeled-types", diff --git a/sources/Cargo.toml b/sources/Cargo.toml index af95a6ec371..3ea7d341c54 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -73,6 +73,7 @@ members = [ "settings-migrations/v1.64.0/kubernetes-container-runtime-endpoint", "settings-migrations/v1.64.0/hugepages-settings", "settings-migrations/v1.66.0/kubernetes-memory-qos-settings", + "settings-migrations/v1.66.0/nvidia-driver-branch-setting", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-2", @@ -142,27 +143,27 @@ walkdir = "2" [workspace.dependencies.bottlerocket-defaults-helper] git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.25.0" +tag = "bottlerocket-settings-models-v0.29.0" version = "0.1.1" [workspace.dependencies.bottlerocket-modeled-types] git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.25.0" -version = "0.17.0" +tag = "bottlerocket-settings-models-v0.29.0" +version = "0.19.0" [workspace.dependencies.bottlerocket-settings-models] git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.25.0" -version = "0.25.0" +tag = "bottlerocket-settings-models-v0.29.0" +version = "0.29.0" [workspace.dependencies.bottlerocket-settings-plugin] git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-settings-models-v0.25.0" +tag = "bottlerocket-settings-models-v0.29.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.25.0" +tag = "bottlerocket-settings-models-v0.29.0" version = "0.1.0" [profile.release] diff --git a/sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/Cargo.toml b/sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/Cargo.toml new file mode 100644 index 00000000000..112ee27fe36 --- /dev/null +++ b/sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "nvidia-driver-branch-setting" +version = "0.1.0" +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false +exclude = ["README.md"] + +[dependencies] +migration-helpers.workspace = true diff --git a/sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/src/main.rs b/sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/src/main.rs new file mode 100644 index 00000000000..1a7c04afce2 --- /dev/null +++ b/sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/src/main.rs @@ -0,0 +1,22 @@ +use migration_helpers::common_migrations::AddSettingsMigration; +use migration_helpers::{migrate, Result}; +use std::process; + +/// We added a new setting for pinning the NVIDIA driver branch (lts/pb) on +/// dual-branch images: +/// - settings.kernel.drivers.nvidia.branch +fn run() -> Result<()> { + migrate(AddSettingsMigration(&[ + "settings.kernel.drivers.nvidia.branch", + ])) +} + +// 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/variants/aws-k8s-1.37-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.37-nvidia-fips/Cargo.toml index e8dc8968003..5b9ae4a0077 100644 --- a/variants/aws-k8s-1.37-nvidia-fips/Cargo.toml +++ b/variants/aws-k8s-1.37-nvidia-fips/Cargo.toml @@ -10,7 +10,7 @@ build = "../build.rs" exclude = ["README.md"] [package.metadata.build-variant.image-layout] -os-image-size-gib = 4 +os-image-size-gib = 6 [package.metadata.build-variant.image-features] grub-set-private-var = true @@ -19,6 +19,7 @@ xfs-data-partition = true erofs-root-partition = true systemd-networkd = true external-kmod-development = false +nvidia-dual-branch = true fips = true [package.metadata.build-variant] @@ -43,7 +44,6 @@ included-packages = [ # nvidia "nvidia-container-toolkit-k8s", "nvidia-k8s-device-plugin", - "kmod-6.18-nvidia-r580-tesla", ] kernel-parameters = [ "console=tty0", diff --git a/variants/aws-k8s-1.37-nvidia/Cargo.toml b/variants/aws-k8s-1.37-nvidia/Cargo.toml index b167b2e4a91..0594714d7c7 100644 --- a/variants/aws-k8s-1.37-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.37-nvidia/Cargo.toml @@ -10,7 +10,7 @@ build = "../build.rs" exclude = ["README.md"] [package.metadata.build-variant.image-layout] -os-image-size-gib = 4 +os-image-size-gib = 6 [package.metadata.build-variant.image-features] grub-set-private-var = true @@ -19,6 +19,7 @@ xfs-data-partition = true erofs-root-partition = true systemd-networkd = true external-kmod-development = false +nvidia-dual-branch = true [package.metadata.build-variant] included-packages = [ @@ -42,7 +43,6 @@ included-packages = [ # nvidia "nvidia-container-toolkit-k8s", "nvidia-k8s-device-plugin", - "kmod-6.18-nvidia-r580-tesla", ] kernel-parameters = [ "console=tty0",