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.0-rc.0 

Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
This commit is contained in:
Ciprian Hacman 2022-01-13 07:39:37 +02:00
parent 1db71ca34c
commit 678366b916
2 changed files with 29 additions and 29 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
if fi.StringValue(containerd.Version) == "" {
if b.IsKubernetesGTE("1.23") {
containerd.Version = fi.String("1.6.0-beta.5")
containerd.Version = fi.String("1.6.0-rc.0")
} else {
containerd.Version = fi.String("1.4.12")
}

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

@ -180,33 +180,33 @@ func findContainerdVersionHash(arch architectures.Architecture, version string)
func findAllContainerdHashesAmd64() map[string]string {
hashes := map[string]string{
"1.3.4": "4616971c3ad21c24f2f2320fa1c085577a91032a068dd56a41c7c4b71a458087",
"1.3.9": "96663699e0f888fbf232ae6629a367aa7421f6b95044e7ee5d4d4e02841fac75",
"1.3.10": "69e23e49cdf1232d475a77bf7ecd7145ff4a80295154e190125c4d8a20e241da",
"1.4.0": "b379f29417efd583f77e095173d4d0bd6bb001f0081b2a63d152ee7aef653ce1",
"1.4.1": "757efb93a4f3161efc447a943317503d8a7ded5cb4cc0cba3f3318d7ce1542ed",
"1.4.2": "9d0fd5f4d2bc58b345728432b7daac75fc99c1da91afa4f41e6103f618e74012",
"1.4.3": "2697a342e3477c211ab48313e259fd7e32ad1f5ded19320e6a559f50a82bff3d",
"1.4.4": "96641849cb78a0a119223a427dfdc1ade88412ef791a14193212c8c8e29d447b",
"1.4.5": "f8155278fd256526ca9804219e1ee46f5db11c6ddf455086b04c0887c868822a",
"1.4.6": "6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238",
"1.4.7": "daa14638344fe0772f645e190e4d8eb9549b52743364cb8000521490f9e410b8",
"1.4.8": "96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8",
"1.4.9": "9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb",
"1.4.10": "5b256b372a02fd37c84939c87a6a81cae06058a7881a60d682525c11f6dea7d1",
"1.4.11": "a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc",
"1.4.12": "f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4",
"1.5.0": "aee7b553ab88842fdafe43955757abe746b8e9995b2be55c603f0a236186ff9b",
"1.5.1": "2fd97916b24396c13849cfcd89805170e1ef0265a2f7fce8e74ae044a6a6a169",
"1.5.2": "e7adbb6c6f6e67639460579a8aa991e9ce4de2062ed36d3261e6e4865574d947",
"1.5.3": "32a9bf1b7ab2adbd9d2a16b17bf1aa6e61592938655adfb5114c40d527aa9be7",
"1.5.4": "591e4e087ea2f5007e6c64deb382df58d419b7b6922eab45a1923d843d57615f",
"1.5.5": "45f02cfc65db47cf088c95555906e1dcba7baf5a3fbad3d947dd6b9af476a144",
"1.5.6": "afc51718ebe46cb9b985edac816e63fe86c07e37d28cdd21b2c0302dec6fa7ae",
"1.5.7": "7fce75bab43a39d6f9efb3c370de2da49723f0e1dbaa9732d68fa7f620d720c8",
"1.5.8": "5dbb7f43c0ac1fda79999ff63e648926e3464d7d1034402ee2117e6a93868431",
"1.5.9": "f64c8e3b736b370c963b08c33ac70f030fc311bc48fcfd00461465af2fff3488",
"1.6.0-beta.5": "c1fff27dc9744356feb1dfe1f00e90c0aa8ad640140cf51fbe6c6e54659ef8de",
"1.3.4": "4616971c3ad21c24f2f2320fa1c085577a91032a068dd56a41c7c4b71a458087",
"1.3.9": "96663699e0f888fbf232ae6629a367aa7421f6b95044e7ee5d4d4e02841fac75",
"1.3.10": "69e23e49cdf1232d475a77bf7ecd7145ff4a80295154e190125c4d8a20e241da",
"1.4.0": "b379f29417efd583f77e095173d4d0bd6bb001f0081b2a63d152ee7aef653ce1",
"1.4.1": "757efb93a4f3161efc447a943317503d8a7ded5cb4cc0cba3f3318d7ce1542ed",
"1.4.2": "9d0fd5f4d2bc58b345728432b7daac75fc99c1da91afa4f41e6103f618e74012",
"1.4.3": "2697a342e3477c211ab48313e259fd7e32ad1f5ded19320e6a559f50a82bff3d",
"1.4.4": "96641849cb78a0a119223a427dfdc1ade88412ef791a14193212c8c8e29d447b",
"1.4.5": "f8155278fd256526ca9804219e1ee46f5db11c6ddf455086b04c0887c868822a",
"1.4.6": "6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238",
"1.4.7": "daa14638344fe0772f645e190e4d8eb9549b52743364cb8000521490f9e410b8",
"1.4.8": "96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8",
"1.4.9": "9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb",
"1.4.10": "5b256b372a02fd37c84939c87a6a81cae06058a7881a60d682525c11f6dea7d1",
"1.4.11": "a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc",
"1.4.12": "f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4",
"1.5.0": "aee7b553ab88842fdafe43955757abe746b8e9995b2be55c603f0a236186ff9b",
"1.5.1": "2fd97916b24396c13849cfcd89805170e1ef0265a2f7fce8e74ae044a6a6a169",
"1.5.2": "e7adbb6c6f6e67639460579a8aa991e9ce4de2062ed36d3261e6e4865574d947",
"1.5.3": "32a9bf1b7ab2adbd9d2a16b17bf1aa6e61592938655adfb5114c40d527aa9be7",
"1.5.4": "591e4e087ea2f5007e6c64deb382df58d419b7b6922eab45a1923d843d57615f",
"1.5.5": "45f02cfc65db47cf088c95555906e1dcba7baf5a3fbad3d947dd6b9af476a144",
"1.5.6": "afc51718ebe46cb9b985edac816e63fe86c07e37d28cdd21b2c0302dec6fa7ae",
"1.5.7": "7fce75bab43a39d6f9efb3c370de2da49723f0e1dbaa9732d68fa7f620d720c8",
"1.5.8": "5dbb7f43c0ac1fda79999ff63e648926e3464d7d1034402ee2117e6a93868431",
"1.5.9": "f64c8e3b736b370c963b08c33ac70f030fc311bc48fcfd00461465af2fff3488",
"1.6.0-rc.0": "e201f371f0095f7672f61f9173bb020f2618a3e3890651d8ec6bac2f80910c67",
}
return hashes
@ -214,7 +214,7 @@ func findAllContainerdHashesAmd64() map[string]string {
func findAllContainerdHashesArm64() map[string]string {
hashes := map[string]string{
"1.6.0-beta.5": "ae7ee45c18e413222a38f5b7984a6e2f22ceb7b0a87ea26351341f2f61d4e51a",
"1.6.0-rc.0": "4ed4ce643010e5aee1731a0d654adbb89c07237ee2b795696edc5bdc8cf230ab",
}
return hashes