diff --git a/docs/external-runtime-deps.md b/docs/external-runtime-deps.md index 67e2dcfb4dc3..f561228fd667 100644 --- a/docs/external-runtime-deps.md +++ b/docs/external-runtime-deps.md @@ -169,7 +169,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.19/pkg/apparmor/apparmor_linux.go#L34-L45 +[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.20/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 52de73af31c5..f25a6a499747 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.19 -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.19 +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.20 +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.20 ``` 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.19 -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.19 +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.20 +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.20 $ 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 112da9a82be5..cab1618816cc 100644 --- a/docs/raspberry-pi4.md +++ b/docs/raspberry-pi4.md @@ -294,7 +294,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.19 +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.20 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 @@ -503,7 +503,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.19 +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.20 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 b6eb4e34803d..d260c1f26814 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.19 +containerd_version = 1.7.20 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 dc614a147704..0d8e4f6f5009 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cilium/ebpf v0.12.3 github.com/cloudflare/cfssl v1.6.4 github.com/containerd/cgroups/v3 v3.0.3 - github.com/containerd/containerd v1.7.19 + github.com/containerd/containerd v1.7.20 github.com/denisbrodbeck/machineid v1.0.1 github.com/evanphx/json-patch v5.7.0+incompatible github.com/fsnotify/fsnotify v1.7.0 @@ -250,14 +250,14 @@ require ( go.etcd.io/etcd/raft/v3 v3.5.15 // indirect go.etcd.io/etcd/server/v3 v3.5.15 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect - go.opentelemetry.io/otel v1.20.0 // indirect + go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect - go.opentelemetry.io/otel/metric v1.20.0 // indirect - go.opentelemetry.io/otel/sdk v1.20.0 // indirect - go.opentelemetry.io/otel/trace v1.20.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/sdk v1.21.0 // indirect + go.opentelemetry.io/otel/trace v1.21.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect golang.org/x/net v0.24.0 // indirect diff --git a/go.sum b/go.sum index 19859ba5b8c7..265e712a1c94 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.19 h1:/xQ4XRJ0tamDkdzrrBAUy/LE5nCcxFKdBm4EcPrSMEE= -github.com/containerd/containerd v1.7.19/go.mod h1:h4FtNYUUMB4Phr6v+xG89RYKj9XccvbNSCKjdufCrkc= +github.com/containerd/containerd v1.7.20 h1:Sl6jQYk3TRavaU83h66QMbI2Nqg9Jm6qzwX57Vsn1SQ= +github.com/containerd/containerd v1.7.20/go.mod h1:52GsS5CwquuqPuLncsXwG0t2CiUce+KsNHJZQJvAgR0= 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= @@ -704,22 +704,22 @@ go.etcd.io/etcd/server/v3 v3.5.15 h1:x35jrWnZgsRwMsFsUJIUdT1bvzIz1B+29HjMfRYVN/E go.etcd.io/etcd/server/v3 v3.5.15/go.mod h1:l9jX9oa/iuArjqz0RNX/TDbc70dLXxRZo/nmPucrpFo= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= -go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= -go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0= -go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= -go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= -go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= -go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= -go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= -go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY=