From 3ca74f5cd14e716258801781ba2ea4920fcf68f4 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 7 Jun 2022 09:11:13 +0300 Subject: [PATCH] Update containerd fallback to v1.4.13 --- upup/pkg/fi/cloudup/containerd.go | 2 +- upup/pkg/fi/cloudup/containerd_test.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/upup/pkg/fi/cloudup/containerd.go b/upup/pkg/fi/cloudup/containerd.go index 55b9616c19..6b34a8e497 100644 --- a/upup/pkg/fi/cloudup/containerd.go +++ b/upup/pkg/fi/cloudup/containerd.go @@ -38,7 +38,7 @@ const ( // containerd legacy packages URLs for v1.2.x and v1.3.x containerdLegacyUrlAmd64 = "https://storage.googleapis.com/cri-containerd-release/cri-containerd-%s.linux-amd64.tar.gz" // containerd version that is available for both AMD64 and ARM64, used in case the selected version is not available for ARM64 - containerdFallbackVersion = "1.4.11" + containerdFallbackVersion = "1.4.13" ) func findContainerdAsset(c *kops.Cluster, assetBuilder *assets.AssetBuilder, arch architectures.Architecture) (*url.URL, *hashing.Hash, error) { diff --git a/upup/pkg/fi/cloudup/containerd_test.go b/upup/pkg/fi/cloudup/containerd_test.go index c322b9bc50..6022379427 100644 --- a/upup/pkg/fi/cloudup/containerd_test.go +++ b/upup/pkg/fi/cloudup/containerd_test.go @@ -43,8 +43,8 @@ func TestContainerdVersionUrlHash(t *testing.T) { { arch: architectures.ArchitectureArm64, version: "1.3.4", - url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", - hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7", + url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", + hash: "debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7", err: nil, }, { @@ -57,8 +57,8 @@ func TestContainerdVersionUrlHash(t *testing.T) { { arch: architectures.ArchitectureArm64, version: "1.3.10", - url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", - hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7", + url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", + hash: "debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7", err: nil, }, { @@ -71,8 +71,8 @@ func TestContainerdVersionUrlHash(t *testing.T) { { arch: architectures.ArchitectureArm64, version: "1.4.1", - url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", - hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7", + url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", + hash: "debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7", err: nil, }, { @@ -173,7 +173,7 @@ func TestContainerdVersionUrl(t *testing.T) { { arch: architectures.ArchitectureArm64, version: "1.3.4", - url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", + url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", err: nil, }, { @@ -185,7 +185,7 @@ func TestContainerdVersionUrl(t *testing.T) { { arch: architectures.ArchitectureArm64, version: "1.4.1", - url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", + url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", err: nil, }, { @@ -280,7 +280,7 @@ func TestContainerdVersionHash(t *testing.T) { { arch: architectures.ArchitectureArm64, version: "1.4.1", - hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7", + hash: "debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7", err: nil, }, {