diff --git a/go.mod b/go.mod index 2e7df6abc..f34ace44b 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/containerd/continuity v0.4.3 github.com/containerd/errdefs v0.1.0 github.com/containerd/fifo v1.1.0 - github.com/containerd/go-cni v1.1.9 + github.com/containerd/go-cni v1.1.10 github.com/containerd/go-runc v1.1.0 github.com/containerd/imgcrypt v1.1.12-0.20240528203804-3ca09a2db5cd github.com/containerd/log v0.1.0 diff --git a/go.sum b/go.sum index 6f6135c6b..ae5d24f76 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5Z github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= -github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9rU= -github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM= +github.com/containerd/go-cni v1.1.10 h1:c2U73nld7spSWfiJwSh/8W9DK+/qQwYM2rngIhCyhyg= +github.com/containerd/go-cni v1.1.10/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA= github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U= github.com/containerd/imgcrypt v1.1.12-0.20240528203804-3ca09a2db5cd h1:GjAKQysk1gNYupyhuvCyNvNRNtmPF7e8/+OhqT/8zu4= diff --git a/vendor/github.com/containerd/go-cni/result.go b/vendor/github.com/containerd/go-cni/result.go index 02957ddc4..0dd002e8e 100644 --- a/vendor/github.com/containerd/go-cni/result.go +++ b/vendor/github.com/containerd/go-cni/result.go @@ -57,9 +57,11 @@ func (r *Result) Raw() []*types100.Result { } type Config struct { - IPConfigs []*IPConfig - Mac string - Sandbox string + IPConfigs []*IPConfig + Mac string + Sandbox string + PciID string + SocketPath string } // createResult creates a Result from the given slice of types100.Result, adding @@ -84,8 +86,10 @@ func (c *libcni) createResult(results []*types100.Result) (*Result, error) { // Walk through all the interface in each result for _, intf := range result.Interfaces { r.Interfaces[intf.Name] = &Config{ - Mac: intf.Mac, - Sandbox: intf.Sandbox, + Mac: intf.Mac, + Sandbox: intf.Sandbox, + SocketPath: intf.SocketPath, + PciID: intf.PciID, } } // Walk through all the IPs in the result and attach it to corresponding diff --git a/vendor/modules.txt b/vendor/modules.txt index 26d78ef06..b19768db5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -149,8 +149,8 @@ github.com/containerd/errdefs # github.com/containerd/fifo v1.1.0 ## explicit; go 1.18 github.com/containerd/fifo -# github.com/containerd/go-cni v1.1.9 -## explicit; go 1.19 +# github.com/containerd/go-cni v1.1.10 +## explicit; go 1.21 github.com/containerd/go-cni # github.com/containerd/go-runc v1.1.0 ## explicit; go 1.18