Skip to content

Commit 06d66f0

Browse files
authored
Merge pull request #6645 from k0sproject/renovate/main-containerd
Bump containerd to v1.7.29
2 parents 2df25c4 + ff98ee8 commit 06d66f0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

docs/external-runtime-deps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ In order to use containerd in conjunction with [AppArmor], it must be enabled in
166166
the kernel and the `/sbin/apparmor_parser` executable must be installed on the
167167
host, otherwise containerd will [disable][cd-aa] AppArmor support.
168168

169-
[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.28/pkg/apparmor/apparmor_linux.go#L34-L45
169+
[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.29/pkg/apparmor/apparmor_linux.go#L34-L45
170170
[AppArmor]: https://wiki.ubuntu.com/AppArmor
171171

172172
#### iptables

embedded-bins/Makefile.variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runc_build_go_tags = "seccomp"
1717
runc_build_go_ldflags_extra = "-w -s -extldflags=-static"
1818

1919
# renovate: datasource=github-releases depName=containerd/containerd
20-
containerd_version = 1.7.28
20+
containerd_version = 1.7.29
2121
containerd_buildimage = $(golang_buildimage)
2222
containerd_build_go_tags = "apparmor,selinux"
2323
containerd_build_shim_go_cgo_enabled = 0

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/cilium/ebpf v0.20.0
1515
github.com/cloudflare/cfssl v1.6.4
1616
github.com/containerd/cgroups/v3 v3.1.0
17-
github.com/containerd/containerd v1.7.28
17+
github.com/containerd/containerd v1.7.29
1818
github.com/containerd/platforms v0.2.1
1919
github.com/distribution/reference v0.6.0
2020
github.com/dustin/go-humanize v1.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9v
8282
github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
8383
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
8484
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
85-
github.com/containerd/containerd v1.7.28 h1:Nsgm1AtcmEh4AHAJ4gGlNSaKgXiNccU270Dnf81FQ3c=
86-
github.com/containerd/containerd v1.7.28/go.mod h1:azUkWcOvHrWvaiUjSQH0fjzuHIwSPg1WL5PshGP4Szs=
85+
github.com/containerd/containerd v1.7.29 h1:90fWABQsaN9mJhGkoVnuzEY+o1XDPbg9BTC9QTAHnuE=
86+
github.com/containerd/containerd v1.7.29/go.mod h1:azUkWcOvHrWvaiUjSQH0fjzuHIwSPg1WL5PshGP4Szs=
8787
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
8888
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
8989
github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII=

0 commit comments

Comments
 (0)