Use single image for deb and rpm-based systems #602
Conversation
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
elezar
added this to the https://github.com/NVIDIA/cloud-native-team/milestone/2 milestone
elezar
changed the title
elezar
force-pushed
the
use-ubi8-image
branch
5 times, most recently
from
4242ba2 to
5d42fbb
Compare
elezar
force-pushed
the
use-ubi8-image
branch
from
5d42fbb to
2ce23c9
Compare
elezar
force-pushed
the
use-ubi8-image
branch
2 times, most recently
from
4da1db4 to
ba65c11
Compare
elezar
changed the title
elezar
force-pushed
the
use-ubi8-image
branch
4 times, most recently
from
4b50ca0 to
5952a98
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR simplifies the NVIDIA Container Toolkit installer by consolidating deb and rpm-based images into a single ubi8-based image and updating the corresponding flag names and package resolution logic.
- Renamed the source root flag to "toolkit-source-root" and added a new "toolkit-package-type" flag.
- Introduced functions to resolve the package type based on host system binaries.
- Added a new file to encapsulate package-type definitions.
Reviewed Changes
Copilot reviewed 5 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| cmd/nvidia-ctk-installer/toolkit/toolkit.go | Added a newline for readability. |
| cmd/nvidia-ctk-installer/toolkit/installer/package-type.go | Introduced a new file for package-type definitions. |
| cmd/nvidia-ctk-installer/toolkit/installer/installer.go | Refactored toolkitInstaller initialization to set a default sourceRoot. |
| cmd/nvidia-ctk-installer/main_test.go | Updated test flag to use "toolkit-source-root". |
| cmd/nvidia-ctk-installer/main.go | Updated flag names, added package type flag, and implemented source root resolution logic. |
Files not reviewed (2)
- deployments/container/Dockerfile.ubi8: Language not supported
- deployments/container/Makefile: Language not supported
| Name: "source-root", | ||
| Value: "/", | ||
| Usage: "The folder where the required toolkit artifacts can be found", | ||
| Name: "toolkit-source-root", |
There was a problem hiding this comment.
Do we need to update documentation on this flag name change?
There was a problem hiding this comment.
This is a new flag and is not publicly accessible. It is internal only.
| @@ -0,0 +1,19 @@ | |||
| /* | |||
There was a problem hiding this comment.
What's the purpose of this file?
|
|
||
| locator := lookup.NewExecutableLocator(a.logger, hostRoot) | ||
| if candidates, err := locator.Locate("/usr/bin/rpm"); err == nil && len(candidates) > 0 { | ||
| return "rpm", nil |
There was a problem hiding this comment.
Should we have rpm and deb as pkg consts so is safer to use the var instead of a string.
elezar
commented
May 6, 2025
| COPY --from=debpackages /artifacts/deb /artifacts/deb | ||
| COPY --from=build /artifacts/bin /artifacts/build | ||
|
|
||
| FROM nvcr.io/nvidia/cuda:12.8.1-base-ubi8 |
There was a problem hiding this comment.
@tariq1890 this could be distroless if required.
This change swithces to using a single image for the NVIDIA Container Toolkit contianer. Here the contents of the architecture-specific deb and rpm packages are extracted to a known root. These contents can then be installed using the updated installation mechanism which has been updated to detect the source root based on the packaging type. Signed-off-by: Evan Lezar <[email protected]>
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.
This change moves to a single ubi8-based base image for the NVIDIA Container Toolkit contianer. This simplifies the deployment of the toolkit in that users don't have to select a specific image based on their host distribution.
In this implementation, the contents of the deb and rpm packages are stored at a location in the image and copied to the relevant location on the host (as in the past). The following envvironment variables can be used to control the behaviour:
TOOLKIT_PACKAGE_TYPE(one ofauto(default),deb, orrpm) specifies the packaging system used on the host machine. If this is default, the toolking installer attempts to determine the host packaging system and defaults todebif this fails.TOOLKIT_SOURCE_ROOT(default = "") specifies the root for the files to be installed. If this is set to""the path is calculated as/artifacts/{{ .ToolkitPackageType }}whereToolkitPackageTypeis the resolved value ofTOOLKIT_PACKAGE_TYPE.