Merge branch 'gh-nvlib' into 'master'

point go-nvlib import refs to github.com/NVIDIA/go-nvlib See merge request nvidia/kubernetes/gpu-operator!956
NVIDIA · Nov 20, 2023 · 79fe1cc · 79fe1cc
2 parents e29a744 + 95f67a5
commit 79fe1cc
Show file tree

Hide file tree

Showing 33 changed files with 361 additions and 65 deletions.
diff --git a/go.mod b/go.mod
@@ -4,9 +4,10 @@ go 1.21
 
 require (
 	github.com/Masterminds/sprig/v3 v3.2.3
+	github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d
 	github.com/NVIDIA/k8s-kata-manager v0.0.0-20230620232711-08b57feb9b5a
 	github.com/NVIDIA/k8s-operator-libs v0.0.0-20230811202718-cd051ba8bafe
-	github.com/NVIDIA/nvidia-container-toolkit v1.14.2
+	github.com/NVIDIA/nvidia-container-toolkit v1.14.4-0.20231120112525-f6e3593a726a
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-logr/logr v1.2.4
 	github.com/mitchellh/hashstructure v1.1.0
@@ -21,7 +22,6 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli/v2 v2.25.7
-	gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230929182546-8ff02ffd5bb4
 	go.uber.org/zap v1.24.0
 	golang.org/x/mod v0.12.0
 	k8s.io/api v0.27.2

diff --git a/go.sum b/go.sum
@@ -10,12 +10,14 @@ github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7Y
 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
 github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
+github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d h1:XxRHS7eNkZVcPpZZmUcoT4oO8FEcoYKn06sooQh5niU=
+github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d/go.mod h1:HPFNPAYqQeoos58MKUboWsdZMu71EzSQrbmd+QBRD40=
 github.com/NVIDIA/k8s-kata-manager v0.0.0-20230620232711-08b57feb9b5a h1:3nyTp1cXzZMHoUuhMwHdz9QDzl100ECvIDYFxdjWk6o=
 github.com/NVIDIA/k8s-kata-manager v0.0.0-20230620232711-08b57feb9b5a/go.mod h1:K7HCLTndSwBEZwBu6sU7daVeryV1Qt/DtKH8nONJj4o=
 github.com/NVIDIA/k8s-operator-libs v0.0.0-20230811202718-cd051ba8bafe h1:8HlU+Vj9JsKRsyI39BLlv0cGPa5dE15PDy7XrPsMQYE=
 github.com/NVIDIA/k8s-operator-libs v0.0.0-20230811202718-cd051ba8bafe/go.mod h1:o7UeOk3V0xlOX87NnSaGNDje23VKCKPdfN6aSIZ9BwM=
-github.com/NVIDIA/nvidia-container-toolkit v1.14.2 h1:63Xn9Qzp4JhbDU5x6y/h93kwyKGfzAcyVN1B+o4JRAU=
-github.com/NVIDIA/nvidia-container-toolkit v1.14.2/go.mod h1:/4gu9BaABwXw/4iWY2oVpGbtd1X9uRDwegwnf1jN5Hw=
+github.com/NVIDIA/nvidia-container-toolkit v1.14.4-0.20231120112525-f6e3593a726a h1:WCIh4hzRaFh0/A/FZsHgz4uAz6sxqt0njZfU+HUGG8s=
+github.com/NVIDIA/nvidia-container-toolkit v1.14.4-0.20231120112525-f6e3593a726a/go.mod h1:yd+UnaIUSX3vjLVfewaDQ+R7XrgG38+hMZZXrygK3w0=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
@@ -242,8 +244,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230929182546-8ff02ffd5bb4 h1:iA5dwlSFdUaG9x/M5Jdt/823bJTCUE2hEZ1mcOTmjno=
-gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230929182546-8ff02ffd5bb4/go.mod h1:IYJpTTMpaedko3AA7a3rV578q9SDxhSa8E5FvnPC/M0=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=

diff --git a/validator/main.go b/validator/main.go
@@ -28,11 +28,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/NVIDIA/go-nvlib/pkg/nvmdev"
+	"github.com/NVIDIA/go-nvlib/pkg/nvpci"
 	devchar "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks"
 	log "github.com/sirupsen/logrus"
 	cli "github.com/urfave/cli/v2"
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvmdev"
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

diff --git a/....com/nvidia/cloud-native/go-nvlib/LICENSE → vendor/github.com/NVIDIA/go-nvlib/LICENSE b/....com/nvidia/cloud-native/go-nvlib/LICENSE → vendor/github.com/NVIDIA/go-nvlib/LICENSE
diff --git a/...b.com/nvidia/cloud-native/go-nvlib/NOTICE → vendor/github.com/NVIDIA/go-nvlib/NOTICE b/...b.com/nvidia/cloud-native/go-nvlib/NOTICE → vendor/github.com/NVIDIA/go-nvlib/NOTICE
diff --git a/.../cloud-native/go-nvlib/pkg/nvmdev/mock.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvmdev/mock.go b/.../cloud-native/go-nvlib/pkg/nvmdev/mock.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvmdev/mock.go
diff --git a/...loud-native/go-nvlib/pkg/nvmdev/nvmdev.go → ....com/NVIDIA/go-nvlib/pkg/nvmdev/nvmdev.go b/...loud-native/go-nvlib/pkg/nvmdev/nvmdev.go → ....com/NVIDIA/go-nvlib/pkg/nvmdev/nvmdev.go
diff --git a/...-native/go-nvlib/pkg/nvpci/bytes/bytes.go → .../NVIDIA/go-nvlib/pkg/nvpci/bytes/bytes.go b/...-native/go-nvlib/pkg/nvpci/bytes/bytes.go → .../NVIDIA/go-nvlib/pkg/nvpci/bytes/bytes.go
diff --git a/...native/go-nvlib/pkg/nvpci/bytes/native.go → ...NVIDIA/go-nvlib/pkg/nvpci/bytes/native.go b/...native/go-nvlib/pkg/nvpci/bytes/native.go → ...NVIDIA/go-nvlib/pkg/nvpci/bytes/native.go
diff --git a/...native/go-nvlib/pkg/nvpci/bytes/swapbo.go → ...NVIDIA/go-nvlib/pkg/nvpci/bytes/swapbo.go b/...native/go-nvlib/pkg/nvpci/bytes/swapbo.go → ...NVIDIA/go-nvlib/pkg/nvpci/bytes/swapbo.go
diff --git a/...cloud-native/go-nvlib/pkg/nvpci/config.go → ...b.com/NVIDIA/go-nvlib/pkg/nvpci/config.go b/...cloud-native/go-nvlib/pkg/nvpci/config.go → ...b.com/NVIDIA/go-nvlib/pkg/nvpci/config.go
diff --git a/...cloud-native/go-nvlib/pkg/nvpci/logger.go → ...b.com/NVIDIA/go-nvlib/pkg/nvpci/logger.go b/...cloud-native/go-nvlib/pkg/nvpci/logger.go → ...b.com/NVIDIA/go-nvlib/pkg/nvpci/logger.go
diff --git a/...cloud-native/go-nvlib/pkg/nvpci/mlxpci.go → ...b.com/NVIDIA/go-nvlib/pkg/nvpci/mlxpci.go b/...cloud-native/go-nvlib/pkg/nvpci/mlxpci.go → ...b.com/NVIDIA/go-nvlib/pkg/nvpci/mlxpci.go
diff --git a/...ud-native/go-nvlib/pkg/nvpci/mmio/mmio.go → ...om/NVIDIA/go-nvlib/pkg/nvpci/mmio/mmio.go b/...ud-native/go-nvlib/pkg/nvpci/mmio/mmio.go → ...om/NVIDIA/go-nvlib/pkg/nvpci/mmio/mmio.go
diff --git a/...ud-native/go-nvlib/pkg/nvpci/mmio/mock.go → ...om/NVIDIA/go-nvlib/pkg/nvpci/mmio/mock.go b/...ud-native/go-nvlib/pkg/nvpci/mmio/mock.go → ...om/NVIDIA/go-nvlib/pkg/nvpci/mmio/mock.go
diff --git a/...a/cloud-native/go-nvlib/pkg/nvpci/mock.go → ...hub.com/NVIDIA/go-nvlib/pkg/nvpci/mock.go b/...a/cloud-native/go-nvlib/pkg/nvpci/mock.go → ...hub.com/NVIDIA/go-nvlib/pkg/nvpci/mock.go
diff --git a/.../cloud-native/go-nvlib/pkg/nvpci/nvpci.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvpci/nvpci.go b/.../cloud-native/go-nvlib/pkg/nvpci/nvpci.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvpci/nvpci.go
diff --git a/...ud-native/go-nvlib/pkg/nvpci/resources.go → ...om/NVIDIA/go-nvlib/pkg/nvpci/resources.go b/...ud-native/go-nvlib/pkg/nvpci/resources.go → ...om/NVIDIA/go-nvlib/pkg/nvpci/resources.go
diff --git a/...ative/go-nvlib/pkg/pciids/default_pci.ids → ...VIDIA/go-nvlib/pkg/pciids/default_pci.ids b/...ative/go-nvlib/pkg/pciids/default_pci.ids → ...VIDIA/go-nvlib/pkg/pciids/default_pci.ids
diff --git a/...loud-native/go-nvlib/pkg/pciids/pciids.go → ....com/NVIDIA/go-nvlib/pkg/pciids/pciids.go b/...loud-native/go-nvlib/pkg/pciids/pciids.go → ....com/NVIDIA/go-nvlib/pkg/pciids/pciids.go
diff --git a/...com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/all.go b/...com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/all.go
diff --git a/...VIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go b/...VIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go
diff --git a/...nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_linux.go b/...nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_linux.go
diff --git a/...nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_other.go b/...nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_other.go
diff --git a/vendor/github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache/empty.go b/vendor/github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache/empty.go
diff --git a/vendor/github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache/ldcache.go b/vendor/github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache/ldcache.go