Skip to content

Commit 55c984b

Browse files
committed
Bump containerd to v2.1.4
Signed-off-by: Brad Davidson <[email protected]>
1 parent e7dd3b7 commit 55c984b

File tree

5 files changed

+103
-101
lines changed

5 files changed

+103
-101
lines changed

go.mod

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ replace (
77
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.19-k3s1
88
github.com/cilium/ebpf => github.com/cilium/ebpf v0.12.3
99
github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.5.0
10-
github.com/containerd/containerd/api => github.com/containerd/containerd/api v1.8.0
11-
github.com/containerd/containerd/v2 => github.com/k3s-io/containerd/v2 v2.0.5-k3s2
10+
github.com/containerd/containerd/api => github.com/containerd/containerd/api v1.9.0
11+
github.com/containerd/containerd/v2 => github.com/k3s-io/containerd/v2 v2.1.4-k3s1
1212
github.com/containerd/imgcrypt => github.com/containerd/imgcrypt v1.1.11
1313
github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible
1414
github.com/docker/docker => github.com/docker/docker v25.0.8+incompatible
@@ -70,7 +70,7 @@ replace (
7070
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.33.4-k3s1
7171
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.33.4-k3s1
7272
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.33.4-k3s1
73-
sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.31.0-k3s2
73+
sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.33.0-k3s2
7474
sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0
7575
)
7676

@@ -80,20 +80,20 @@ require (
8080
github.com/blang/semver/v4 v4.0.0
8181
github.com/cloudnativelabs/kube-router/v2 v2.0.0-00010101000000-000000000000
8282
github.com/containerd/cgroups/v3 v3.0.5
83-
github.com/containerd/containerd/api v1.8.0
84-
github.com/containerd/containerd/v2 v2.0.5
83+
github.com/containerd/containerd/api v1.9.0
84+
github.com/containerd/containerd/v2 v2.1.3
8585
github.com/containerd/errdefs v1.0.0
86-
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.0
87-
github.com/containerd/stargz-snapshotter v0.16.3
86+
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6
87+
github.com/containerd/stargz-snapshotter v0.17.0
8888
github.com/containerd/zfs/v2 v2.0.0-rc.0
8989
github.com/coreos/go-iptables v0.8.0
9090
github.com/coreos/go-systemd/v22 v22.5.0
9191
github.com/distribution/reference v0.6.0
92-
github.com/docker/docker v27.5.1+incompatible
92+
github.com/docker/docker v28.1.1+incompatible
9393
github.com/dustin/go-humanize v1.0.1
9494
github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83
9595
github.com/flannel-io/flannel v0.27.0
96-
github.com/fsnotify/fsnotify v1.7.0
96+
github.com/fsnotify/fsnotify v1.9.0
9797
github.com/go-logr/logr v1.4.2
9898
github.com/go-logr/stdr v1.2.3-0.20220714215716-96bad1d688c5
9999
github.com/go-test/deep v1.0.7
@@ -149,8 +149,8 @@ require (
149149
golang.org/x/crypto v0.37.0
150150
golang.org/x/mod v0.24.0
151151
golang.org/x/net v0.39.0
152-
golang.org/x/sync v0.13.0
153-
golang.org/x/sys v0.32.0
152+
golang.org/x/sync v0.16.0
153+
golang.org/x/sys v0.34.0
154154
google.golang.org/grpc v1.73.0
155155
gopkg.in/yaml.v2 v2.4.0
156156
k8s.io/api v0.33.4
@@ -181,7 +181,7 @@ require (
181181
github.com/buger/jsonparser v1.1.1 // indirect
182182
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
183183
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
184-
github.com/invopop/jsonschema v0.12.0 // indirect
184+
github.com/invopop/jsonschema v0.13.0 // indirect
185185
github.com/stretchr/objx v0.5.2 // indirect
186186
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
187187
github.com/x448/float16 v0.8.4 // indirect
@@ -192,9 +192,7 @@ require (
192192
cel.dev/expr v0.19.1 // indirect
193193
dario.cat/mergo v1.0.1 // indirect
194194
filippo.io/edwards25519 v1.1.0 // indirect
195-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
196-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
197-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
195+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
198196
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
199197
github.com/MakeNowJust/heredoc v1.0.0 // indirect
200198
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -217,19 +215,19 @@ require (
217215
github.com/container-storage-interface/spec v1.9.0 // indirect
218216
github.com/containerd/btrfs/v2 v2.0.0 // indirect
219217
github.com/containerd/cgroups v1.1.0 // indirect
220-
github.com/containerd/console v1.0.4 // indirect
218+
github.com/containerd/console v1.0.5 // indirect
221219
github.com/containerd/continuity v0.4.5 // indirect
222220
github.com/containerd/errdefs/pkg v0.3.0 // indirect
223221
github.com/containerd/fifo v1.1.0 // indirect
224222
github.com/containerd/go-cni v1.1.12 // indirect
225223
github.com/containerd/go-runc v1.1.0 // indirect
226-
github.com/containerd/imgcrypt/v2 v2.0.0 // indirect
224+
github.com/containerd/imgcrypt/v2 v2.0.1 // indirect
227225
github.com/containerd/log v0.1.0 // indirect
228226
github.com/containerd/nri v0.8.0 // indirect
229227
github.com/containerd/otelttrpc v0.1.0 // indirect
230228
github.com/containerd/platforms v1.0.0-rc.1 // indirect
231229
github.com/containerd/plugin v1.0.0 // indirect
232-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
230+
github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
233231
github.com/containerd/ttrpc v1.2.7 // indirect
234232
github.com/containerd/typeurl/v2 v2.2.3 // indirect
235233
github.com/containernetworking/cni v1.3.0 // indirect
@@ -242,7 +240,7 @@ require (
242240
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
243241
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
244242
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
245-
github.com/docker/cli v27.3.1+incompatible // indirect
243+
github.com/docker/cli v28.3.2+incompatible // indirect
246244
github.com/docker/distribution v2.8.3+incompatible // indirect
247245
github.com/docker/docker-credential-helpers v0.7.0 // indirect
248246
github.com/docker/go-connections v0.5.0 // indirect
@@ -289,12 +287,11 @@ require (
289287
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
290288
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
291289
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
292-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
293-
github.com/hanwen/go-fuse/v2 v2.6.3 // indirect
290+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
291+
github.com/hanwen/go-fuse/v2 v2.8.0 // indirect
294292
github.com/hashicorp/errwrap v1.1.0 // indirect
295293
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
296-
github.com/hashicorp/go-multierror v1.1.1 // indirect
297-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
294+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
298295
github.com/hashicorp/go-version v1.7.0 // indirect
299296
github.com/hashicorp/golang-lru v1.0.2 // indirect
300297
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
@@ -363,8 +360,8 @@ require (
363360
github.com/moby/sys/sequential v0.6.0 // indirect
364361
github.com/moby/sys/signal v0.7.1 // indirect
365362
github.com/moby/sys/symlink v0.3.0 // indirect
366-
github.com/moby/sys/user v0.3.0 // indirect
367-
github.com/moby/term v0.5.0 // indirect
363+
github.com/moby/sys/user v0.4.0 // indirect
364+
github.com/moby/term v0.5.2 // indirect
368365
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
369366
github.com/modern-go/reflect2 v1.0.2 // indirect
370367
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
@@ -392,7 +389,7 @@ require (
392389
github.com/opencontainers/cgroups v0.0.1 // indirect
393390
github.com/opencontainers/go-digest v1.0.0 // indirect
394391
github.com/opencontainers/image-spec v1.1.1 // indirect
395-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
392+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
396393
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
397394
github.com/opentracing/opentracing-go v1.2.0 // indirect
398395
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
@@ -441,39 +438,39 @@ require (
441438
github.com/stoewer/go-strcase v1.3.0 // indirect
442439
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
443440
github.com/syndtr/goleveldb v1.0.0 // indirect
444-
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
441+
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
445442
github.com/tidwall/btree v1.8.0 // indirect
446443
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
447-
github.com/vbatts/tar-split v0.11.6 // indirect
444+
github.com/vbatts/tar-split v0.12.1 // indirect
448445
github.com/vishvananda/netns v0.0.5 // indirect
449446
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
450447
github.com/wlynxg/anet v0.0.5 // indirect
451448
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
452449
github.com/xlab/treeprint v1.2.0 // indirect
453450
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
454-
go.etcd.io/bbolt v1.4.0 // indirect
451+
go.etcd.io/bbolt v1.4.2 // indirect
455452
go.etcd.io/etcd/client/v2 v2.305.21 // indirect
456453
go.etcd.io/etcd/pkg/v3 v3.5.21 // indirect
457454
go.etcd.io/etcd/raft/v3 v3.5.21 // indirect
458455
go.opencensus.io v0.24.0 // indirect
459456
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
460457
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
461-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
462-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
458+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
459+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
463460
go.opentelemetry.io/otel v1.35.0 // indirect
464-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
465-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
461+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
462+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
466463
go.opentelemetry.io/otel/metric v1.35.0 // indirect
467464
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
468465
go.opentelemetry.io/otel/trace v1.35.0 // indirect
469-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
466+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
470467
go.uber.org/automaxprocs v1.6.0 // indirect
471468
go.uber.org/dig v1.18.0 // indirect
472469
go.uber.org/fx v1.23.0 // indirect
473470
go.uber.org/multierr v1.11.0 // indirect
474471
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
475-
golang.org/x/oauth2 v0.27.0 // indirect
476-
golang.org/x/term v0.30.0 // indirect
472+
golang.org/x/oauth2 v0.28.0 // indirect
473+
golang.org/x/term v0.31.0 // indirect
477474
golang.org/x/text v0.24.0 // indirect
478475
golang.org/x/time v0.11.0 // indirect
479476
golang.org/x/tools v0.32.0 // indirect
@@ -510,6 +507,6 @@ require (
510507
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
511508
sigs.k8s.io/randfill v1.0.0 // indirect
512509
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
513-
tags.cncf.io/container-device-interface v0.8.1 // indirect
510+
tags.cncf.io/container-device-interface v1.0.1 // indirect
514511
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
515512
)

0 commit comments

Comments
 (0)