update containerd & runc versions

kubernetes · Feb 1, 2024 · 5128805 · 5128805
1 parent 79813ba
commit 5128805
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
@@ -59,14 +59,14 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 					Version: fi.PtrTo("1.1.5"),
 				}
 			case b.IsKubernetesGTE("1.27.2"):
-				containerd.Version = fi.PtrTo("1.7.7")
+				containerd.Version = fi.PtrTo("1.7.13")
 				containerd.Runc = &kops.Runc{
-					Version: fi.PtrTo("1.1.9"),
+					Version: fi.PtrTo("1.1.12"),
 				}
 			default:
-				containerd.Version = fi.PtrTo("1.6.24")
+				containerd.Version = fi.PtrTo("1.6.28")
 				containerd.Runc = &kops.Runc{
-					Version: fi.PtrTo("1.1.9"),
+					Version: fi.PtrTo("1.1.12"),
 				}
 			}
 		}

diff --git a/upup/pkg/fi/cloudup/runc.go b/upup/pkg/fi/cloudup/runc.go
@@ -154,33 +154,39 @@ func findRuncVersionHash(arch architectures.Architecture, version string) (strin
 
 func findAllRuncHashesAmd64() map[string]string {
 	hashes := map[string]string{
-		"1.1.0": "ab1c67fbcbdddbe481e48a55cf0ef9a86b38b166b5079e0010737fd87d7454bb",
-		"1.1.1": "5798c85d2c8b6942247ab8d6830ef362924cd72a8e236e77430c3ab1be15f080",
-		"1.1.2": "e0436dfc5d26ca88f00e84cbdab5801dd9829b1e5ded05dcfc162ce5718c32ce",
-		"1.1.3": "6e8b24be90fffce6b025d254846da9d2ca6d65125f9139b6354bab0272253d01",
-		"1.1.4": "db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce",
-		"1.1.5": "f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb",
-		"1.1.6": "868bee5b8dc2a01df0ca41d0accfad6a3372dc1165ebfb76143d2c6672e86115",
-		"1.1.7": "c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd",
-		"1.1.8": "1d05ed79854efc707841dfc7afbf3b86546fc1d0b3a204435ca921c14af8385b",
-		"1.1.9": "b9bfdd4cb27cddbb6172a442df165a80bfc0538a676fbca1a6a6c8f4c6933b43",
+		"1.1.0":  "ab1c67fbcbdddbe481e48a55cf0ef9a86b38b166b5079e0010737fd87d7454bb",
+		"1.1.1":  "5798c85d2c8b6942247ab8d6830ef362924cd72a8e236e77430c3ab1be15f080",
+		"1.1.2":  "e0436dfc5d26ca88f00e84cbdab5801dd9829b1e5ded05dcfc162ce5718c32ce",
+		"1.1.3":  "6e8b24be90fffce6b025d254846da9d2ca6d65125f9139b6354bab0272253d01",
+		"1.1.4":  "db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce",
+		"1.1.5":  "f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb",
+		"1.1.6":  "868bee5b8dc2a01df0ca41d0accfad6a3372dc1165ebfb76143d2c6672e86115",
+		"1.1.7":  "c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd",
+		"1.1.8":  "1d05ed79854efc707841dfc7afbf3b86546fc1d0b3a204435ca921c14af8385b",
+		"1.1.9":  "b9bfdd4cb27cddbb6172a442df165a80bfc0538a676fbca1a6a6c8f4c6933b43",
+		"1.1.10": "81f73a59be3d122ab484d7dfe9ddc81030f595cc59968f61c113a9a38a2c113a",
+		"1.1.11": "77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea",
+		"1.1.12": "aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8",
 	}
 
 	return hashes
 }
 
 func findAllRuncHashesArm64() map[string]string {
 	hashes := map[string]string{
-		"1.1.0": "9ec8e68feabc4e7083a4cfa45ebe4d529467391e0b03ee7de7ddda5770b05e68",
-		"1.1.1": "20c436a736547309371c7ac2a335f5fe5a42b450120e497d09c8dc3902c28444",
-		"1.1.2": "6ebd968d46d00a3886e9a0cae2e0a7b399e110cf5d7b26e63ce23c1d81ea10ef",
-		"1.1.3": "00c9ad161a77a01d9dcbd25b1d76fa9822e57d8e4abf26ba8907c98f6bcfcd0f",
-		"1.1.4": "dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223",
-		"1.1.5": "54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f",
-		"1.1.6": "da5b2ed26a173a69ea66eae7c369feebf59c1031e14985f512a0a293bb5f76fb",
-		"1.1.7": "1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab",
-		"1.1.8": "7c22cb618116d1d5216d79e076349f93a672253d564b19928a099c20e4acd658",
-		"1.1.9": "b43e9f561e85906f469eef5a7b7992fc586f750f44a0e011da4467e7008c33a0",
+		"1.1.0":  "9ec8e68feabc4e7083a4cfa45ebe4d529467391e0b03ee7de7ddda5770b05e68",
+		"1.1.1":  "20c436a736547309371c7ac2a335f5fe5a42b450120e497d09c8dc3902c28444",
+		"1.1.2":  "6ebd968d46d00a3886e9a0cae2e0a7b399e110cf5d7b26e63ce23c1d81ea10ef",
+		"1.1.3":  "00c9ad161a77a01d9dcbd25b1d76fa9822e57d8e4abf26ba8907c98f6bcfcd0f",
+		"1.1.4":  "dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223",
+		"1.1.5":  "54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f",
+		"1.1.6":  "da5b2ed26a173a69ea66eae7c369feebf59c1031e14985f512a0a293bb5f76fb",
+		"1.1.7":  "1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab",
+		"1.1.8":  "7c22cb618116d1d5216d79e076349f93a672253d564b19928a099c20e4acd658",
+		"1.1.9":  "b43e9f561e85906f469eef5a7b7992fc586f750f44a0e011da4467e7008c33a0",
+		"1.1.10": "4830afd426bdeacbdf9cb8729524aa2ed51790b8c4b28786995925593708f1c8",
+		"1.1.11": "9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12",
+		"1.1.12": "879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8",
 	}
 
 	return hashes