Skip to content

Commit 4dcfab9

Browse files
ncopancopa
authored
Merge pull request #5673 from ncopa/containerd-1.7.27
Bump containerd to 1.7.27
2 parents 574d6ce + f5e4e0d commit 4dcfab9

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
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.26/docs/getting-started.md
18+
[containerd Getting Started Guide]: https://github.com/containerd/containerd/blob/v1.7.27/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.26/pkg/apparmor/apparmor_linux.go#L34-L45
180+
[cd-aa]: https://github.com/containerd/containerd/blob/v1.7.27/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.26
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.26
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.27
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.27
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.26
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.26
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.27
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.27
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
@@ -295,7 +295,7 @@ When the cluster is up, try to have a look:
295295
```console
296296
ubuntu@ubuntu:~$ sudo k0s kc get nodes -owide
297297
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
298-
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.26
298+
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.27
299299
ubuntu@ubuntu:~$ sudo k0s kc get pod -owide -A
300300
NAMESPACE NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
301301
kube-system kube-proxy-kkv2l 1/1 Running 0 4m44s 10.152.56.54 ubuntu <none> <none>
@@ -504,7 +504,7 @@ Using the above kubeconfig, you can now access and use the cluster:
504504
```console
505505
ubuntu@ubuntu:~$ KUBECONFIG=/path/to/kubeconfig kubectl get nodes,deployments,pods -owide -A
506506
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
507-
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.26
507+
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.27
508508
509509
NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR
510510
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.26
15+
containerd_version = 1.7.27
1616
containerd_buildimage = $(golang_buildimage)
1717
containerd_build_go_tags = "apparmor,selinux"
1818
containerd_build_shim_go_cgo_enabled = 0

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/cilium/ebpf v0.17.3
1616
github.com/cloudflare/cfssl v1.6.4
1717
github.com/containerd/cgroups/v3 v3.0.5
18-
github.com/containerd/containerd v1.7.26
18+
github.com/containerd/containerd v1.7.27
1919
github.com/distribution/reference v0.6.0
2020
github.com/evanphx/json-patch v5.9.0+incompatible
2121
github.com/fsnotify/fsnotify v1.8.0
@@ -172,7 +172,7 @@ require (
172172
github.com/huandu/xstrings v1.5.0 // indirect
173173
github.com/imdario/mergo v0.3.16 // indirect
174174
github.com/inconshreveable/mousetrap v1.1.0 // indirect
175-
github.com/intel/goresctrl v0.3.0 // indirect
175+
github.com/intel/goresctrl v0.5.0 // indirect
176176
github.com/jmoiron/sqlx v1.4.0 // indirect
177177
github.com/jonboulle/clockwork v0.4.0 // indirect
178178
github.com/josharian/intern v1.0.0 // indirect

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJ
9393
github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
9494
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
9595
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
96-
github.com/containerd/containerd v1.7.26 h1:3cs8K2RHlMQaPifLqgRyI4VBkoldNdEw62cb7qQga7k=
97-
github.com/containerd/containerd v1.7.26/go.mod h1:m4JU0E+h0ebbo9yXD7Hyt+sWnc8tChm7MudCjj4jRvQ=
96+
github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=
97+
github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=
9898
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
9999
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
100100
github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII=
@@ -327,8 +327,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
327327
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
328328
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
329329
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
330-
github.com/intel/goresctrl v0.3.0 h1:K2D3GOzihV7xSBedGxONSlaw/un1LZgWsc9IfqipN4c=
331-
github.com/intel/goresctrl v0.3.0/go.mod h1:fdz3mD85cmP9sHD8JUlrNWAxvwM86CrbmVXltEKd7zk=
330+
github.com/intel/goresctrl v0.5.0 h1:kcDhjE3ZF/mNrJuRzLS3LY2Hp6atFaF1XVFBT7SVL2g=
331+
github.com/intel/goresctrl v0.5.0/go.mod h1:mIe63ggylWYr0cU/l8n11FAkesqfvuP3oktIsxvu0T0=
332332
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
333333
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
334334
github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=

0 commit comments

Comments
 (0)