From 71d237ae6d9e5e9f8e61eb18bc5b748a766e664c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 17 Sep 2026 17:42:42 +0900 Subject: [PATCH 1/2] go.mod: fix groupification Signed-off-by: Akihiro Suda --- go.mod | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index f7b37a3c315..be5ec9f978b 100644 --- a/go.mod +++ b/go.mod @@ -75,6 +75,7 @@ require ( github.com/vishvananda/netns v0.0.5 //gomodjail:unconfined github.com/yuchanns/srslog v1.1.0 //gomodjail:unconfined go.yaml.in/yaml/v3 v3.0.5 + go4.org/netipx v0.0.0-20231129151722-fdeea329fbba gotest.tools/v3 v3.5.2 //gomodjail:unconfined tags.cncf.io/container-device-interface v1.1.1 //gomodjail:unconfined ) @@ -99,9 +100,13 @@ require ( ) require ( + cyphar.com/go-pathrs v0.2.5 // indirect github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect + github.com/ProtonMail/go-crypto v1.4.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect //gomodjail:unconfined github.com/cilium/ebpf v0.22.0 // indirect + github.com/cloudflare/circl v1.6.3 // indirect //gomodjail:unconfined github.com/containers/ocicrypt v1.3.2 // indirect //gomodjail:unconfined @@ -115,6 +120,8 @@ require ( //gomodjail:unconfined github.com/godbus/dbus/v5 v5.2.2 // indirect github.com/google/go-cmp v0.7.0 // indirect + //gomodjail:unconfined + github.com/google/uuid v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect //gomodjail:unconfined github.com/klauspost/cpuid/v2 v2.2.8 // indirect @@ -158,7 +165,9 @@ require ( //gomodjail:unconfined go.opentelemetry.io/otel v1.46.0 // indirect go.opentelemetry.io/otel/metric v1.46.0 // indirect + go.opentelemetry.io/otel/sdk v1.46.0 // indirect go.opentelemetry.io/otel/trace v1.46.0 // indirect + go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 // indirect //gomodjail:unconfined google.golang.org/grpc v1.83.2 // indirect @@ -166,22 +175,9 @@ require ( google.golang.org/protobuf v1.36.12 // indirect //gomodjail:unconfined lukechampine.com/blake3 v1.3.0 // indirect - tags.cncf.io/container-device-interface/specs-go v1.1.1 // indirect -) - -require go4.org/netipx v0.0.0-20231129151722-fdeea329fbba - -require ( - cyphar.com/go-pathrs v0.2.5 // indirect - github.com/ProtonMail/go-crypto v1.4.1 // indirect - github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cloudflare/circl v1.6.3 // indirect - //gomodjail:unconfined - github.com/google/uuid v1.6.0 // indirect - go.opentelemetry.io/otel/sdk v1.46.0 // indirect - go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect //gomodjail:unconfined sigs.k8s.io/knftables v0.0.18 // indirect + tags.cncf.io/container-device-interface/specs-go v1.1.1 // indirect ) replace github.com/containerd/nerdctl/mod/tigron v0.0.0 => ./mod/tigron From 0cf480552e8881f43f169142041216f678c6d79f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 17 Sep 2026 17:43:57 +0900 Subject: [PATCH 2/2] go.mod: github.com/containerd/containerd/v2 v2.4.0 Signed-off-by: Akihiro Suda --- go.mod | 9 +++++---- go.sum | 14 ++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index be5ec9f978b..953cf838455 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ //gomodjail:confined module github.com/containerd/nerdctl/v2 -go 1.26.3 +go 1.26.6 // containerd, Docker/Moby, OCI, and golang.org/x packages are trusted //gosocialcheck:trusted @@ -9,8 +9,8 @@ require ( github.com/containerd/accelerated-container-image v1.4.4 //gomodjail:unconfined github.com/containerd/cgroups/v3 v3.1.3 //gomodjail:unconfined github.com/containerd/console v1.0.5 //gomodjail:unconfined - github.com/containerd/containerd/api v1.12.0-rc.0 //gomodjail:unconfined - github.com/containerd/containerd/v2 v2.4.0-beta.0 //gomodjail:unconfined + github.com/containerd/containerd/api v1.12.0 //gomodjail:unconfined + github.com/containerd/containerd/v2 v2.4.0 //gomodjail:unconfined github.com/containerd/continuity v0.5.0 //gomodjail:unconfined github.com/containerd/errdefs v1.0.0 github.com/containerd/fifo v1.1.0 //gomodjail:unconfined @@ -85,6 +85,7 @@ require ( github.com/containerd/errdefs/pkg v0.3.0 // indirect //gomodjail:unconfined github.com/containerd/go-runc v1.2.1 // indirect + github.com/containerd/log/otel v0.1.0 // indirect github.com/containerd/plugin v1.1.0 // indirect //gomodjail:unconfined github.com/containerd/ttrpc v1.2.9 // indirect @@ -114,7 +115,7 @@ require ( //gomodjail:unconfined github.com/djherbis/times v1.6.0 // indirect github.com/felixge/httpsnoop v1.1.0 // indirect - github.com/go-jose/go-jose/v4 v4.1.4 // indirect + github.com/go-jose/go-jose/v4 v4.1.5 // indirect github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect //gomodjail:unconfined diff --git a/go.sum b/go.sum index da06a81eb07..a774b039f1b 100644 --- a/go.sum +++ b/go.sum @@ -28,10 +28,10 @@ github.com/containerd/cgroups/v3 v3.1.3 h1:eUNflyMddm18+yrDmZPn3jI7C5hJ9ahABE5q6 github.com/containerd/cgroups/v3 v3.1.3/go.mod h1:PKZ2AcWmSBsY/tJUVhtS/rluX0b1uq1GmPO1ElCmbOw= github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc= github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= -github.com/containerd/containerd/api v1.12.0-rc.0 h1:Uu/0brBDz8nW/Vo+g8ah/iJkhZML+1z+X44g8q70MVw= -github.com/containerd/containerd/api v1.12.0-rc.0/go.mod h1:EBcSzoi9Vl18cdODaXUCskf3D2NT8lsSXeZJnU5jIUc= -github.com/containerd/containerd/v2 v2.4.0-beta.0 h1:uFwtEE0kwGngxOT0WVW3/mozESCVg+8hKUExSis7SLY= -github.com/containerd/containerd/v2 v2.4.0-beta.0/go.mod h1:GOAqkxqN53nSzBcz9Y5jAM9JELRMo67r34O/HDCY4Ro= +github.com/containerd/containerd/api v1.12.0 h1:kuQm82SbDrCuO4n7hf2L8zsBtZLuympyq5X/VotfX2A= +github.com/containerd/containerd/api v1.12.0/go.mod h1:EBcSzoi9Vl18cdODaXUCskf3D2NT8lsSXeZJnU5jIUc= +github.com/containerd/containerd/v2 v2.4.0 h1:mZLYWkPAgF4tfTjinClrRfvUxmxHxg1PQL7cjrrpTtk= +github.com/containerd/containerd/v2 v2.4.0/go.mod h1:gHZz+v5y8mGt9grF3ynuaa3r6bXLmghBZWTAftHAUtg= github.com/containerd/continuity v0.5.0 h1:7a85HZpCSs+1Zps0Ee3DPSuAWY+0SJM1JNM51nlEVDg= github.com/containerd/continuity v0.5.0/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -48,6 +48,8 @@ github.com/containerd/imgcrypt/v2 v2.0.3 h1:yM6//IOTtca9TpxPP8prJqLDuidbF/VhUQuj github.com/containerd/imgcrypt/v2 v2.0.3/go.mod h1:Sjfd3uOiBWtb1dUo1yS5Z/ZxdfMU7MpBr2pzs9HoRDs= github.com/containerd/log v0.2.0 h1:BewD/umNgVnoczglOpX8eRMyEy5t5iPlu5AIpnWDONc= github.com/containerd/log v0.2.0/go.mod h1:/M7L7CXKcPTfNC74XzaK+5H5KbO5+4lJVpuVI6vRLoM= +github.com/containerd/log/otel v0.1.0 h1:Az5rFFo0+c4v2yC8ROR63sWsZpKl/vhtUnUhqLSpE6U= +github.com/containerd/log/otel v0.1.0/go.mod h1:65C5iYF2xIQByCyxzoO2KKKK1+/tGxD4XqhdlrTtvzE= github.com/containerd/nydus-snapshotter v0.15.16 h1:FkAmNADhOQFeWZtrHcDz04ZoOKsIeKZtKbz7PHxIFtc= github.com/containerd/nydus-snapshotter v0.15.16/go.mod h1:x+/i5WkV8w4jSXbdv57YSMWvkzT2JFwpeIDJxvcYe38= github.com/containerd/platforms v1.0.0-rc.5 h1:vXd569rDrz8LeMXzAnBsy6LADV5YtsD8oyaRarxdmSU= @@ -105,8 +107,8 @@ github.com/fluent/fluent-logger-golang v1.10.1 h1:wu54iN1O2afll5oQrtTjhgZRwWcfOe github.com/fluent/fluent-logger-golang v1.10.1/go.mod h1:qOuXG4ZMrXaSTk12ua+uAb21xfNYOzn0roAtp7mfGAE= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= -github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA= -github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= +github.com/go-jose/go-jose/v4 v4.1.5 h1:RjgjO2LOtWOJKUC5wpwY9LR3B3vwVAz6JS2YHfYU6eA= +github.com/go-jose/go-jose/v4 v4.1.5/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=