github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10382 from containerd/dependabot/go_modules/github.com/containerd/go-cni-1.1.10

Browse Source 
build(deps): bump github.com/containerd/go-cni from 1.1.9 to 1.1.10
This commit is contained in:
Maksym Pavlenko 2024-06-26 19:22:19 +00:00 committed by GitHub
commit cf2f42edc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -17,7 +17,7 @@ require (
github.com/containerd/continuity v0.4.3 github.com/containerd/continuity v0.4.3
github.com/containerd/errdefs v0.1.0 github.com/containerd/errdefs v0.1.0
github.com/containerd/fifo v1.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/go-runc v1.1.0
github.com/containerd/imgcrypt v1.1.12-0.20240528203804-3ca09a2db5cd github.com/containerd/imgcrypt v1.1.12-0.20240528203804-3ca09a2db5cd
github.com/containerd/log v0.1.0 github.com/containerd/log v0.1.0

4
go.sum
View File

@ -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/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 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY=
github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= 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.10 h1:c2U73nld7spSWfiJwSh/8W9DK+/qQwYM2rngIhCyhyg=
github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM= 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 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA=
github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U= 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= github.com/containerd/imgcrypt v1.1.12-0.20240528203804-3ca09a2db5cd h1:GjAKQysk1gNYupyhuvCyNvNRNtmPF7e8/+OhqT/8zu4=

14
vendor/github.com/containerd/go-cni/result.go generated vendored
View File

@ -57,9 +57,11 @@ func (r *Result) Raw() []*types100.Result {
} }
type Config struct { type Config struct {
IPConfigs []*IPConfig IPConfigs []*IPConfig
Mac string Mac string
Sandbox string Sandbox string
PciID string
SocketPath string
} }
// createResult creates a Result from the given slice of types100.Result, adding // 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 // Walk through all the interface in each result
for _, intf := range result.Interfaces { for _, intf := range result.Interfaces {
r.Interfaces[intf.Name] = &Config{ r.Interfaces[intf.Name] = &Config{
Mac: intf.Mac, Mac: intf.Mac,
Sandbox: intf.Sandbox, Sandbox: intf.Sandbox,
SocketPath: intf.SocketPath,
PciID: intf.PciID,
} }
} }
// Walk through all the IPs in the result and attach it to corresponding // Walk through all the IPs in the result and attach it to corresponding

4
vendor/modules.txt vendored
View File

@ -149,8 +149,8 @@ github.com/containerd/errdefs
# github.com/containerd/fifo v1.1.0 # github.com/containerd/fifo v1.1.0
## explicit; go 1.18 ## explicit; go 1.18
github.com/containerd/fifo github.com/containerd/fifo
# github.com/containerd/go-cni v1.1.9 # github.com/containerd/go-cni v1.1.10
## explicit; go 1.19 ## explicit; go 1.21
github.com/containerd/go-cni github.com/containerd/go-cni
# github.com/containerd/go-runc v1.1.0 # github.com/containerd/go-runc v1.1.0
## explicit; go 1.18 ## explicit; go 1.18