Merge pull request #16884 from hakman/automated-cherry-pick-of-#16883…

…-upstream-release-1.30 Automated cherry pick of #16883: Update containerd to v1.7.22
kubernetes · Oct 7, 2024 · 4d4f386 · 4d4f386
2 parents 41e7420 + c464bf8
commit 4d4f386
Show file tree

Hide file tree

Showing 50 changed files with 1,306 additions and 2,925 deletions.
diff --git a/hack/generate-asset-hashes.sh b/hack/generate-asset-hashes.sh
@@ -44,9 +44,13 @@ EOF
       --base https://dl.k8s.io/release/ \
       --prefix "v${version}/" \
       --exclude "**/arm/**" \
+      --exclude "**/386/**" \
       --exclude "**/ppc64le/**" \
       --exclude "**/s390x/**" \
       --exclude "**/windows/**" \
+      --exclude "**/*.docker_tag" \
+      --exclude "**/*.spdx" \
+      --exclude "**/*.tar" \
       --exclude "**/*.tar.gz" \
       | sed "s@files:@# kubernetes ${version}@g" >> "${REPO_ROOT}/pkg/assets/assetdata/k8s-${prefix}.yaml"
   done
@@ -73,16 +77,23 @@ EOF
     go run ./pkg/assets/assetdata/tools/cmd/generatefileassets \
       --base https://github.com/opencontainers/runc/releases/download/ \
       --prefix "v${version}/" \
+      --exclude "**/*.armel" \
+      --exclude "**/*.armhf" \
+      --exclude "**/*.ppc64le" \
+      --exclude "**/*.riscv64" \
+      --exclude "**/*.s390x" \
+      --exclude "**/*.tar.xz" \
       --sums "https://github.com/opencontainers/runc/releases/download/v${version}/runc.sha256sum" \
       | sed "s@files:@# runc ${version}@g" >> "${REPO_ROOT}/pkg/assets/assetdata/runc-${prefix}.yaml"
   done
 }
 
 generate_k8s_hashes 1.25 16
 generate_k8s_hashes 1.26 15
-generate_k8s_hashes 1.27 13
-generate_k8s_hashes 1.28 9
-generate_k8s_hashes 1.29 4
-generate_k8s_hashes 1.30 0
+generate_k8s_hashes 1.27 16
+generate_k8s_hashes 1.28 14
+generate_k8s_hashes 1.29 9
+generate_k8s_hashes 1.30 5
+generate_k8s_hashes 1.31 1
 
-generate_runc_hashes 1.1 12
+generate_runc_hashes 1.1 14
diff --git a/pkg/assets/assetdata/k8s-1.25.yaml b/pkg/assets/assetdata/k8s-1.25.yaml
diff --git a/pkg/assets/assetdata/k8s-1.26.yaml b/pkg/assets/assetdata/k8s-1.26.yaml
diff --git a/pkg/assets/assetdata/k8s-1.27.yaml b/pkg/assets/assetdata/k8s-1.27.yaml
diff --git a/pkg/assets/assetdata/k8s-1.28.yaml b/pkg/assets/assetdata/k8s-1.28.yaml
diff --git a/pkg/assets/assetdata/k8s-1.29.yaml b/pkg/assets/assetdata/k8s-1.29.yaml
diff --git a/pkg/assets/assetdata/k8s-1.30.yaml b/pkg/assets/assetdata/k8s-1.30.yaml
diff --git a/pkg/assets/assetdata/k8s-1.31.yaml b/pkg/assets/assetdata/k8s-1.31.yaml
@@ -0,0 +1,120 @@
+# This file is generated by generate-asset-hashes.sh
+
+filestores:
+- base: https://dl.k8s.io/release/
+
+files:
+# kubernetes 1.31.0
+- name: v1.31.0/bin/darwin/amd64/kubectl
+  sha256: fb6e07a69acc4e16885eda55b524c13b84bfbcf78cfac8d6c378d2bad321e105
+- name: v1.31.0/bin/darwin/amd64/kubectl-convert
+  sha256: 75cf4c6ec8a8900c2de57bf91ea6f93117ba7152cbf806c34895a0d81e691d38
+- name: v1.31.0/bin/darwin/arm64/kubectl
+  sha256: b7472df17a885574ed7273947a8a274c156357db21b981208e8e109b9ed4022d
+- name: v1.31.0/bin/darwin/arm64/kubectl-convert
+  sha256: e7c4bdf8414278db01201e2501cf430e2a8a498935bd20e53b48b91a563848c0
+- name: v1.31.0/bin/linux/amd64/apiextensions-apiserver
+  sha256: faa14e37c45429ecd53ad272e2d22f799a145dd22aad1c435c2a803ddfa89d1f
+- name: v1.31.0/bin/linux/amd64/kube-aggregator
+  sha256: d81736b4c75ea75051b3ab43f9b23c0a9af4c220ed55e329e7678c44c1e44da9
+- name: v1.31.0/bin/linux/amd64/kube-apiserver
+  sha256: 9016f6048ff9827ef58934e98f28a8026634c10b4e6fcc1df49451038a23a9aa
+- name: v1.31.0/bin/linux/amd64/kube-controller-manager
+  sha256: 9cf02d0ebf704ffdc727d0ad02e64bc5621f8013c4034b568bf7c939fe150490
+- name: v1.31.0/bin/linux/amd64/kube-log-runner
+  sha256: e90f96ec29bae2f9aec0175e260c41479e9022359d90da263153cc7c1ca14be6
+- name: v1.31.0/bin/linux/amd64/kube-proxy
+  sha256: b4b4ecbfeb9f8897b672ff8fa53f3288580b361340d7b2daa40b476e2f2967ca
+- name: v1.31.0/bin/linux/amd64/kube-scheduler
+  sha256: 1e519991d41389bb885df59c19389afe847dad511992d009ff766bc7f3992f89
+- name: v1.31.0/bin/linux/amd64/kubeadm
+  sha256: cf3b1a44b11ab226e40610e63d99fae7588a82940bb77da471a6dec624c819c2
+- name: v1.31.0/bin/linux/amd64/kubectl
+  sha256: 7c27adc64a84d1c0cc3dcf7bf4b6e916cc00f3f576a2dbac51b318d926032437
+- name: v1.31.0/bin/linux/amd64/kubectl-convert
+  sha256: f1c32cb59d06794878e8d522bde36e1a05a5a7713567ae048c02b8fc36d2d633
+- name: v1.31.0/bin/linux/amd64/kubelet
+  sha256: 39e7f1c61c8389ea7680690f8bd5dd733672fa16875ae598df0fd8c205df57a9
+- name: v1.31.0/bin/linux/amd64/mounter
+  sha256: 5fb539264673bf06c8d6b83ec5959bfd56ef6a5b5f53bffa63d3e74ddd1abd95
+- name: v1.31.0/bin/linux/arm64/apiextensions-apiserver
+  sha256: 98255653bffab5031b924c861f8ed6edb98919530d37f7472279afd46b28bf5f
+- name: v1.31.0/bin/linux/arm64/kube-aggregator
+  sha256: 28a8f8883b6e3ef32ab682a82adb2e5bb4a163a0821f30104e7c808519321828
+- name: v1.31.0/bin/linux/arm64/kube-apiserver
+  sha256: e97fd3b9651b79fbe6e3afbf4de0ec35a8ca6db6a40291400ae99a8c6efd64b8
+- name: v1.31.0/bin/linux/arm64/kube-controller-manager
+  sha256: f2ea65ee23db0d7d182e7a4b598928516c80f3b93b2d62a4e48b43f2506aba0d
+- name: v1.31.0/bin/linux/arm64/kube-log-runner
+  sha256: a0453e90068fc625db1a751c3a5c42380f34d4123073b7130029210030f723e3
+- name: v1.31.0/bin/linux/arm64/kube-proxy
+  sha256: ccc464cc7042c45b14e142f95e264fa4240e7165da1897d1c7bc0c88626cc4b5
+- name: v1.31.0/bin/linux/arm64/kube-scheduler
+  sha256: 802c9b74d53524265966c28044d5db30930f84fe4a92ca9d0c5d95b4b1604ead
+- name: v1.31.0/bin/linux/arm64/kubeadm
+  sha256: dbeb84862d844d58f67ad6be64021681a314cda162a04e6047f376f2a9ad0226
+- name: v1.31.0/bin/linux/arm64/kubectl
+  sha256: f42832db7d77897514639c6df38214a6d8ae1262ee34943364ec1ffaee6c009c
+- name: v1.31.0/bin/linux/arm64/kubectl-convert
+  sha256: 819015b12fc8d92404e0feec75ef1850624e43fbdacaf9634d7bcc7d35e681a7
+- name: v1.31.0/bin/linux/arm64/kubelet
+  sha256: b310da449a9d2f8b928cab5ca12a6772617ba421023894e061ca2647e6d9f1c3
+- name: v1.31.0/bin/linux/arm64/mounter
+  sha256: 0dc6bf4ab40b7d76921b0a1c96377792dea31ce1a7588cbdccd924a1f23ddabe
+# kubernetes 1.31.1
+- name: v1.31.1/bin/darwin/amd64/kubectl
+  sha256: 4b86d3fb8dee8dd61f341572f1ba13c1030d493f4dc1b4831476f61f3cbb77d0
+- name: v1.31.1/bin/darwin/amd64/kubectl-convert
+  sha256: a28aa82dacfcd07db713b2a3d5dc3aa740912848f5aad87b473e123638a88bb2
+- name: v1.31.1/bin/darwin/arm64/kubectl
+  sha256: 08909b92e62004f4f1222dfd39214085383ea368bdd15c762939469c23484634
+- name: v1.31.1/bin/darwin/arm64/kubectl-convert
+  sha256: 529121f9115bce816b79cced8deb494776a362535680219ec8a0ee016ff50bc5
+- name: v1.31.1/bin/linux/amd64/apiextensions-apiserver
+  sha256: bd2ce467d709214790f1ff452d8bfc4be763b5100f8cb2c332a1edbe0248e182
+- name: v1.31.1/bin/linux/amd64/kube-aggregator
+  sha256: 4878f7eac17ae1544e64de6fdfff7ec5de46cadabda076e8ff8c5c8b44d2f569
+- name: v1.31.1/bin/linux/amd64/kube-apiserver
+  sha256: ed0ee827b14c0becd4230d7fa9150de6051e43b041a148daf708bc8854ec67ea
+- name: v1.31.1/bin/linux/amd64/kube-controller-manager
+  sha256: 72f33e242dc1213a1d296d82ee73ea674a130856ccba48c9cf349196ae7f9adc
+- name: v1.31.1/bin/linux/amd64/kube-log-runner
+  sha256: 235940719d9dac969afe9c001a39c19ec08180d813067c3a741bf5860f35adbc
+- name: v1.31.1/bin/linux/amd64/kube-proxy
+  sha256: 05993d3e7d33de664ab0c90a76774a46e4eb8b201ddd8cbcce773d869dacf30d
+- name: v1.31.1/bin/linux/amd64/kube-scheduler
+  sha256: a19a8eee7c6b462a1e7151ca10664be2c74a338eb3734de36b4e9b06ea126067
+- name: v1.31.1/bin/linux/amd64/kubeadm
+  sha256: b3f92d19d482359116dd9ee9c0a10cb86e32a2a2aef79b853d5f07d6a093b0df
+- name: v1.31.1/bin/linux/amd64/kubectl
+  sha256: 57b514a7facce4ee62c93b8dc21fda8cf62ef3fed22e44ffc9d167eab843b2ae
+- name: v1.31.1/bin/linux/amd64/kubectl-convert
+  sha256: 1eaf28942afc339c0326ebd54975bfc9bb2192db49157d39e275e9f18c171db3
+- name: v1.31.1/bin/linux/amd64/kubelet
+  sha256: 50619fff95bdd7e690c049cc083f495ae0e7c66d0cdf6a8bcad298af5fe28438
+- name: v1.31.1/bin/linux/amd64/mounter
+  sha256: cd76b36cd09b19514a34d7a768dd786d533f94bffae95a425c10a39af94c4194
+- name: v1.31.1/bin/linux/arm64/apiextensions-apiserver
+  sha256: a01405d93f8cff2c6272c92af8b58f795f8102199f88cce057d94ef521f4412b
+- name: v1.31.1/bin/linux/arm64/kube-aggregator
+  sha256: a8e7e36b3fc74281fffed3bf9e097c9e18535190db64f1ccfca41db1fbabb440
+- name: v1.31.1/bin/linux/arm64/kube-apiserver
+  sha256: 0aa158507172dd5ab9a2db64c699619cc5e2e015756c7a8be5df08af5ed15a2a
+- name: v1.31.1/bin/linux/arm64/kube-controller-manager
+  sha256: 8c4fcb6bad1fc6183efa27f2e8006204c1b8b5e7d6195f55b99babd5d8a34245
+- name: v1.31.1/bin/linux/arm64/kube-log-runner
+  sha256: 96117a45f09ba4645af1b682872df458e6346fea373d8508f992136d7fd22b8e
+- name: v1.31.1/bin/linux/arm64/kube-proxy
+  sha256: cf25699c8e6dc6c61ebc1dff2e6c611d9bf1b7f2de8f4f5bf127bd16580b02fd
+- name: v1.31.1/bin/linux/arm64/kube-scheduler
+  sha256: 32987ee4655beeae0b29e0acc43c01971dcfa63ae76da63daa94e95ec7c76f4a
+- name: v1.31.1/bin/linux/arm64/kubeadm
+  sha256: 66195cd53cda3c73c9ae5e49a1352c710c0ea9ce244bbdeb68b917d809f0ea78
+- name: v1.31.1/bin/linux/arm64/kubectl
+  sha256: 3af2451191e27ecd4ac46bb7f945f76b71e934d54604ca3ffc7fe6f5dd123edb
+- name: v1.31.1/bin/linux/arm64/kubectl-convert
+  sha256: 5277edc05bbf7c57f66e6e9a425027c3432adc8421f09d9dfedc7c5fea0e4b2f
+- name: v1.31.1/bin/linux/arm64/kubelet
+  sha256: fbd98311e96b9dcdd73d1688760d410cc70aefce26272ff2f20eef51a7c0d1da
+- name: v1.31.1/bin/linux/arm64/mounter
+  sha256: 5f8429b6b93ef263558bfe4849b8120f788316fa35bbcf59e080668a71196bf7
diff --git a/pkg/assets/assetdata/runc-1.1.yaml b/pkg/assets/assetdata/runc-1.1.yaml
@@ -9,203 +9,75 @@ files:
   sha256: ab1c67fbcbdddbe481e48a55cf0ef9a86b38b166b5079e0010737fd87d7454bb
 - name: v1.1.0/runc.arm64
   sha256: 9ec8e68feabc4e7083a4cfa45ebe4d529467391e0b03ee7de7ddda5770b05e68
-- name: v1.1.0/runc.armel
-  sha256: 1f04c4352a227593fed7b66167b7fc0e706ae19c9de593acee9bfcd8e84b7bff
-- name: v1.1.0/runc.armhf
-  sha256: f796d4d6b66c28fde4c980731bec098034a865f710823b8a492de5440355f008
-- name: v1.1.0/runc.ppc64le
-  sha256: 4a6b2f43c0f2371b1948b2eceb906fd8b9d8f5e9f6bab7d21bc037f5b300f43e
-- name: v1.1.0/runc.s390x
-  sha256: 01ebd086d6d32ccf364e3906310001bbdd437b91959bd7fc3c815429ee4aabda
-- name: v1.1.0/runc.tar.xz
-  sha256: 152e8975793aa45a6717e367bd1652f8147728d25adad339d2f70c4fd2ddc623
 # runc 1.1.1
 - name: v1.1.1/runc.amd64
   sha256: 5798c85d2c8b6942247ab8d6830ef362924cd72a8e236e77430c3ab1be15f080
 - name: v1.1.1/runc.arm64
   sha256: 20c436a736547309371c7ac2a335f5fe5a42b450120e497d09c8dc3902c28444
-- name: v1.1.1/runc.armel
-  sha256: 39269649aeef49853490f4fbe035d810242064e68dcec6c0abe1cd648255c50e
-- name: v1.1.1/runc.armhf
-  sha256: a04302f1b738068f24d073eb33740cf0a1fb3bf001b4607d719cd5839f87e42a
-- name: v1.1.1/runc.ppc64le
-  sha256: 5f14bca6e35177134251dfd3c44bccb81136d9043508e7a37494ad9485f5f0e4
-- name: v1.1.1/runc.s390x
-  sha256: 8e6f1114d2d46df380f9e61b390a9417ba77ca01dad11f1d806f4d60439e18d4
-- name: v1.1.1/runc.tar.xz
-  sha256: 75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b
 # runc 1.1.2
 - name: v1.1.2/runc.amd64
   sha256: e0436dfc5d26ca88f00e84cbdab5801dd9829b1e5ded05dcfc162ce5718c32ce
 - name: v1.1.2/runc.arm64
   sha256: 6ebd968d46d00a3886e9a0cae2e0a7b399e110cf5d7b26e63ce23c1d81ea10ef
-- name: v1.1.2/runc.armel
-  sha256: a55e2123487cdcdd14056fa8f1e0dab9d90ef2bfe032dac0955e492fc597fdae
-- name: v1.1.2/runc.armhf
-  sha256: dd3b778f3d70ab0e81c934a27d18d188d09911b22f1d90c400d753e18bacf6e5
-- name: v1.1.2/runc.ppc64le
-  sha256: 545ac8165646ed2b157fae677dd6509baf10e370ebe67c23b2f800163fa97150
-- name: v1.1.2/runc.s390x
-  sha256: 486fe49ccf97cfc4e0592f6cfdd81cbf3220bcfeb7280cdd90c5eabea37e237c
-- name: v1.1.2/runc.tar.xz
-  sha256: 78ad532465ce4c2802480644a8756c30ae99c1bf779f0243af4bca11c4d041de
 # runc 1.1.3
 - name: v1.1.3/runc.amd64
   sha256: 6e8b24be90fffce6b025d254846da9d2ca6d65125f9139b6354bab0272253d01
 - name: v1.1.3/runc.arm64
   sha256: 00c9ad161a77a01d9dcbd25b1d76fa9822e57d8e4abf26ba8907c98f6bcfcd0f
-- name: v1.1.3/runc.armel
-  sha256: 7e57d8a4c6ec4c18bb12eab3ae8a883c1537b55ad67484eaee01798febc89afc
-- name: v1.1.3/runc.armhf
-  sha256: abc4cc34b8ff0aec40adecc14895743b26127d9bcfce8616f159bb0ea3ca2b84
-- name: v1.1.3/runc.ppc64le
-  sha256: 3b1b7f953fc8402dec53dcf2de05b6b72d86850737efa9766f8ffefc7cae3c0a
-- name: v1.1.3/runc.s390x
-  sha256: 4833c8c037688e1534b6b57737fd5f918bbda42e2e44991b1963ad7169ac6db1
-- name: v1.1.3/runc.tar.xz
-  sha256: 2db1f3a01ffd2f8fa3a259b9b512ca7d4dbf89be5765cc58d306e45658668453
 # runc 1.1.4
 - name: v1.1.4/runc.amd64
   sha256: db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce
 - name: v1.1.4/runc.arm64
   sha256: dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223
-- name: v1.1.4/runc.armel
-  sha256: e3cab58c2d7fcd407fe5a8aee7dbab63c6f7bff8ad20560b274faa7a583b8a0e
-- name: v1.1.4/runc.armhf
-  sha256: cc8d9f06456aa163e883115e6d841c68c140da0b9289c939521b5b4dab7e03cb
-- name: v1.1.4/runc.ppc64le
-  sha256: 0f7fb3d2426b6012d9b33c354c778c0ffbce02c329c4c16c1189433a958fd60d
-- name: v1.1.4/runc.s390x
-  sha256: b19e3fcf466ce4d50e4bb0198dadf7575b852f0c4001cd8b2df02a5aca37ee6a
-- name: v1.1.4/runc.tar.xz
-  sha256: 9f5972715dffb0b2371e4d678c1206cc8c4ec5eb80f2d48755d150bac49be35b
 # runc 1.1.5
 - name: v1.1.5/runc.amd64
   sha256: f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb
 - name: v1.1.5/runc.arm64
   sha256: 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f
-- name: v1.1.5/runc.armel
-  sha256: 431b6ee0d5900bd9df4d992abff3bd85ef0db8c176dce13f03c776fa8e26492f
-- name: v1.1.5/runc.armhf
-  sha256: 33346eb764f79a9c122689db8e5ee4342a9ecb7a9128a96a0ac7408f001d584a
-- name: v1.1.5/runc.ppc64le
-  sha256: 4f06d25b46e11e6670bf38e638c9183bb6676787801f1226f0aa8e74e40169ea
-- name: v1.1.5/runc.s390x
-  sha256: 6d30753e395dbacf7da5cf3c178660f716008555676db8b9d93f57ea2914764b
-- name: v1.1.5/runc.tar.xz
-  sha256: bed3a10df91a161dea38115a955b9b68f9130d8ea24071b12cdf657929d9cfb4
 # runc 1.1.6
 - name: v1.1.6/runc.amd64
   sha256: 868bee5b8dc2a01df0ca41d0accfad6a3372dc1165ebfb76143d2c6672e86115
 - name: v1.1.6/runc.arm64
   sha256: da5b2ed26a173a69ea66eae7c369feebf59c1031e14985f512a0a293bb5f76fb
-- name: v1.1.6/runc.armel
-  sha256: e592eecf061a96a3e7c74635314530c68b21222e0d32cc924b2c99e867399a62
-- name: v1.1.6/runc.armhf
-  sha256: 3f67791e5eb11d50ad52982c2a51ba5726ba73ff7fb03422071354203980de7c
-- name: v1.1.6/runc.ppc64le
-  sha256: f98d585dd88d45a296a3f3adde39eaec84e0cfc75f75c50e5470d871e3538460
-- name: v1.1.6/runc.s390x
-  sha256: a1562dc1ab935b93ed5705bf2529edd338027f0b9649260cd52bf348edcc9727
-- name: v1.1.6/runc.tar.xz
-  sha256: 548506fc1de8f0a4790d8e937eeede17db4beb79c53d66acb4f7ec3edbc31668
 # runc 1.1.7
 - name: v1.1.7/runc.amd64
   sha256: c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd
 - name: v1.1.7/runc.arm64
   sha256: 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab
-- name: v1.1.7/runc.armel
-  sha256: 5d622077430591168a98cfb46b8bccc4c16ca16dda66b172a5f14a6f01bd976a
-- name: v1.1.7/runc.armhf
-  sha256: 94d7ede88e0f267158c8ccf20ab9307c135e320d8818c457bc954f22d81d6cc9
-- name: v1.1.7/runc.ppc64le
-  sha256: eb0e76876d09fa8119dc6e6b037107e5d265d1cfa51f1fbed5418e5745ecf153
-- name: v1.1.7/runc.s390x
-  sha256: 2b565f657968c0dcb33cf1fa58dc02675e08902fc86a732ba3eb4a24b95dd85d
-- name: v1.1.7/runc.tar.xz
-  sha256: 86444cc07461b81bbcb8d15c5fc2cad20afc64a70be0fc623073538aa91bafdd
 # runc 1.1.8
 - name: v1.1.8/runc.amd64
   sha256: 1d05ed79854efc707841dfc7afbf3b86546fc1d0b3a204435ca921c14af8385b
 - name: v1.1.8/runc.arm64
   sha256: 7c22cb618116d1d5216d79e076349f93a672253d564b19928a099c20e4acd658
-- name: v1.1.8/runc.armel
-  sha256: 5efe5923c381e950fca3f3fe542e066b4ab8ce631ec7445e9f0fc389eb34c9d3
-- name: v1.1.8/runc.armhf
-  sha256: 808c92810e837b9278d057f30d17642c85ef05bb38738c47d20c707ae7448443
-- name: v1.1.8/runc.ppc64le
-  sha256: a816cd654e804249c4f757cc6bf2aa2c128e4b8e6a993067d44c63c891c081ab
-- name: v1.1.8/runc.riscv64
-  sha256: e580223b9d9637804fb921cb4b0d9326feacb302e297dd5cb129185f54e91e21
-- name: v1.1.8/runc.s390x
-  sha256: 43f2cf0d2730357b57a9cc54b87e3f81595ac5a7e32abc3b98af0654b612f166
-- name: v1.1.8/runc.tar.xz
-  sha256: fac4b055f56a326bb422f6397ef27b109b87e2063c54c158766f82a5f315cdf0
 # runc 1.1.9
 - name: v1.1.9/runc.amd64
   sha256: b9bfdd4cb27cddbb6172a442df165a80bfc0538a676fbca1a6a6c8f4c6933b43
 - name: v1.1.9/runc.arm64
   sha256: b43e9f561e85906f469eef5a7b7992fc586f750f44a0e011da4467e7008c33a0
-- name: v1.1.9/runc.armel
-  sha256: e91164bc95e6a6f7d20288f9b3011ed63c4de4313626c3c1257daef3a14d3fea
-- name: v1.1.9/runc.armhf
-  sha256: 3c33909a3e2b40d879a1c07b89dc18c7dc727de61a6c381173e8c5c46b200c3d
-- name: v1.1.9/runc.ppc64le
-  sha256: 065cf4f84b5acc0acdb017af2955743dfb5f5e1f49a493eea3e8206f33bf6fe6
-- name: v1.1.9/runc.riscv64
-  sha256: 177a64486b8ce372938692f44e4aa6a6d9d3476a1f77b152142f02cf881a4817
-- name: v1.1.9/runc.s390x
-  sha256: 363b317d44a44591205439e29f70f94f01eb51e58047b092b03b1cd2cdad533a
-- name: v1.1.9/runc.tar.xz
-  sha256: 7695febe134e17559b26224821a2a123bc9e9a637ad4a8c47e99ae0a1ec71dc2
 # runc 1.1.10
 - name: v1.1.10/runc.amd64
   sha256: 81f73a59be3d122ab484d7dfe9ddc81030f595cc59968f61c113a9a38a2c113a
 - name: v1.1.10/runc.arm64
   sha256: 4830afd426bdeacbdf9cb8729524aa2ed51790b8c4b28786995925593708f1c8
-- name: v1.1.10/runc.armel
-  sha256: 081f69a46e41041983475c91e44bc9fea957c55e5d6b5c915584bcb4dfe4bd1c
-- name: v1.1.10/runc.armhf
-  sha256: a78cf549da89cc39d2464a5433e3db50191b9fc69f0165cefb61bbfbf0ceb7de
-- name: v1.1.10/runc.ppc64le
-  sha256: 94a091c06c363e4af7be398dc31fa6e02576d5ecda6de1cbf3a08fe8662bf678
-- name: v1.1.10/runc.riscv64
-  sha256: 0fcff1af876effb69c670c335e44e0afa4c3523695e382dc8740301c8dc67160
-- name: v1.1.10/runc.s390x
-  sha256: 1940ef78f89a4ec2951ef9013b2572dd916888712d3e96ad29a928523a6d1104
-- name: v1.1.10/runc.tar.xz
-  sha256: bd3e89ae89319ef344e7e26f392b40e344bcd5bbdea84ca459a43189451615bf
 # runc 1.1.11
 - name: v1.1.11/runc.amd64
   sha256: 77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea
 - name: v1.1.11/runc.arm64
   sha256: 9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12
-- name: v1.1.11/runc.armel
-  sha256: e6a96918d25a8d4e2cd999b6f7430d0fb7633d06e7d4113518ce37f355fb5957
-- name: v1.1.11/runc.armhf
-  sha256: 8dd7e3e91762729b044c52ff562e56220f700548c8154fbadd1462302016adbc
-- name: v1.1.11/runc.ppc64le
-  sha256: e3d1da41f97db1bb7e9a8d96c9092747c14ee53bc9f160048828e63f3a2d0896
-- name: v1.1.11/runc.riscv64
-  sha256: 202f67a2b2e540c9dc537fe1bd9f83cb521e3e8019f969ee0b10990c631e72ed
-- name: v1.1.11/runc.s390x
-  sha256: af2387aab26bc862b121515dde0b928a0d7933a140b2c574b8801edc595a963a
-- name: v1.1.11/runc.tar.xz
-  sha256: 90a9f8a0093f9e06900e393c11c6b61c597eaf7f9e149aa3aad743961ed25478
 # runc 1.1.12
 - name: v1.1.12/runc.amd64
   sha256: aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8
 - name: v1.1.12/runc.arm64
   sha256: 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8
-- name: v1.1.12/runc.armel
-  sha256: 27f978f848bb06635897333e706a5668f8832252eeea701cc04be780c081bae0
-- name: v1.1.12/runc.armhf
-  sha256: d0d1c7828eacb28bfec21d437c99308c380b31c4898a36c2c4a23c79e036295f
-- name: v1.1.12/runc.ppc64le
-  sha256: 4069d1d57724126e116ad6dbd84409082d1b0afee1ee960b17558f146a742bb6
-- name: v1.1.12/runc.riscv64
-  sha256: 2437db8883422714e7bce3dc6759e31263470e25f854ffa043b1972449a08cc2
-- name: v1.1.12/runc.s390x
-  sha256: 8fd751c034f751ec7b34d1c404c36009adcd3ef1c8f22f6031df3f69e9454b6f
-- name: v1.1.12/runc.tar.xz
-  sha256: 47d9e34500e478d860512b3b646724ee4b9e638692122ddaa82af417668ca4d7
+# runc 1.1.13
+- name: v1.1.13/runc.amd64
+  sha256: bcfc299c1ab255e9d045ffaf2e324c0abaf58f599831a7c2c4a80b33f795de94
+- name: v1.1.13/runc.arm64
+  sha256: 4b93701752f5338ed51592b38e039aef8c1a59856d1225df21eba84c2830743c
+# runc 1.1.14
+- name: v1.1.14/SHA512
+  sha256: 'Hash:'
+- name: v1.1.14/runc.amd64
+  sha256: a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8
+- name: v1.1.14/runc.arm64
+  sha256: 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126
diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
@@ -52,14 +52,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.16")
+			containerd.Version = fi.PtrTo("1.7.22")
 			containerd.Runc = &kops.Runc{
-				Version: fi.PtrTo("1.1.12"),
+				Version: fi.PtrTo("1.1.14"),
 			}
 		default:
-			containerd.Version = fi.PtrTo("1.6.31")
+			containerd.Version = fi.PtrTo("1.6.36")
 			containerd.Runc = &kops.Runc{
-				Version: fi.PtrTo("1.1.12"),
+				Version: fi.PtrTo("1.1.14"),
 			}
 		}
 	}