Merge pull request #16305 from hakman/runc-fix

cherrypick: update containerd & runc versions

pkg/model/components/containerd.go

@@ -61,14 +61,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.2")
+				containerd.Version = fi.PtrTo("1.7.13")
 				containerd.Runc = &kops.Runc{
-					Version: fi.PtrTo("1.1.7"),
+					Version: fi.PtrTo("1.1.12"),
 				}
 			default:
-				containerd.Version = fi.PtrTo("1.6.21")
+				containerd.Version = fi.PtrTo("1.6.28")
 				containerd.Runc = &kops.Runc{
-					Version: fi.PtrTo("1.1.7"),
+					Version: fi.PtrTo("1.1.12"),
 				}
 			}
 		}

tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data

@@ -251,7 +251,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: uQmaxBDLrA6ekU6l0Yxl2IS3G5+JQJx4fqkC5/ZkqWY=
+NodeupConfigHash: GOnHLGAfCFraP/hasRiVOEQbDBoRvKlj/0rlT2oPBYY=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data

@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: CBB3U1evV35AbX+K4adLwtT+0BlHoohLZphxatrLb1Y=
+NodeupConfigHash: Q2TSVd0Ia0J+Wk4LCHVV6psAWn1LMlZOS8YjLm2ZcmY=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content

@@ -30,8 +30,8 @@ spec:
   containerd:
     logLevel: info
     runc:
-      version: 1.1.7
-    version: 1.7.2
+      version: 1.1.12
+    version: 1.7.13
   dnsZone: Z1AFAKE1ZON3YO
   docker:
     skipInstall: true

tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content

@@ -58,17 +58,17 @@ Assets:
   - 4f38ee903f35b300d3b005a9c6bfb9a46a57f92e89ae602ef9c129b91dc6c5a5@https://dl.k8s.io/release/v1.27.2/bin/linux/amd64/kubectl
   - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
   - f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
-  - 2755c70152ab40856510b4549c2dd530e15f5355eb7bf82868e813c9380e22a7@https://github.com/containerd/containerd/releases/download/v1.7.2/containerd-1.7.2-linux-amd64.tar.gz
-  - c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.amd64
+  - c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
+  - aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
   - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
   - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
   arm64:
   - 810cd9a611e9f084e57c9ee466e33c324b2228d4249ff38c2588a0cc3224f10d@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubelet
   - 1b0966692e398efe71fe59f913eaec44ffd4468cc1acd00bf91c29fa8ff8f578@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubectl
   - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
   - 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
-  - d75a4ca53d9addd0b2c50172d168b12957e18b2d8b802db2658f2767f15889a6@https://github.com/containerd/containerd/releases/download/v1.7.2/containerd-1.7.2-linux-arm64.tar.gz
-  - 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64
+  - 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
+  - 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
   - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
   - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64
 CAs:
@@ -285,8 +285,8 @@ channels:
 containerdConfig:
   logLevel: info
   runc:
-    version: 1.1.7
-  version: 1.7.2
+    version: 1.1.12
+  version: 1.7.13
 docker:
   skipInstall: true
 etcdManifests:

tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content

@@ -4,15 +4,15 @@ Assets:
   - 4f38ee903f35b300d3b005a9c6bfb9a46a57f92e89ae602ef9c129b91dc6c5a5@https://dl.k8s.io/release/v1.27.2/bin/linux/amd64/kubectl
   - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
   - f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
-  - 2755c70152ab40856510b4549c2dd530e15f5355eb7bf82868e813c9380e22a7@https://github.com/containerd/containerd/releases/download/v1.7.2/containerd-1.7.2-linux-amd64.tar.gz
-  - c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.amd64
+  - c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
+  - aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
   arm64:
   - 810cd9a611e9f084e57c9ee466e33c324b2228d4249ff38c2588a0cc3224f10d@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubelet
   - 1b0966692e398efe71fe59f913eaec44ffd4468cc1acd00bf91c29fa8ff8f578@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubectl
   - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
   - 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
-  - d75a4ca53d9addd0b2c50172d168b12957e18b2d8b802db2658f2767f15889a6@https://github.com/containerd/containerd/releases/download/v1.7.2/containerd-1.7.2-linux-arm64.tar.gz
-  - 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64
+  - 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
+  - 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
 ContainerRuntime: containerd
@@ -58,8 +58,8 @@ channels:
 containerdConfig:
   logLevel: info
   runc:
-    version: 1.1.7
-  version: 1.7.2
+    version: 1.1.12
+  version: 1.7.13
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true

upup/pkg/fi/cloudup/containerd.go

@@ -237,9 +237,11 @@ func findAllContainerdHashesAmd64() map[string]string {
 		"1.6.19": "3262454d9b3581f4d4da0948f77dde1be51cfc42347a1548bc9ab6870b055815",
 		"1.6.20": "bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2",
 		"1.6.21": "04dcc1b99368492caee758583e531392683268197e58156888a3cea2941117b6",
+		"1.6.28": "b2f15c722d1cc8b74ed643068e043b92bd031fc23d53488d1e837cf4b2777391",
 		"1.7.0":  "b068b05d58025dc9f2fc336674cac0e377a478930f29b48e068f97c783a423f0",
 		"1.7.1":  "9504771bcb816d3b27fab37a6cf76928ee5e95a31eb41510a7d10ae726e01e85",
 		"1.7.2":  "2755c70152ab40856510b4549c2dd530e15f5355eb7bf82868e813c9380e22a7",
+		"1.7.13": "c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23",
 	}
 
 	return hashes
@@ -269,9 +271,11 @@ func findAllContainerdHashesArm64() map[string]string {
 		"1.6.19": "25a0dd6cce4e1058824d6dc277fc01dc45da92539ccb39bb6c8a481c24d2476e",
 		"1.6.20": "c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce",
 		"1.6.21": "d713d8fbec491705ffe8c33ecc9051a904f6eedc92574928e1d33616f291c583",
+		"1.6.28": "96a231f875ddf9cc7682b881d408ae993f2bd5d0a40402a74ec4fda672047427",
 		"1.7.0":  "e7e5be2d9c92e076f1e2e15c9f0a6e0609ddb75f7616999b843cba92d01e4da2",
 		"1.7.1":  "1f828dc063e3c24b0840b284c5635b5a11b1197d564c97f9e873b220bab2b41b",
 		"1.7.2":  "d75a4ca53d9addd0b2c50172d168b12957e18b2d8b802db2658f2767f15889a6",
+		"1.7.13": "118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d",
 	}
 
 	return hashes

upup/pkg/fi/cloudup/runc.go

@@ -154,29 +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.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.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