Skip to content

Commit d7dcf0d

Browse files
brandondbrandond
committed
Bump containerd/cri-dockerd/spegel/runc
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent c2efae3 commit d7dcf0d

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.24.2
44

55
replace (
66
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.12.9
7-
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.15-k3s1.33.0 // v1.32.0-k3s1
7+
github.com/Mirantis/cri-dockerd => github.com/brandond/cri-dockerd v0.3.17-bd1
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.2.1
1010
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.4-k3s4
11+
github.com/containerd/containerd/v2 => github.com/brandond/containerd/v2 v2.0.5-bd1
1212
github.com/containerd/imgcrypt => github.com/containerd/imgcrypt v1.1.11
1313
github.com/distribution/reference => github.com/distribution/reference v0.5.0
1414
github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible
15-
github.com/docker/docker => github.com/docker/docker v25.0.6+incompatible
15+
github.com/docker/docker => github.com/docker/docker v25.0.8+incompatible
1616
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.11.0
1717
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
1818
github.com/google/cadvisor => github.com/k3s-io/cadvisor v0.52.1
@@ -21,7 +21,7 @@ replace (
2121
github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.11.1
2222
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.22.0
2323
github.com/prometheus/common => github.com/prometheus/common v0.62.0
24-
github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.1.1-k3s1
24+
github.com/spegel-org/spegel => github.com/brandond/spegel v0.2.0-bd1
2525
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.21-k3s1
2626
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.21-k3s1
2727
go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.21-k3s1
@@ -82,7 +82,7 @@ require (
8282
github.com/cloudnativelabs/kube-router/v2 v2.0.0-00010101000000-000000000000
8383
github.com/containerd/cgroups/v3 v3.0.5
8484
github.com/containerd/containerd/api v1.8.0
85-
github.com/containerd/containerd/v2 v2.0.4
85+
github.com/containerd/containerd/v2 v2.0.5
8686
github.com/containerd/errdefs v1.0.0
8787
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.0
8888
github.com/containerd/stargz-snapshotter v0.16.3
@@ -119,7 +119,7 @@ require (
119119
github.com/natefinch/lumberjack v2.0.0+incompatible
120120
github.com/onsi/ginkgo/v2 v2.22.2
121121
github.com/onsi/gomega v1.36.2
122-
github.com/opencontainers/runc v1.2.5
122+
github.com/opencontainers/runc v1.2.6
123123
github.com/opencontainers/selinux v1.11.1
124124
github.com/otiai10/copy v1.7.0
125125
github.com/pkg/errors v0.9.1
@@ -152,7 +152,7 @@ require (
152152
golang.org/x/net v0.39.0
153153
golang.org/x/sync v0.13.0
154154
golang.org/x/sys v0.32.0
155-
google.golang.org/grpc v1.71.1
155+
google.golang.org/grpc v1.72.0
156156
gopkg.in/yaml.v2 v2.4.0
157157
k8s.io/api v0.33.0
158158
k8s.io/apimachinery v0.33.0
@@ -263,7 +263,7 @@ require (
263263
github.com/ghodss/yaml v1.0.0 // indirect
264264
github.com/go-errors/errors v1.4.2 // indirect
265265
github.com/go-ini/ini v1.67.0 // indirect
266-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
266+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
267267
github.com/go-openapi/jsonpointer v0.21.1 // indirect
268268
github.com/go-openapi/jsonreference v0.21.0 // indirect
269269
github.com/go-openapi/swag v0.23.1 // indirect
@@ -509,5 +509,5 @@ require (
509509
sigs.k8s.io/randfill v1.0.0 // indirect
510510
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
511511
tags.cncf.io/container-device-interface v0.8.1 // indirect
512-
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
512+
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
513513
)

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,12 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y
290290
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
291291
github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
292292
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
293+
github.com/brandond/containerd/v2 v2.0.5-bd1 h1:rHNy+oda9wUlEv4I72U5QA9mmyCgHjsxhNpdmp2n7vc=
294+
github.com/brandond/containerd/v2 v2.0.5-bd1/go.mod h1:8dzNB8eVPdY7/UNM3xZ9FIFjqvNHd092sCMqi6xg2Ck=
295+
github.com/brandond/cri-dockerd v0.3.17-bd1 h1:fZMPE0KH08Hf765pvfG01TneTomP6j/ANwg3Uu7oviU=
296+
github.com/brandond/cri-dockerd v0.3.17-bd1/go.mod h1:4yt/MGrotvdjND8/THCHWLMujHh7TrCHJ77MxlmyFpE=
297+
github.com/brandond/spegel v0.2.0-bd1 h1:cvP8Uuxy3KAvVzO9l6SJrnuTOnnNodUbLvG1EvaURyI=
298+
github.com/brandond/spegel v0.2.0-bd1/go.mod h1:/pCa6euBfCKjtKLIjhSKvF+fRkK0+xF2ybO99zkwUhA=
293299
github.com/bronze1man/goStrongswanVici v0.0.0-20231128135937-211cef3b0b20 h1:JMoL5xJSYxo1QVJ3c+4FutWQnks3gZX9DYkgAnvg+5g=
294300
github.com/bronze1man/goStrongswanVici v0.0.0-20231128135937-211cef3b0b20/go.mod h1:fWUtBEPt2yjrr3WFhOqvajM8JSEU8bEeBcoeSCsKRpc=
295301
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
@@ -418,8 +424,8 @@ github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPD
418424
github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
419425
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
420426
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
421-
github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg=
422-
github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
427+
github.com/docker/docker v25.0.8+incompatible h1:FSKbeS2aCyKqNymmbPnq6qM8EQkxOpLK7gth1cpy4g4=
428+
github.com/docker/docker v25.0.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
423429
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
424430
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
425431
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -498,8 +504,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
498504
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
499505
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
500506
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
501-
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
502-
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
507+
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
508+
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
503509
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
504510
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
505511
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
@@ -776,10 +782,6 @@ github.com/k3s-io/api v0.1.0 h1:YxLb/SXPqcZ/rffxrXwK3x4TfuSDxaapADZJDx3BQ50=
776782
github.com/k3s-io/api v0.1.0/go.mod h1:9aQAaTKBFWO+BpGrMFJk9uZaUhZRrL9aahobcOQQm64=
777783
github.com/k3s-io/cadvisor v0.52.1 h1:KeeADD5no2159ICWnTRTJfExlNbVfhqbo9ohixQ74GM=
778784
github.com/k3s-io/cadvisor v0.52.1/go.mod h1:OAhPcx1nOm5YwMh/JhpUOMKyv1YKLRtS9KgzWPndHmA=
779-
github.com/k3s-io/containerd/v2 v2.0.4-k3s4 h1:qMTbSCPsvdIMNweDmMGeYKuRZnqq4NFK/OqUWXzAQaI=
780-
github.com/k3s-io/containerd/v2 v2.0.4-k3s4/go.mod h1:irovZRo4HZEcwcsPE5guf1C1G4sx0bJheJehSYGzefA=
781-
github.com/k3s-io/cri-dockerd v0.3.15-k3s1.33.0 h1:caAmFkw5zOUSZsO/CJuHkPbSNURykvcuQhzouJ5tZwk=
782-
github.com/k3s-io/cri-dockerd v0.3.15-k3s1.33.0/go.mod h1:KM7k/V0xa6ptE4KTWxqk5l7kyQq9LP5TatuVI+xCq1o=
783785
github.com/k3s-io/cri-tools v1.31.0-k3s2 h1:nekOdJe5Hecm+C5eswg688uXTI0enUZOJYadmyU9pYw=
784786
github.com/k3s-io/cri-tools v1.31.0-k3s2/go.mod h1:PvPf/fN5FiNdK1v43jCydRNRw6631qGTSEOhv/OsjYU=
785787
github.com/k3s-io/etcd/api/v3 v3.5.21-k3s1 h1:iXBMuGT7PbQumlc9R5JOFQ+SgmGaH3dF35ZpO7e3XeA=
@@ -860,8 +862,6 @@ github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.33.0-k3s1 h1:6lv8
860862
github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.33.0-k3s1/go.mod h1:1JR4rKymg8B8bCPo618hpSAdrpO6XLh0Acqok/xVwPE=
861863
github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.33.0-k3s1 h1:jeqZldrQK++AxL4WmcLBF5GI7e2FdOGYxXtW5Evamks=
862864
github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.33.0-k3s1/go.mod h1:f+y3xOAIihI4JaYo/QurW4nd5mufzM9raim+oEt2a7c=
863-
github.com/k3s-io/spegel v0.1.1-k3s1 h1:7tWXLpoFKYBZs9qo6LSBBLIimP/wKGv3nOIb9dpxxDk=
864-
github.com/k3s-io/spegel v0.1.1-k3s1/go.mod h1:H3HxWqvJ6cTrip2U62AV8koAFVp60CPOCYG7TQVNDfk=
865865
github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI=
866866
github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
867867
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
@@ -1095,8 +1095,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
10951095
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
10961096
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
10971097
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
1098-
github.com/opencontainers/runc v1.2.5 h1:8KAkq3Wrem8bApgOHyhRI/8IeLXIfmZ6Qaw6DNSLnA4=
1099-
github.com/opencontainers/runc v1.2.5/go.mod h1:dOQeFo29xZKBNeRBI0B19mJtfHv68YgCTh1X+YphA+4=
1098+
github.com/opencontainers/runc v1.2.6 h1:P7Hqg40bsMvQGCS4S7DJYhUZOISMLJOB2iGX5COWiPk=
1099+
github.com/opencontainers/runc v1.2.6/go.mod h1:dOQeFo29xZKBNeRBI0B19mJtfHv68YgCTh1X+YphA+4=
11001100
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
11011101
github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
11021102
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
@@ -1922,5 +1922,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
19221922
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
19231923
tags.cncf.io/container-device-interface v0.8.1 h1:c0jN4Mt6781jD67NdPajmZlD1qrqQyov/Xfoab37lj0=
19241924
tags.cncf.io/container-device-interface v0.8.1/go.mod h1:Apb7N4VdILW0EVdEMRYXIDVRZfNJZ+kmEUss2kRRQ6Y=
1925-
tags.cncf.io/container-device-interface/specs-go v0.8.0 h1:QYGFzGxvYK/ZLMrjhvY0RjpUavIn4KcmRmVP/JjdBTA=
1926-
tags.cncf.io/container-device-interface/specs-go v0.8.0/go.mod h1:BhJIkjjPh4qpys+qm4DAYtUyryaTDg9zris+AczXyws=
1925+
tags.cncf.io/container-device-interface/specs-go v1.0.0 h1:8gLw29hH1ZQP9K1YtAzpvkHCjjyIxHZYzBAvlQ+0vD8=
1926+
tags.cncf.io/container-device-interface/specs-go v1.0.0/go.mod h1:u86hoFWqnh3hWz3esofRFKbI261bUlvUfLKGrDhJkgQ=

‎pkg/spegel/spegel.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (c *Config) Start(ctx context.Context, nodeConfig *config.Node) error {
198198
routerAddr := net.JoinHostPort(c.ExternalAddress, routerPort)
199199

200200
logrus.Infof("Starting distributed registry P2P node at %s", routerAddr)
201-
opts := routing.LibP2POptions(
201+
opts := routing.WithLibP2POptions(
202202
libp2p.Identity(p2pKey),
203203
libp2p.Peerstore(ps),
204204
libp2p.PrivateNetwork(c.PSK),

0 commit comments

Comments
 (0)