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

This commit is contained in:
Ciprian Hacman 2024-01-18 05:27:41 +02:00
parent 8769a84223
commit 9f7c59236b
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,14 +54,14 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
Version: fi.PtrTo("1.1.5"), Version: fi.PtrTo("1.1.5"),
} }
case b.IsKubernetesGTE("1.27.2"): case b.IsKubernetesGTE("1.27.2"):
containerd.Version = fi.PtrTo("1.7.7") containerd.Version = fi.PtrTo("1.7.12")
containerd.Runc = &kops.Runc{ containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.9"), Version: fi.PtrTo("1.1.11"),
} }
default: default:
containerd.Version = fi.PtrTo("1.6.24") containerd.Version = fi.PtrTo("1.6.27")
containerd.Runc = &kops.Runc{ containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.9"), Version: fi.PtrTo("1.1.11"),
} }
} }
} }

4
upup/pkg/fi/cloudup/runc.go
View File

@ -164,6 +164,8 @@ func findAllRuncHashesAmd64() map[string]string {
"1.1.7": "c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd", "1.1.7": "c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd",
"1.1.8": "1d05ed79854efc707841dfc7afbf3b86546fc1d0b3a204435ca921c14af8385b", "1.1.8": "1d05ed79854efc707841dfc7afbf3b86546fc1d0b3a204435ca921c14af8385b",
"1.1.9": "b9bfdd4cb27cddbb6172a442df165a80bfc0538a676fbca1a6a6c8f4c6933b43", "1.1.9": "b9bfdd4cb27cddbb6172a442df165a80bfc0538a676fbca1a6a6c8f4c6933b43",
"1.1.10": "81f73a59be3d122ab484d7dfe9ddc81030f595cc59968f61c113a9a38a2c113a",
"1.1.11": "77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea",
} }
return hashes return hashes
@ -181,6 +183,8 @@ func findAllRuncHashesArm64() map[string]string {
"1.1.7": "1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab", "1.1.7": "1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab",
"1.1.8": "7c22cb618116d1d5216d79e076349f93a672253d564b19928a099c20e4acd658", "1.1.8": "7c22cb618116d1d5216d79e076349f93a672253d564b19928a099c20e4acd658",
"1.1.9": "b43e9f561e85906f469eef5a7b7992fc586f750f44a0e011da4467e7008c33a0", "1.1.9": "b43e9f561e85906f469eef5a7b7992fc586f750f44a0e011da4467e7008c33a0",
"1.1.10": "4830afd426bdeacbdf9cb8729524aa2ed51790b8c4b28786995925593708f1c8",
"1.1.11": "9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12",
} }
return hashes return hashes