diff --git a/docs/external-runtime-deps.md b/docs/external-runtime-deps.md index 18b0e6655d53..ff78a2116349 100644 --- a/docs/external-runtime-deps.md +++ b/docs/external-runtime-deps.md @@ -156,7 +156,7 @@ In order to use containerd in conjunction with [AppArmor], it must be enabled in the kernel and the `/sbin/apparmor_parser` executable must be installed on the host, otherwise containerd will [disable][cd-aa] AppArmor support. -[cd-aa]: https://github.com/containerd/containerd/blob/v1.6.23/pkg/apparmor/apparmor_linux.go#L34-L45 +[cd-aa]: https://github.com/containerd/containerd/blob/v1.6.24/pkg/apparmor/apparmor_linux.go#L34-L45 [AppArmor]: https://wiki.ubuntu.com/AppArmor ### Other dependencies in previous versions of k0s diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index e5575c4a02f8..edb8bb3b7cad 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -12,7 +12,7 @@ runc_build_go_tags = "seccomp" #runc_build_go_ldflags = runc_build_go_ldflags_extra = "-w -s -extldflags=-static" -containerd_version = 1.6.23 +containerd_version = 1.6.24 containerd_buildimage = $(golang_buildimage) containerd_build_go_tags = "apparmor,selinux" containerd_build_shim_go_cgo_enabled = 0 diff --git a/go.mod b/go.mod index 13a9b5b48aa8..94991584fa72 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/bombsimon/logrusr/v2 v2.0.1 github.com/cavaliergopher/grab/v3 v3.0.1 github.com/cloudflare/cfssl v1.6.2 - github.com/containerd/containerd v1.6.23 + github.com/containerd/containerd v1.6.24 github.com/davecgh/go-spew v1.1.1 github.com/denisbrodbeck/machineid v1.0.1 github.com/docker/libnetwork v0.8.0-dev.2.0.20201031180254-535ef365dc1d diff --git a/go.sum b/go.sum index fdd0c13ec271..de251058fcc9 100644 --- a/go.sum +++ b/go.sum @@ -314,8 +314,8 @@ github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09Zvgq github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= -github.com/containerd/containerd v1.6.23 h1:KYJd6UJhKHzwMhiD70iTtSmU+k4565ac22GOTI3AuTA= -github.com/containerd/containerd v1.6.23/go.mod h1:UrQOiyzrLi3n4aezYJbQH6Il+YzTvnHFbEuO3yfDrM4= +github.com/containerd/containerd v1.6.24 h1:HKF4bfN7WoCk+/n/hi3OrTKJlPWxZmeg1uVDRpEPlXA= +github.com/containerd/containerd v1.6.24/go.mod h1:06DkIUikjOcYdqFgOXDwBHO+qR4/qfbMPQ9XxtAGs1c= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=