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

Merge pull request #10089 from samuelkarp/bump-nri-v0.6.1

Browse Source 
mod: bump github.com/containerd/nri@v0.6.1
This commit is contained in:
Kazuyoshi Kato 2024-04-18 23:07:13 +00:00 committed by GitHub
commit 6e0dc9f50f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -19,7 +19,7 @@ require (
github.com/containerd/go-cni v1.1.9 github.com/containerd/go-cni v1.1.9
github.com/containerd/go-runc v1.1.0 github.com/containerd/go-runc v1.1.0
github.com/containerd/log v0.1.0 github.com/containerd/log v0.1.0
github.com/containerd/nri v0.6.0 github.com/containerd/nri v0.6.1
github.com/containerd/platforms v0.1.1 github.com/containerd/platforms v0.1.1
github.com/containerd/plugin v0.1.0 github.com/containerd/plugin v0.1.0
github.com/containerd/ttrpc v1.2.3 github.com/containerd/ttrpc v1.2.3

4
go.sum
View File

@ -88,8 +88,8 @@ github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gG
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/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/containerd/nri v0.6.0 h1:hdztxwL0gCS1CrCa9bvD1SoJiFN4jBuRQhplCvCPMj8= github.com/containerd/nri v0.6.1 h1:xSQ6elnQ4Ynidm9u49ARK9wRKHs80HCUI+bkXOxV4mA=
github.com/containerd/nri v0.6.0/go.mod h1:F7OZfO4QTPqw5r87aq+syZJwiVvRYLIlHZiZDBV1W3A= github.com/containerd/nri v0.6.1/go.mod h1:7+sX3wNx+LR7RzhjnJiUkFDhn18P5Bg/0VnJ/uXpRJM=
github.com/containerd/platforms v0.1.1 h1:gp0xXBoY+1CjH54gJDon0kBjIbK2C4XSX1BGwP5ptG0= github.com/containerd/platforms v0.1.1 h1:gp0xXBoY+1CjH54gJDon0kBjIbK2C4XSX1BGwP5ptG0=
github.com/containerd/platforms v0.1.1/go.mod h1:XOM2BS6kN6gXafPLg80V6y/QUib+xoLyC3qVmHzibko= github.com/containerd/platforms v0.1.1/go.mod h1:XOM2BS6kN6gXafPLg80V6y/QUib+xoLyC3qVmHzibko=
github.com/containerd/plugin v0.1.0 h1:CYMyZk9beRAIe1FEKItbMLLAz/z16aXrGc+B+nv0fU4= github.com/containerd/plugin v0.1.0 h1:CYMyZk9beRAIe1FEKItbMLLAz/z16aXrGc+B+nv0fU4=

6
vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go generated vendored
View File

@ -431,18 +431,16 @@ func (r *Adaptation) acceptPluginConnections(l net.Listener) error {
continue continue
} }
r.Lock()
err = r.syncFn(ctx, p.synchronize) err = r.syncFn(ctx, p.synchronize)
if err != nil { if err != nil {
log.Infof(ctx, "failed to synchronize plugin: %v", err) log.Infof(ctx, "failed to synchronize plugin: %v", err)
} else { } else {
r.Lock()
r.plugins = append(r.plugins, p) r.plugins = append(r.plugins, p)
r.sortPlugins() r.sortPlugins()
r.Unlock()
} }
r.Unlock()
log.Infof(ctx, "plugin %q connected", p.name()) log.Infof(ctx, "plugin %q connected", p.name())
} }
}() }()

2
vendor/modules.txt vendored
View File

@ -133,7 +133,7 @@ github.com/containerd/go-runc
## explicit; go 1.20 ## explicit; go 1.20
github.com/containerd/log github.com/containerd/log
github.com/containerd/log/logtest github.com/containerd/log/logtest
# github.com/containerd/nri v0.6.0 # github.com/containerd/nri v0.6.1
## explicit; go 1.19 ## explicit; go 1.19
github.com/containerd/nri github.com/containerd/nri
github.com/containerd/nri/pkg/adaptation github.com/containerd/nri/pkg/adaptation