Skip to content

settings-migrations: add nvidia driver-branch setting for v1.66.0 #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

Draft
vigh-m wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

settings-migrations: add nvidia driver-branch setting for v1.66.0 #4939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09540fb
settings-migrations: add nvidia driver-branch setting for v1.66.0
vigh-m Sep 11, 2026
dcd4f1f
settings-defaults: warn on nvidia.branch for non-multi-driver variants
vigh-m Sep 16, 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
5 changes: 4 additions & 1 deletion Release.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "1.65.0"
version = "1.66.0"

[migrations]
"(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
Expand Down Expand Up @@ -480,3 +480,6 @@ version = "1.65.0"
"migrate_v1.64.0_hugepages-settings.lz4"
]
"(1.64.0, 1.65.0)" = []
"(1.65.0, 1.66.0)" = [
"migrate_v1.66.0_nvidia-driver-branch-setting.lz4"
]
2 changes: 1 addition & 1 deletion Twoliter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
schema-version = 2
release-version = "1.65.0"
release-version = "1.66.0"
project-vendor = "Bottlerocket"

[vendor.bottlerocket]
Expand Down
1 change: 1 addition & 0 deletions sources/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ members = [
"settings-migrations/v1.63.0/nvidia-k8s-device-plugin-enabled",
"settings-migrations/v1.64.0/kubernetes-container-runtime-endpoint",
"settings-migrations/v1.64.0/hugepages-settings",
"settings-migrations/v1.66.0/nvidia-driver-branch-setting",

"settings-plugins/aws-dev",
"settings-plugins/aws-ecs-2",
Expand Down
1 change: 1 addition & 0 deletions ...es/settings-defaults/aws-ecs-2-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...es/settings-defaults/aws-ecs-3-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...es/settings-defaults/aws-ecs-4-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-k8s-1.31-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-k8s-1.32-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-k8s-1.33-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-k8s-1.34-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-k8s-1.35-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-mantle-1-nvidia/defaults.d/84-nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/nvidia-driver-branch-deprecation.toml
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);
}
}
13 changes: 13 additions & 0 deletions sources/shared-defaults/nvidia-driver-branch-deprecation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# On NVIDIA variants that do not support multi-driver (no nvidia-dual-branch
# image feature), settings.kernel.drivers.nvidia.branch has no effect. Emit a
# deprecation warning when it is set, via the templated deprecation-warning timer.
[metadata.settings.kernel.drivers.nvidia.branch]
affected-services = ["nvidia-driver-branch-deprecation"]

[services.nvidia-driver-branch-deprecation]
configuration-files = ["nvidia-driver-branch-deprecation"]
restart-commands = ["systemctl restart deprecation-warning@nvidia-driver-branch.timer"]

[configuration-files.nvidia-driver-branch-deprecation]
path = "/etc/deprecated-settings/nvidia-driver-branch"
template-path = "/usr/share/templates/nvidia-driver-branch-deprecation"
Loading