Merge pull request #10089 from samuelkarp/bump-nri-v0.6.1
mod: bump github.com/containerd/nri@v0.6.1
This commit is contained in:
6
vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go
generated
vendored
6
vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go
generated
vendored
@@ -431,18 +431,16 @@ func (r *Adaptation) acceptPluginConnections(l net.Listener) error {
|
||||
continue
|
||||
}
|
||||
|
||||
r.Lock()
|
||||
|
||||
err = r.syncFn(ctx, p.synchronize)
|
||||
if err != nil {
|
||||
log.Infof(ctx, "failed to synchronize plugin: %v", err)
|
||||
} else {
|
||||
r.Lock()
|
||||
r.plugins = append(r.plugins, p)
|
||||
r.sortPlugins()
|
||||
r.Unlock()
|
||||
}
|
||||
|
||||
r.Unlock()
|
||||
|
||||
log.Infof(ctx, "plugin %q connected", p.name())
|
||||
}
|
||||
}()
|
||||
|
||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@@ -133,7 +133,7 @@ github.com/containerd/go-runc
|
||||
## explicit; go 1.20
|
||||
github.com/containerd/log
|
||||
github.com/containerd/log/logtest
|
||||
# github.com/containerd/nri v0.6.0
|
||||
# github.com/containerd/nri v0.6.1
|
||||
## explicit; go 1.19
|
||||
github.com/containerd/nri
|
||||
github.com/containerd/nri/pkg/adaptation
|
||||
|
||||
Reference in New Issue
Block a user