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

Merge pull request #8941 from hakman/containerd-1.3.4 

Add support for containerd v1.3.4
This commit is contained in:
Kubernetes Prow Robot 2020-04-20 06:17:39 -07:00 committed by GitHub
parent 8ba02d9c7e 3de48dad8b
commit df264a2319
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,15 @@ var containerdVersions = []packageVersion{
Hash: "921b74e84da366ec3eaa72ff97fa8d6ae56834c6", Hash: "921b74e84da366ec3eaa72ff97fa8d6ae56834c6",
}, },
// 1.3.4 - Linux Generic
{
PackageVersion: "1.3.4",
PlainBinary: true,
Architectures: []Architecture{ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.3.4.linux-amd64.tar.gz",
Hash: "ce518d8091ffdd40caa7f386c742d9b1d03e01b5",
},
// TIP: When adding the next version, copy the previous version, string replace the version and run: // TIP: When adding the next version, copy the previous version, string replace the version and run:
// VERIFY_HASHES=1 go test -v ./nodeup/pkg/model -run TestContainerdPackageHashes // VERIFY_HASHES=1 go test -v ./nodeup/pkg/model -run TestContainerdPackageHashes
// (you might want to temporarily comment out older versions on a slower connection and then validate) // (you might want to temporarily comment out older versions on a slower connection and then validate)

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

@ -53,8 +53,8 @@ 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.17") { if b.IsKubernetesGTE("1.18") {
containerd.Version = fi.String("1.3.3") containerd.Version = fi.String("1.3.4")
} else if b.IsKubernetesGTE("1.11") { } else if b.IsKubernetesGTE("1.11") {
return fmt.Errorf("containerd version is required") return fmt.Errorf("containerd version is required")
} }