Remove backwards symlinks for 1.37+ - #4942
Merged
maherthomsi merged 2 commits intoSep 19, 2026
Merged
Conversation
maherthomsi
force-pushed
the
remove-backwards-symlinks
branch
from
September 17, 2026 20:23
263f0af to
48b6d0c
Compare
maherthomsi
marked this pull request as ready for review
September 17, 2026 22:10
ginglis13
approved these changes
Sep 18, 2026
ginglis13
left a comment
Contributor
There was a problem hiding this comment.
lgtm just some edits to verbose comments
maherthomsi
force-pushed
the
remove-backwards-symlinks
branch
from
September 18, 2026 22:18
48b6d0c to
565b725
Compare
maherthomsi
added a commit
to maherthomsi/bottlerocket
that referenced
this pull request
Sep 18, 2026
…ed) and PR bottlerocket-os#4942 (remove backwards symlinks)
vigh-m
approved these changes
Sep 18, 2026
5 tasks
Add two settings fragments used to keep the legacy /usr/lib/nvidia/tesla symlinks on nvidia variants that predate the EKS k8s 1.37 removal: - nvidia-k8s-device-plugin-compat-symlinks.toml overrides the device-plugin exec-start template with the -compat variant, which keeps create-lib-symlinks. - nvidia-cdi-specs-compat-symlinks.toml renders a generate-cdi-specs drop-in that adds --additional-symlinks, with a daemon-reload restart-command so the drop-in is loaded before the oneshot runs (the unit sets RefuseManualStart). Signed-off-by: Maher Homsi <maherhom@amazon.com>
Include the nvidia backwards-compat symlink defaults in all existing nvidia variants so their behavior is unchanged; only future EKS k8s 1.37+ variants omit them. k8s 1.31-1.36 get both the device-plugin and generate-cdi-specs fragments; ECS and mantle variants get the generate-cdi-specs fragment only (no device plugin). Signed-off-by: Maher Homsi <maherhom@amazon.com>
maherthomsi
force-pushed
the
remove-backwards-symlinks
branch
from
September 19, 2026 01:54
565b725 to
de643b6
Compare
ginglis13
approved these changes
Sep 19, 2026
vigh-m
approved these changes
Sep 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes:
Starting in EKS k8s 1.37, nvidia variants no longer create the legacy /usr/lib/nvidia/tesla/ backwards-compatibility symlinks inside containers. Libraries live at the FHS-standard /usr/lib/ only. Variants for k8s 1.36 and below keep the legacy path so existing customer workloads are unaffected.
The companion core-kit change makes the clean, no-symlink templates the default and ships -compat templates alongside them. This PR wires up the variant settings-defaults to select behavior per variant:
The new aws-k8s-1.37-nvidia / aws-k8s-1.37-nvidia-fips variants intentionally omit these fragments, so they inherit the clean default templates and produce no /usr/lib/nvidia/tesla/ symlinks — the desired end state.
Testing done:
Built and deployed an aws-k8s-1.36-nvidia AMI (A10G / R580 580.178.04, g5.xlarge, EKS 1.36 cluster) and
verified from ground-truth on-host sources:
create-lib-symlinks
preserved)
no-symlink behavior)
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.