diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index d06285e5b0..c2b753f498 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -13,7 +13,6 @@ import ( "strings" "time" - cdi "github.com/container-orchestrated-devices/container-device-interface/pkg/parser" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/compose/loader" "github.com/docker/cli/opts" @@ -26,6 +25,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/pflag" + cdi "tags.cncf.io/container-device-interface/pkg/parser" ) var deviceCgroupRuleRegexp = regexp.MustCompile(`^[acb] ([0-9]+|\*):([0-9]+|\*) [rwm]{1,3}$`) diff --git a/vendor.mod b/vendor.mod index 6bc4fda3e9..f14c586333 100644 --- a/vendor.mod +++ b/vendor.mod @@ -8,7 +8,6 @@ go 1.19 require ( dario.cat/mergo v1.0.0 - github.com/container-orchestrated-devices/container-device-interface v0.6.1 github.com/containerd/containerd v1.7.8 github.com/creack/pty v1.1.18 github.com/distribution/reference v0.5.0 @@ -44,6 +43,7 @@ require ( golang.org/x/text v0.13.0 gopkg.in/yaml.v2 v2.4.0 gotest.tools/v3 v3.5.1 + tags.cncf.io/container-device-interface v0.6.2 ) require ( diff --git a/vendor.sum b/vendor.sum index 5f54ed9120..9e0bdb6f9d 100644 --- a/vendor.sum +++ b/vendor.sum @@ -36,8 +36,6 @@ github.com/cloudflare/cfssl v1.6.4 h1:NMOvfrEjFfC63K3SGXgAnFdsgkmiq4kATme5BfcqrO github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -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/containerd v1.7.8 h1:RkwgOW3AVUT3H/dyT0W03Dc8AzlpMG65lX48KftOFSM= github.com/containerd/containerd v1.7.8/go.mod h1:L/Hn9qylJtUFT7cPeM0Sr3fATj+WjHwRQ0lyrYk3OPY= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= @@ -391,3 +389,5 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= +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= diff --git a/vendor/modules.txt b/vendor/modules.txt index 5a6993c4ca..e53650ed17 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -21,9 +21,6 @@ github.com/beorn7/perks/quantile # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/container-orchestrated-devices/container-device-interface v0.6.1 -## explicit; go 1.17 -github.com/container-orchestrated-devices/container-device-interface/pkg/parser # github.com/containerd/containerd v1.7.8 ## explicit; go 1.19 github.com/containerd/containerd/errdefs @@ -474,3 +471,6 @@ gotest.tools/v3/internal/format gotest.tools/v3/internal/source gotest.tools/v3/poll gotest.tools/v3/skip +# tags.cncf.io/container-device-interface v0.6.2 +## explicit; go 1.19 +tags.cncf.io/container-device-interface/pkg/parser diff --git a/vendor/github.com/container-orchestrated-devices/container-device-interface/LICENSE b/vendor/tags.cncf.io/container-device-interface/LICENSE similarity index 100% rename from vendor/github.com/container-orchestrated-devices/container-device-interface/LICENSE rename to vendor/tags.cncf.io/container-device-interface/LICENSE diff --git a/vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/parser/parser.go b/vendor/tags.cncf.io/container-device-interface/pkg/parser/parser.go similarity index 100% rename from vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/parser/parser.go rename to vendor/tags.cncf.io/container-device-interface/pkg/parser/parser.go