Skip to content

Commit 1973095

Browse files
smirasmira
committed
feat: update containerd to 1.6.3
This includes a fix for image pull slowness from containerd/containerd#6702. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent b51292d commit 1973095

6 files changed

Lines changed: 20 additions & 12 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ NAME = Talos
1414

1515
ARTIFACTS := _out
1616
TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-alpha.0-10-g8c1f801
17-
PKGS ?= v1.1.0-alpha.0-28-g95f4418
17+
PKGS ?= v1.1.0-alpha.0-29-gfe7c46f
1818
EXTRAS ?= v1.1.0-alpha.0-1-gac3b9a4
1919
GO_VERSION ?= 1.18
2020
GOIMPORTS_VERSION ?= v0.1.10

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/beevik/ntp v0.3.0
3636
github.com/cenkalti/backoff/v4 v4.1.3
3737
github.com/containerd/cgroups v1.0.4-0.20220301195952-2e502f6b9e43
38-
github.com/containerd/containerd v1.6.2
38+
github.com/containerd/containerd v1.6.3
3939
github.com/containerd/typeurl v1.0.2
4040
github.com/containernetworking/cni v1.0.1
4141
github.com/containernetworking/plugins v1.1.1
@@ -72,7 +72,7 @@ require (
7272
github.com/mdlayher/genetlink v1.2.0
7373
github.com/mdlayher/netlink v1.6.0
7474
github.com/mdlayher/netx v0.0.0-20220422152302-c711c2f8512f
75-
github.com/opencontainers/image-spec v1.0.2
75+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
7676
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
7777
github.com/packethost/packngo v0.22.0
7878
github.com/pelletier/go-toml v1.9.5
@@ -226,7 +226,7 @@ require (
226226
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
227227
github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
228228
github.com/opencontainers/go-digest v1.0.0 // indirect
229-
github.com/opencontainers/runc v1.1.0 // indirect
229+
github.com/opencontainers/runc v1.1.1 // indirect
230230
github.com/opencontainers/selinux v1.10.0 // indirect
231231
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
232232
github.com/pkg/errors v0.9.1 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09Zvgq
257257
github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
258258
github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
259259
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
260-
github.com/containerd/containerd v1.6.2 h1:pcaPUGbYW8kBw6OgIZwIVIeEhdWVrBzsoCfVJ5BjrLU=
261-
github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s=
260+
github.com/containerd/containerd v1.6.3 h1:JfgUEIAH07xDWk6kqz0P3ArZt+KJ9YeihSC9uyFtSKg=
261+
github.com/containerd/containerd v1.6.3/go.mod h1:gCVGrYRYFm2E8GmuUIbj/NGD7DLZQLzSJQazjVKDOig=
262262
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
263263
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
264264
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -943,16 +943,16 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
943943
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
944944
github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
945945
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
946-
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
947-
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
946+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=
947+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
948948
github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
949949
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
950950
github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
951951
github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
952952
github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
953953
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
954-
github.com/opencontainers/runc v1.1.0 h1:O9+X96OcDjkmmZyfaG996kV7yq8HsoU2h1XRRQcefG8=
955-
github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
954+
github.com/opencontainers/runc v1.1.1 h1:PJ9DSs2sVwE0iVr++pAHE6QkS9tzcVWozlPifdwMgrU=
955+
github.com/opencontainers/runc v1.1.1/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
956956
github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
957957
github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
958958
github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=

‎internal/pkg/containers/image/image.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/containerd/containerd"
1414
"github.com/containerd/containerd/errdefs"
1515
"github.com/containerd/containerd/images"
16+
"github.com/containerd/containerd/pkg/kmutex"
1617
"github.com/talos-systems/go-retry/retry"
1718

1819
containerdrunner "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/containerd"
@@ -48,6 +49,8 @@ func WithSkipIfAlreadyPulled() PullOption {
4849
}
4950
}
5051

52+
var unpackDuplicationSuppressor = kmutex.New()
53+
5154
// Pull is a convenience function that wraps the containerd image pull func with
5255
// retry functionality.
5356
func Pull(ctx context.Context, reg config.Registries, client *containerd.Client, ref string, opt ...PullOption) (img containerd.Image, err error) {
@@ -78,6 +81,11 @@ func Pull(ctx context.Context, reg config.Registries, client *containerd.Client,
7881
containerd.WithPullUnpack,
7982
containerd.WithResolver(resolver),
8083
containerd.WithChildLabelMap(images.ChildGCLabelsFilterLayers),
84+
containerd.WithUnpackOpts(
85+
[]containerd.UnpackOpt{
86+
containerd.WithUnpackDuplicationSuppressor(unpackDuplicationSuppressor),
87+
},
88+
),
8189
); err != nil {
8290
err = fmt.Errorf("failed to pull image %q: %w", ref, err)
8391

‎pkg/machinery/constants/constants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ const (
379379
TrustdUserID = 51
380380

381381
// DefaultContainerdVersion is the default container runtime version.
382-
DefaultContainerdVersion = "1.6.2"
382+
DefaultContainerdVersion = "1.6.3"
383383

384384
// SystemContainerdNamespace is the Containerd namespace for Talos services.
385385
SystemContainerdNamespace = "system"

‎pkg/machinery/gendata/data/pkgs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.1.0-alpha.0-28-g95f4418
1+
v1.1.0-alpha.0-29-gfe7c46f

0 commit comments

Comments
 (0)