Skip to content

Commit 8c85b8f

Browse files
twz123twz123
authored
Merge pull request #4306 from twz123/bump-containerd
Bump containerd to v1.7.15
2 parents 319b59f + d1aa6c4 commit 8c85b8f

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

‎docs/airgap-install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In order to create your own image bundle, you need:
1515
the [containerd Getting Started Guide] for more information.
1616

1717
[Quick Start Guide]: install.md
18-
[containerd Getting Started Guide]: https://github.com/containerd/containerd/blob/v1.7.14/docs/getting-started.md
18+
[containerd Getting Started Guide]: https://github.com/containerd/containerd/blob/v1.7.15/docs/getting-started.md
1919

2020
## 1. Create your own image bundle (optional)
2121

‎docs/external-runtime-deps.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ In order to use containerd in conjunction with [AppArmor], it must be enabled in
177177
the kernel and the `/sbin/apparmor_parser` executable must be installed on the
178178
host, otherwise containerd will [disable][cd-aa] AppArmor support.
179179

180-
[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.14/pkg/apparmor/apparmor_linux.go#L34-L45
180+
[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.15/pkg/apparmor/apparmor_linux.go#L34-L45
181181
[AppArmor]: https://wiki.ubuntu.com/AppArmor
182182

183183
#### iptables

‎docs/nllb.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ listed, too:
252252
```console
253253
$ kubectl get nodes -owide
254254
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
255-
k0s-worker-0 Ready <none> 2m16s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.14
256-
k0s-worker-1 Ready <none> 2m15s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.14
255+
k0s-worker-0 Ready <none> 2m16s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.15
256+
k0s-worker-1 Ready <none> 2m15s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.15
257257
```
258258

259259
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
298298
299299
$ kubectl get nodes -owide
300300
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
301-
k0s-worker-0 Ready <none> 3m35s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.14
302-
k0s-worker-1 Ready <none> 3m34s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.14
301+
k0s-worker-0 Ready <none> 3m35s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.15
302+
k0s-worker-1 Ready <none> 3m34s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 <none> Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.15
303303
304304
$ kubectl -n kube-system get pods -owide -l app.kubernetes.io/managed-by=k0s,app.kubernetes.io/component=nllb
305305
NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES

‎docs/raspberry-pi4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ When the cluster is up, try to have a look:
293293
```console
294294
ubuntu@ubuntu:~$ sudo k0s kc get nodes -owide
295295
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
296-
ubuntu Ready control-plane 4m41s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 <none> Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.14
296+
ubuntu Ready control-plane 4m41s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 <none> Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.15
297297
ubuntu@ubuntu:~$ sudo k0s kc get pod -owide -A
298298
NAMESPACE NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
299299
kube-system kube-proxy-kkv2l 1/1 Running 0 4m44s 10.152.56.54 ubuntu <none> <none>
@@ -502,7 +502,7 @@ Using the above kubeconfig, you can now access and use the cluster:
502502
```console
503503
ubuntu@ubuntu:~$ KUBECONFIG=/path/to/kubeconfig kubectl get nodes,deployments,pods -owide -A
504504
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
505-
node/ubuntu Ready <none> 5m1s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 <none> Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.14
505+
node/ubuntu Ready <none> 5m1s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 <none> Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.15
506506
507507
NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR
508508
kube-system deployment.apps/coredns 1/1 1 1 33m coredns registry.k8s.io/coredns/coredns:v1.7.0 k8s-app=kube-dns

‎embedded-bins/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runc_build_go_tags = "seccomp"
1212
#runc_build_go_ldflags =
1313
runc_build_go_ldflags_extra = "-w -s -extldflags=-static"
1414

15-
containerd_version = 1.7.14
15+
containerd_version = 1.7.15
1616
containerd_buildimage = $(golang_buildimage)
1717
containerd_build_go_tags = "apparmor,selinux"
1818
containerd_build_shim_go_cgo_enabled = 0

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/cilium/ebpf v0.14.0
1818
github.com/cloudflare/cfssl v1.6.4
1919
github.com/containerd/cgroups/v3 v3.0.3
20-
github.com/containerd/containerd v1.7.14
20+
github.com/containerd/containerd v1.7.15
2121
github.com/evanphx/json-patch v5.7.0+incompatible
2222
github.com/fsnotify/fsnotify v1.7.0
2323
github.com/go-logr/logr v1.4.1

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGD
106106
github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
107107
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
108108
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
109-
github.com/containerd/containerd v1.7.14 h1:H/XLzbnGuenZEGK+v0RkwTdv2u1QFAruMe5N0GNPJwA=
110-
github.com/containerd/containerd v1.7.14/go.mod h1:YMC9Qt5yzNqXx/fO4j/5yYVIHXSRrlB3H7sxkUTvspg=
109+
github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes=
110+
github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY=
111111
github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
112112
github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
113113
github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY=

0 commit comments

Comments
 (0)