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.6.18

This commit is contained in:
Ciprian Hacman 2023-02-16 04:40:24 +02:00
parent c56a983355
commit 8d6a809d10
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
// Set version based on Kubernetes version // Set version based on Kubernetes version
if fi.ValueOf(containerd.Version) == "" { if fi.ValueOf(containerd.Version) == "" {
if b.IsKubernetesGTE("1.23") { if b.IsKubernetesGTE("1.23") {
containerd.Version = fi.PtrTo("1.6.17") containerd.Version = fi.PtrTo("1.6.18")
containerd.Runc = &kops.Runc{ containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.4"), Version: fi.PtrTo("1.1.4"),
} }

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

@ -233,6 +233,7 @@ func findAllContainerdHashesAmd64() map[string]string {
"1.6.15": "191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02", "1.6.15": "191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02",
"1.6.16": "2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a", "1.6.16": "2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a",
"1.6.17": "5f0584d000769d0cf08fc0e25135614ef5bf52971a6069175c78437699f3b8d4", "1.6.17": "5f0584d000769d0cf08fc0e25135614ef5bf52971a6069175c78437699f3b8d4",
"1.6.18": "c4e516376a2392520a87abea94baf2045cc3a67e9e0c90c75fb6ed038170561e",
} }
return hashes return hashes
@ -258,6 +259,7 @@ func findAllContainerdHashesArm64() map[string]string {
"1.6.15": "d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d", "1.6.15": "d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d",
"1.6.16": "c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082", "1.6.16": "c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082",
"1.6.17": "7e110faa738bff2f5f0ffd54c4ec2c17c05fd2af6de4877c839794ca3dadd61c", "1.6.17": "7e110faa738bff2f5f0ffd54c4ec2c17c05fd2af6de4877c839794ca3dadd61c",
"1.6.18": "56b83a0bc955edc5ebaa3bd0f788e654b63395be00fcb1bd03ff4bdfe4b5e1e7",
} }
return hashes return hashes