kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set containerd fallback version to v1.4.11

This commit is contained in:
Ciprian Hacman 2021-10-04 21:39:44 +03:00
parent 4c8f887547
commit 9b64766904
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/pkg/fi/cloudup/containerd.go
View File

@ -35,7 +35,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.6"
containerdFallbackVersion = "1.4.11"
)
func findContainerdAsset(c *kops.Cluster, assetBuilder *assets.AssetBuilder, arch architectures.Architecture) (*url.URL, *hashing.Hash, error) {

18
upup/pkg/fi/cloudup/containerd_test.go
View File

@ -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.7.tgz",
hash: "be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525",
url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz",
hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7",
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.7.tgz",
hash: "be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525",
url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz",
hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7",
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.7.tgz",
hash: "be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525",
url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz",
hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7",
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.7.tgz",
url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.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.7.tgz",
url: "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz",
err: nil,
},
{
@ -280,7 +280,7 @@ func TestContainerdVersionHash(t *testing.T) {
{
arch: architectures.ArchitectureArm64,
version: "1.4.1",
hash: "be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525",
hash: "0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7",
err: nil,
},
{