Skip to content

Enable nvidia-dual-branch feature for k8s-1.37-nvidia(-fips) #4939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vigh-m merged 3 commits into from
Sep 19, 2026
Merged

Enable nvidia-dual-branch feature for k8s-1.37-nvidia(-fips) #4939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0f9718
settings-migrations: add nvidia driver-branch setting for v1.66.0
vigh-m Sep 11, 2026
c2ac78d
sources: bump settings-models to 0.29.0
vigh-m Sep 18, 2026
a02834b
aws-k8s-1.37-nvidia: enable nvidia dual-branch
vigh-m Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Release.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
100 changes: 60 additions & 40 deletions sources/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions sources/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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]
Expand Down
10 changes: 10 additions & 0 deletions sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
22 changes: 22 additions & 0 deletions sources/settings-migrations/v1.66.0/nvidia-driver-branch-setting/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
4 changes: 2 additions & 2 deletions variants/aws-k8s-1.37-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions variants/aws-k8s-1.37-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = [
Expand All @@ -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",
Expand Down
Loading