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

Update containerd to v1.4.1

This commit is contained in:
Ciprian Hacman 2020-09-18 10:00:44 +03:00
parent ef30628f95
commit fcc486d250
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodeup/pkg/model/containerd.go
View File

@ -103,13 +103,13 @@ var containerdVersions = []packageVersion{
}, },
}, },
// 1.4.0 - Linux Generic AMD64 // 1.4.1 - Linux Generic AMD64
{ {
PackageVersion: "1.4.0", PackageVersion: "1.4.1",
PlainBinary: true, PlainBinary: true,
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64}, Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://github.com/containerd/containerd/releases/download/v1.4.0/cri-containerd-cni-1.4.0-linux-amd64.tar.gz", Source: "https://github.com/containerd/containerd/releases/download/v1.4.1/cri-containerd-cni-1.4.1-linux-amd64.tar.gz",
Hash: "b379f29417efd583f77e095173d4d0bd6bb001f0081b2a63d152ee7aef653ce1", Hash: "757efb93a4f3161efc447a943317503d8a7ded5cb4cc0cba3f3318d7ce1542ed",
MapFiles: map[string]string{ MapFiles: map[string]string{
"usr/local/bin": "/usr", "usr/local/bin": "/usr",
"usr/local/sbin": "/usr", "usr/local/sbin": "/usr",

2
pkg/model/components/containerd.go
View File

@ -51,7 +51,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
// Set containerd based on Kubernetes version // Set containerd based on Kubernetes version
if fi.StringValue(containerd.Version) == "" { if fi.StringValue(containerd.Version) == "" {
if b.IsKubernetesGTE("1.19") { if b.IsKubernetesGTE("1.19") {
containerd.Version = fi.String("1.4.0") containerd.Version = fi.String("1.4.1")
} else if b.IsKubernetesGTE("1.18") { } else if b.IsKubernetesGTE("1.18") {
containerd.Version = fi.String("1.3.4") containerd.Version = fi.String("1.3.4")
} else { } else {