From 9e4696bf7d67df5b6784e0a165c61f8b3feebbf7 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 31 Oct 2024 07:17:37 +0100 Subject: [PATCH 1/2] Bump version for v1.17.0 release Signed-off-by: Evan Lezar --- CHANGELOG.md | 9 +++++++-- versions.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 559cd156..458d5db8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,17 @@ # NVIDIA Container Toolkit Changelog +## v1.17.0 +- Promote v1.17.0-rc.2 to v1.17.0 +- Fix bug when using just-in-time CDI spec generation +- Check for valid paths in create-symlinks hook + ## v1.17.0-rc.2 -- Fix bug in locating libcuda.so form ldcache +- Fix bug in locating libcuda.so from ldcache - Fix bug in sorting of symlink chain - Remove unsupported print-ldcache command - Remove csv-filename support from create-symlinks -## Changes in the Toolkit Container +### Changes in the Toolkit Container - Fallback to `crio-status` if `crio status` does not work when configuring the crio runtime ## v1.17.0-rc.1 diff --git a/versions.mk b/versions.mk index 8dc1a41e..e302c18c 100644 --- a/versions.mk +++ b/versions.mk @@ -14,7 +14,7 @@ LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.17.0 -LIB_TAG := rc.2 +LIB_TAG := # The package version is the combination of the library version and tag. # If the tag is specified the two components are joined with a tilde (~). From 3fb1615d2612ef6ca6075aceccdf5af7049e1d2e Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 31 Oct 2024 10:11:58 +0100 Subject: [PATCH 2/2] [no-relnote] Address lint errors in test Signed-off-by: Evan Lezar --- cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go b/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go index b9b23c0f..eb673382 100644 --- a/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go +++ b/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go @@ -140,8 +140,8 @@ func TestCreateLink(t *testing.T) { } for _, expectedLink := range tc.expectedLinks { - path := strings.Replace(expectedLink.path, "{{ .containerRoot }}", containerRoot, -1) - path = strings.Replace(path, "{{ .hostRoot }}", hostRoot, -1) + path := strings.ReplaceAll(expectedLink.path, "{{ .containerRoot }}", containerRoot) + path = strings.ReplaceAll(path, "{{ .hostRoot }}", hostRoot) if expectedLink.target != "" { target, err := symlinks.Resolve(path) require.ErrorIs(t, err, expectedLink.err)