Merge pull request containerd#9677 from elezar/dependency-update-cont…

…ainer-device-interface-v0.6.2 Update container-device-interface to v0.6.2
Jenkins-J · Jan 23, 2024 · 8e1578e · 8e1578e
2 parents be9336f + 9dd29b3
commit 8e1578e
Show file tree

Hide file tree

Showing 35 changed files with 399 additions and 264 deletions.
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -28,8 +28,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/contrib/apparmor"
@@ -45,6 +43,8 @@ import (
 	"github.com/intel/goresctrl/pkg/blockio"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/pkg/parser"
 )
 
 var platformRunFlags = []cli.Flag{

diff --git a/go.mod b/go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0
 	github.com/Microsoft/go-winio v0.6.1
 	github.com/Microsoft/hcsshim v0.12.0-rc.2
-	github.com/container-orchestrated-devices/container-device-interface v0.6.1
 	github.com/containerd/btrfs/v2 v2.0.0
 	github.com/containerd/cgroups/v3 v3.0.3
 	github.com/containerd/console v1.0.3
@@ -77,6 +76,7 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kubelet v0.28.2
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
+	tags.cncf.io/container-device-interface v0.6.2
 )
 
 require (
@@ -131,4 +131,5 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
+	tags.cncf.io/container-device-interface/specs-go v0.6.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -38,8 +38,6 @@ github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUg
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
-github.com/container-orchestrated-devices/container-device-interface v0.6.1 h1:mz77uJoP8im/4Zins+mPqt677ZMaflhoGaYrRAl5jvA=
-github.com/container-orchestrated-devices/container-device-interface v0.6.1/go.mod h1:40T6oW59rFrL/ksiSs7q45GzjGlbvxnA4xaK6cyq+kA=
 github.com/containerd/btrfs/v2 v2.0.0 h1:FN4wsx7KQrYoLXN7uLP0vBV4oVWHOIKDRQ1G2Z0oL5M=
 github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=
 github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
@@ -548,3 +546,7 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kF
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+tags.cncf.io/container-device-interface v0.6.2 h1:dThE6dtp/93ZDGhqaED2Pu374SOeUkBfuvkLuiTdwzg=
+tags.cncf.io/container-device-interface v0.6.2/go.mod h1:Shusyhjs1A5Na/kqPVLL0KqnHQHuunol9LFeUNkuGVE=
+tags.cncf.io/container-device-interface/specs-go v0.6.0 h1:V+tJJN6dqu8Vym6p+Ru+K5mJ49WL6Aoc5SJFSY0RLsQ=
+tags.cncf.io/container-device-interface/specs-go v0.6.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=
diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go
@@ -392,11 +392,11 @@ type PluginConfig struct {
 	// EnableCDI indicates to enable injection of the Container Device Interface Specifications
 	// into the OCI config
 	// For more details about CDI and the syntax of CDI Spec files please refer to
-	// https://github.com/container-orchestrated-devices/container-device-interface.
+	// https://tags.cncf.io/container-device-interface.
 	EnableCDI bool `toml:"enable_cdi" json:"enableCDI"`
 	// CDISpecDirs is the list of directories to scan for Container Device Interface Specifications
 	// For more details about CDI configuration please refer to
-	// https://github.com/container-orchestrated-devices/container-device-interface#containerd-configuration
+	// https://tags.cncf.io/container-device-interface#containerd-configuration
 	CDISpecDirs []string `toml:"cdi_spec_dirs" json:"cdiSpecDirs"`
 
 	// DrainExecSyncIOTimeout is the maximum duration to wait for ExecSync

diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go
@@ -26,10 +26,10 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/containerd/cgroups/v3"
 	"golang.org/x/sys/unix"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/pkg/oci"

diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go
@@ -25,7 +25,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/containerd/containerd/v2/contrib/apparmor"
 	"github.com/containerd/containerd/v2/contrib/seccomp"
 	"github.com/containerd/containerd/v2/core/containers"
@@ -38,6 +37,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 
 	"github.com/containerd/containerd/v2/pkg/cap"
 	"github.com/containerd/containerd/v2/pkg/cri/annotations"

diff --git a/pkg/cri/server/service_linux.go b/pkg/cri/server/service_linux.go
@@ -19,8 +19,8 @@ package server
 import (
 	"fmt"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/opencontainers/selinux/go-selinux"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 
 	"github.com/containerd/containerd/v2/pkg/cap"
 	"github.com/containerd/containerd/v2/pkg/userns"

diff --git a/pkg/oci/spec_opts.go b/pkg/oci/spec_opts.go
@@ -28,7 +28,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
@@ -40,6 +39,7 @@ import (
 	"github.com/moby/sys/user"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/runtime-spec/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 // SpecOpts sets spec specific information to a newly generated OCI spec

diff --git a/vendor/github.com/container-orchestrated-devices/container-device-interface/specs-go/oci.go b/vendor/github.com/container-orchestrated-devices/container-device-interface/specs-go/oci.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -87,14 +87,6 @@ github.com/cilium/ebpf/internal/sys
 github.com/cilium/ebpf/internal/tracefs
 github.com/cilium/ebpf/internal/unix
 github.com/cilium/ebpf/link
-# github.com/container-orchestrated-devices/container-device-interface v0.6.1
-## explicit; go 1.17
-github.com/container-orchestrated-devices/container-device-interface/internal/multierror
-github.com/container-orchestrated-devices/container-device-interface/internal/validation
-github.com/container-orchestrated-devices/container-device-interface/internal/validation/k8s
-github.com/container-orchestrated-devices/container-device-interface/pkg/cdi
-github.com/container-orchestrated-devices/container-device-interface/pkg/parser
-github.com/container-orchestrated-devices/container-device-interface/specs-go
 # github.com/containerd/btrfs/v2 v2.0.0
 ## explicit; go 1.19
 github.com/containerd/btrfs/v2
@@ -767,3 +759,13 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
+# tags.cncf.io/container-device-interface v0.6.2
+## explicit; go 1.19
+tags.cncf.io/container-device-interface/internal/multierror
+tags.cncf.io/container-device-interface/internal/validation
+tags.cncf.io/container-device-interface/internal/validation/k8s
+tags.cncf.io/container-device-interface/pkg/cdi
+tags.cncf.io/container-device-interface/pkg/parser
+# tags.cncf.io/container-device-interface/specs-go v0.6.0
+## explicit; go 1.19
+tags.cncf.io/container-device-interface/specs-go
diff --git a/...evices/container-device-interface/LICENSE → ...ncf.io/container-device-interface/LICENSE b/...evices/container-device-interface/LICENSE → ...ncf.io/container-device-interface/LICENSE
diff --git a/...terface/internal/multierror/multierror.go → ...terface/internal/multierror/multierror.go b/...terface/internal/multierror/multierror.go → ...terface/internal/multierror/multierror.go
diff --git a/...ace/internal/validation/k8s/objectmeta.go → ...ace/internal/validation/k8s/objectmeta.go b/...ace/internal/validation/k8s/objectmeta.go → ...ace/internal/validation/k8s/objectmeta.go
diff --git a/...ace/internal/validation/k8s/validation.go → ...ace/internal/validation/k8s/validation.go b/...ace/internal/validation/k8s/validation.go → ...ace/internal/validation/k8s/validation.go
diff --git a/...interface/internal/validation/validate.go → ...interface/internal/validation/validate.go b/...interface/internal/validation/validate.go → ...interface/internal/validation/validate.go
diff --git a/...r-device-interface/pkg/cdi/annotations.go → ...r-device-interface/pkg/cdi/annotations.go b/...r-device-interface/pkg/cdi/annotations.go → ...r-device-interface/pkg/cdi/annotations.go
diff --git a/...ntainer-device-interface/pkg/cdi/cache.go → ...ntainer-device-interface/pkg/cdi/cache.go b/...ntainer-device-interface/pkg/cdi/cache.go → ...ntainer-device-interface/pkg/cdi/cache.go
diff --git a/...vice-interface/pkg/cdi/cache_test_unix.go → ...vice-interface/pkg/cdi/cache_test_unix.go b/...vice-interface/pkg/cdi/cache_test_unix.go → ...vice-interface/pkg/cdi/cache_test_unix.go
diff --git a/...e-interface/pkg/cdi/cache_test_windows.go → ...e-interface/pkg/cdi/cache_test_windows.go b/...e-interface/pkg/cdi/cache_test_windows.go → ...e-interface/pkg/cdi/cache_test_windows.go
diff --git a/...vice-interface/pkg/cdi/container-edits.go → ...vice-interface/pkg/cdi/container-edits.go b/...vice-interface/pkg/cdi/container-edits.go → ...vice-interface/pkg/cdi/container-edits.go
diff --git a/...interface/pkg/cdi/container-edits_unix.go → ...interface/pkg/cdi/container-edits_unix.go b/...interface/pkg/cdi/container-edits_unix.go → ...interface/pkg/cdi/container-edits_unix.go
diff --git a/...erface/pkg/cdi/container-edits_windows.go → ...erface/pkg/cdi/container-edits_windows.go b/...erface/pkg/cdi/container-edits_windows.go → ...erface/pkg/cdi/container-edits_windows.go
diff --git a/...tainer-device-interface/pkg/cdi/device.go → ...tainer-device-interface/pkg/cdi/device.go b/...tainer-device-interface/pkg/cdi/device.go → ...tainer-device-interface/pkg/cdi/device.go