Skip to content

Commit 79fe1cc

Browse files
author
Evan Lezar
committed
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
2 parents e29a744 + 95f67a5 commit 79fe1cc

File tree

33 files changed

+361
-65
lines changed

33 files changed

+361
-65
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ go 1.21
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.2.3
7+
github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d
78
github.com/NVIDIA/k8s-kata-manager v0.0.0-20230620232711-08b57feb9b5a
89
github.com/NVIDIA/k8s-operator-libs v0.0.0-20230811202718-cd051ba8bafe
9-
github.com/NVIDIA/nvidia-container-toolkit v1.14.2
10+
github.com/NVIDIA/nvidia-container-toolkit v1.14.4-0.20231120112525-f6e3593a726a
1011
github.com/davecgh/go-spew v1.1.1
1112
github.com/go-logr/logr v1.2.4
1213
github.com/mitchellh/hashstructure v1.1.0
@@ -21,7 +22,6 @@ require (
2122
github.com/sirupsen/logrus v1.9.3
2223
github.com/stretchr/testify v1.8.4
2324
github.com/urfave/cli/v2 v2.25.7
24-
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230929182546-8ff02ffd5bb4
2525
go.uber.org/zap v1.24.0
2626
golang.org/x/mod v0.12.0
2727
k8s.io/api v0.27.2

‎go.sum

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

‎validator/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
"syscall"
2929
"time"
3030

31+
"github.com/NVIDIA/go-nvlib/pkg/nvmdev"
32+
"github.com/NVIDIA/go-nvlib/pkg/nvpci"
3133
devchar "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks"
3234
log "github.com/sirupsen/logrus"
3335
cli "github.com/urfave/cli/v2"
34-
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvmdev"
35-
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci"
3636

3737
v1 "k8s.io/api/core/v1"
3838
"k8s.io/apimachinery/pkg/api/resource"

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/LICENSE ‎vendor/github.com/NVIDIA/go-nvlib/LICENSE

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/NOTICE ‎vendor/github.com/NVIDIA/go-nvlib/NOTICE

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvmdev/mock.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvmdev/mock.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvmdev/nvmdev.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvmdev/nvmdev.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes/bytes.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/bytes/bytes.go

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes/native.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/bytes/native.go

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes/swapbo.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/bytes/swapbo.go

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/config.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/config.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/logger.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/logger.go

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/mlxpci.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/mlxpci.go

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/mmio/mmio.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/mmio/mmio.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/mmio/mock.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/mmio/mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/mock.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/nvpci.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/nvpci.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/resources.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/nvpci/resources.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/pciids/default_pci.ids ‎vendor/github.com/NVIDIA/go-nvlib/pkg/pciids/default_pci.ids

File renamed without changes.

‎vendor/gitlab.com/nvidia/cloud-native/go-nvlib/pkg/pciids/pciids.go ‎vendor/github.com/NVIDIA/go-nvlib/pkg/pciids/pciids.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/all.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go

+1-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_linux.go

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_other.go

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache/empty.go

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache/ldcache.go

+12-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)