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

Update runc to v1.1.7

This commit is contained in:
Ciprian Hacman 2023-05-06 17:48:55 +03:00
parent f6c8a3a0d9
commit a11c7189d0
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,13 +46,25 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
if clusterSpec.ContainerRuntime == "containerd" { if clusterSpec.ContainerRuntime == "containerd" {
// 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") { switch {
containerd.Version = fi.PtrTo("1.6.21") case b.IsKubernetesLT("1.23"):
containerd.Version = fi.PtrTo("1.4.13")
case b.IsKubernetesGTE("1.23") && b.IsKubernetesLT("1.24.14"):
fallthrough
case b.IsKubernetesGTE("1.25") && b.IsKubernetesLT("1.25.10"):
fallthrough
case b.IsKubernetesGTE("1.26") && b.IsKubernetesLT("1.26.5"):
fallthrough
case b.IsKubernetesGTE("1.27") && b.IsKubernetesLT("1.27.2"):
containerd.Version = fi.PtrTo("1.6.20")
containerd.Runc = &kops.Runc{ containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.5"), Version: fi.PtrTo("1.1.5"),
} }
} else { default:
containerd.Version = fi.PtrTo("1.4.13") containerd.Version = fi.PtrTo("1.6.21")
containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.7"),
}
} }
} }
// Set default log level to INFO // Set default log level to INFO