Ensure we dont fail if containers disappear (#3167)

apostasie · apostasie · commit fceea23b9d72 · 2024-07-05T18:41:24.000-07:00
Signed-off-by: apostasie &lt;spam_blackhole@farcloser.world&gt;
diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
@@ -88,12 +88,17 @@ func namespaceUsedNetworks(ctx context.Context, containers []containerd.Containe
 		task, err := c.Task(ctx, nil)
 		if err != nil {
 			if errdefs.IsNotFound(err) {
+				log.G(ctx).Debugf("task not found - likely container %q was removed", c.ID())
 				continue
 			}
 			return nil, err
 		}
 		status, err := task.Status(ctx)
 		if err != nil {
+			if errdefs.IsNotFound(err) {
+				log.G(ctx).Debugf("task not found - likely container %q was removed", c.ID())
+				continue
+			}
 			return nil, err
 		}
 		switch status.Status {
@@ -103,6 +108,10 @@ func namespaceUsedNetworks(ctx context.Context, containers []containerd.Containe
 		}
 		l, err := c.Labels(ctx)
 		if err != nil {
+			if errdefs.IsNotFound(err) {
+				log.G(ctx).Debugf("container %q is gone", c.ID())
+				continue
+			}
 			return nil, err
 		}
 		networkJSON, ok := l[labels.Networks]

Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,17 @@ func namespaceUsedNetworks(ctx context.Context, containers []containerd.Containe`
`88`	`88`	`task, err := c.Task(ctx, nil)`
`89`	`89`	`if err != nil {`
`90`	`90`	`if errdefs.IsNotFound(err) {`
	`91`	`+ log.G(ctx).Debugf("task not found - likely container %q was removed", c.ID())`
`91`	`92`	`continue`
`92`	`93`	`}`
`93`	`94`	`return nil, err`
`94`	`95`	`}`
`95`	`96`	`status, err := task.Status(ctx)`
`96`	`97`	`if err != nil {`
	`98`	`+ if errdefs.IsNotFound(err) {`
	`99`	`+ log.G(ctx).Debugf("task not found - likely container %q was removed", c.ID())`
	`100`	`+ continue`
	`101`	`+ }`
`97`	`102`	`return nil, err`
`98`	`103`	`}`
`99`	`104`	`switch status.Status {`
`@@ -103,6 +108,10 @@ func namespaceUsedNetworks(ctx context.Context, containers []containerd.Containe`
`103`	`108`	`}`
`104`	`109`	`l, err := c.Labels(ctx)`
`105`	`110`	`if err != nil {`
	`111`	`+ if errdefs.IsNotFound(err) {`
	`112`	`+ log.G(ctx).Debugf("container %q is gone", c.ID())`
	`113`	`+ continue`
	`114`	`+ }`
`106`	`115`	`return nil, err`
`107`	`116`	`}`
`108`	`117`	`networkJSON, ok := l[labels.Networks]`