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

This commit is contained in:
Ciprian Hacman 2023-06-16 11:58:55 +03:00
parent 9ec83273bf
commit 059e7c7f11
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,11 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
containerd.Runc = &kops.Runc{ containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.5"), Version: fi.PtrTo("1.1.5"),
} }
case b.IsKubernetesGTE("1.27.2"):
containerd.Version = fi.PtrTo("1.7.2")
containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.7"),
}
default: default:
containerd.Version = fi.PtrTo("1.6.21") containerd.Version = fi.PtrTo("1.6.21")
containerd.Runc = &kops.Runc{ containerd.Runc = &kops.Runc{

2
tests/integration/update_cluster/minimal-1.27/in-v1alpha2.yaml
View File

@ -34,7 +34,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.27.0 kubernetesVersion: v1.27.2
masterPublicName: api.minimal.example.com masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:

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

@ -237,6 +237,9 @@ func findAllContainerdHashesAmd64() map[string]string {
"1.6.19": "3262454d9b3581f4d4da0948f77dde1be51cfc42347a1548bc9ab6870b055815", "1.6.19": "3262454d9b3581f4d4da0948f77dde1be51cfc42347a1548bc9ab6870b055815",
"1.6.20": "bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2", "1.6.20": "bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2",
"1.6.21": "04dcc1b99368492caee758583e531392683268197e58156888a3cea2941117b6", "1.6.21": "04dcc1b99368492caee758583e531392683268197e58156888a3cea2941117b6",
"1.7.0": "b068b05d58025dc9f2fc336674cac0e377a478930f29b48e068f97c783a423f0",
"1.7.1": "9504771bcb816d3b27fab37a6cf76928ee5e95a31eb41510a7d10ae726e01e85",
"1.7.2": "2755c70152ab40856510b4549c2dd530e15f5355eb7bf82868e813c9380e22a7",
} }
return hashes return hashes
@ -266,6 +269,9 @@ func findAllContainerdHashesArm64() map[string]string {
"1.6.19": "25a0dd6cce4e1058824d6dc277fc01dc45da92539ccb39bb6c8a481c24d2476e", "1.6.19": "25a0dd6cce4e1058824d6dc277fc01dc45da92539ccb39bb6c8a481c24d2476e",
"1.6.20": "c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce", "1.6.20": "c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce",
"1.6.21": "d713d8fbec491705ffe8c33ecc9051a904f6eedc92574928e1d33616f291c583", "1.6.21": "d713d8fbec491705ffe8c33ecc9051a904f6eedc92574928e1d33616f291c583",
"1.7.0": "e7e5be2d9c92e076f1e2e15c9f0a6e0609ddb75f7616999b843cba92d01e4da2",
"1.7.1": "1f828dc063e3c24b0840b284c5635b5a11b1197d564c97f9e873b220bab2b41b",
"1.7.2": "d75a4ca53d9addd0b2c50172d168b12957e18b2d8b802db2658f2767f15889a6",
} }
return hashes return hashes