| From 0e94141ecaa024826bb462ed28235f05b07f8541 Mon Sep 17 00:00:00 2001 |
| From: Samuel Karp <samuelkarp@google.com> |
| Date: Thu, 18 Apr 2024 15:00:34 -0700 |
| Subject: [PATCH] mod: bump github.com/containerd/nri@v0.6.1 |
| |
| Fixes https://github.com/containerd/containerd/issues/10085 |
| |
| Signed-off-by: Samuel Karp <samuelkarp@google.com> |
| --- |
| go.mod | 2 +- |
| go.sum | 4 ++-- |
| .../github.com/containerd/nri/pkg/adaptation/adaptation.go | 6 ++---- |
| vendor/modules.txt | 2 +- |
| 4 files changed, 6 insertions(+), 8 deletions(-) |
| |
| diff --git a/go.mod b/go.mod |
| index eeadd4c910fc..2a3869f1a82f 100644 |
| --- a/go.mod |
| +++ b/go.mod |
| @@ -18,7 +18,7 @@ require ( |
| github.com/containerd/go-runc v1.0.0 |
| github.com/containerd/imgcrypt v1.1.7 |
| github.com/containerd/log v0.1.0 |
| - github.com/containerd/nri v0.6.0 |
| + github.com/containerd/nri v0.6.1 |
| github.com/containerd/ttrpc v1.2.3 |
| github.com/containerd/typeurl/v2 v2.1.1 |
| github.com/containerd/zfs v1.1.0 |
| diff --git a/go.sum b/go.sum |
| index 449333d1e7f0..34a9a4d31b0b 100644 |
| --- a/go.sum |
| +++ b/go.sum |
| @@ -275,8 +275,8 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3 |
| github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= |
| github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= |
| github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= |
| -github.com/containerd/nri v0.6.0 h1:hdztxwL0gCS1CrCa9bvD1SoJiFN4jBuRQhplCvCPMj8= |
| -github.com/containerd/nri v0.6.0/go.mod h1:F7OZfO4QTPqw5r87aq+syZJwiVvRYLIlHZiZDBV1W3A= |
| +github.com/containerd/nri v0.6.1 h1:xSQ6elnQ4Ynidm9u49ARK9wRKHs80HCUI+bkXOxV4mA= |
| +github.com/containerd/nri v0.6.1/go.mod h1:7+sX3wNx+LR7RzhjnJiUkFDhn18P5Bg/0VnJ/uXpRJM= |
| github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= |
| github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= |
| github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= |
| diff --git a/vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go b/vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go |
| index 141cb85be184..9201e6411d56 100644 |
| --- a/vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go |
| +++ b/vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go |
| @@ -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()) |
| } |
| }() |
| diff --git a/vendor/modules.txt b/vendor/modules.txt |
| index 63448dbac9fc..061905151e56 100644 |
| --- a/vendor/modules.txt |
| +++ b/vendor/modules.txt |
| @@ -130,7 +130,7 @@ github.com/containerd/imgcrypt/images/encryption |
| ## 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 |
| -- |
| 2.44.0.769.g3c40516874-goog |
| |
