From 00a8ca571067043c687798d1129d9af706bf0187 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 5 Dec 2024 10:57:10 +0100 Subject: [PATCH] Bump containerd to v1.7.24 https://github.com/containerd/containerd/releases/tag/v1.7.24 Signed-off-by: Tom Wieczorek (cherry picked from commit 8d59bdb33d55b894534638b31141e734d8042c5f) (cherry picked from commit 6bb570202c7d09a0fec8212e4ab76fbbda57553d) --- docs/airgap-install.md | 2 +- docs/external-runtime-deps.md | 2 +- docs/nllb.md | 8 ++++---- docs/raspberry-pi4.md | 4 ++-- embedded-bins/Makefile.variables | 2 +- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/airgap-install.md b/docs/airgap-install.md index cd761f884584..7896f3743080 100644 --- a/docs/airgap-install.md +++ b/docs/airgap-install.md @@ -15,7 +15,7 @@ In order to create your own image bundle, you need: the [containerd Getting Started Guide] for more information. [Quick Start Guide]: install.md -[containerd Getting Started Guide]: https://github.com/containerd/containerd/blob/v1.7.23/docs/getting-started.md +[containerd Getting Started Guide]: https://github.com/containerd/containerd/blob/v1.7.24/docs/getting-started.md ## 1. Create your own image bundle (optional) diff --git a/docs/external-runtime-deps.md b/docs/external-runtime-deps.md index 5aa8a39e2deb..2c92174b6f70 100644 --- a/docs/external-runtime-deps.md +++ b/docs/external-runtime-deps.md @@ -177,7 +177,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.7.23/pkg/apparmor/apparmor_linux.go#L34-L45 +[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.24/pkg/apparmor/apparmor_linux.go#L34-L45 [AppArmor]: https://wiki.ubuntu.com/AppArmor #### iptables diff --git a/docs/nllb.md b/docs/nllb.md index 33450192e230..a1dcab5ede4e 100644 --- a/docs/nllb.md +++ b/docs/nllb.md @@ -252,8 +252,8 @@ listed, too: ```console $ kubectl get nodes -owide NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME -k0s-worker-0 Ready 2m16s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.23 -k0s-worker-1 Ready 2m15s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.23 +k0s-worker-0 Ready 2m16s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.24 +k0s-worker-1 Ready 2m15s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.24 ``` There is one node-local load balancer pod running for each worker node: @@ -298,8 +298,8 @@ $ sed -i s#https://10\\.81\\.146\\.254:6443#https://10.81.146.184:6443#g k0s-kub $ kubectl get nodes -owide NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME -k0s-worker-0 Ready 3m35s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.23 -k0s-worker-1 Ready 3m34s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.23 +k0s-worker-0 Ready 3m35s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.24 +k0s-worker-1 Ready 3m34s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.24 $ kubectl -n kube-system get pods -owide -l app.kubernetes.io/managed-by=k0s,app.kubernetes.io/component=nllb NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES diff --git a/docs/raspberry-pi4.md b/docs/raspberry-pi4.md index 08bc6e74d389..f777b67bdfc4 100644 --- a/docs/raspberry-pi4.md +++ b/docs/raspberry-pi4.md @@ -293,7 +293,7 @@ When the cluster is up, try to have a look: ```console ubuntu@ubuntu:~$ sudo k0s kc get nodes -owide NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME -ubuntu Ready control-plane 4m41s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.23 +ubuntu Ready control-plane 4m41s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.24 ubuntu@ubuntu:~$ sudo k0s kc get pod -owide -A NAMESPACE NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES kube-system kube-proxy-kkv2l 1/1 Running 0 4m44s 10.152.56.54 ubuntu @@ -502,7 +502,7 @@ Using the above kubeconfig, you can now access and use the cluster: ```console ubuntu@ubuntu:~$ KUBECONFIG=/path/to/kubeconfig kubectl get nodes,deployments,pods -owide -A NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME -node/ubuntu Ready 5m1s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.23 +node/ubuntu Ready 5m1s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.24 NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR kube-system deployment.apps/coredns 1/1 1 1 33m coredns registry.k8s.io/coredns/coredns:v1.7.0 k8s-app=kube-dns diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index f0d97b816a2a..f29f22047cc1 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.7.23 +containerd_version = 1.7.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 1b727ae46f17..311fb3b78217 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cilium/ebpf v0.15.0 github.com/cloudflare/cfssl v1.6.4 github.com/containerd/cgroups/v3 v3.0.3 - github.com/containerd/containerd v1.7.23 + github.com/containerd/containerd v1.7.24 github.com/evanphx/json-patch v5.7.0+incompatible github.com/fsnotify/fsnotify v1.7.0 github.com/go-logr/logr v1.4.1 diff --git a/go.sum b/go.sum index 6821ce8a2b58..c86e19e51e63 100644 --- a/go.sum +++ b/go.sum @@ -106,8 +106,8 @@ github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGD github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ= -github.com/containerd/containerd v1.7.23/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= +github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA= +github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA= github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=