From a3f18007ccad266810d5b02fffe51b7ef3b2463c Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Sun, 19 Jan 2020 19:14:55 +0800 Subject: [PATCH] Add Kata Container support The patch is based on 431885231ae41256188a7c32f0f5351c4455707b And is updated with kata 1.10 repo and 1.10.0-4.1 rpms. 1. add kata container 1.10 stable repo with kata 1.10.0-4.1 rpms. kata-runtime is the main rpm, and other rpms including qemu are the rpms required by kata-runtime. 2. upgrade containerd to 1.3.0 To support kata container, kubernetes need switch runtime from dockershim to containerd. And need use containered with 1.3.0 in order to support secure private registry. 3. add crictl as the CLI for containerd. Story: 2006145 Task: 36744 Task: 36745 Task: 36746 Change-Id: I932e0dde0a0b48257e4acd17d6550f9ec5029555 Signed-off-by: Shuicheng Lin --- centos-mirror-tools/rpms_centos3rdparties.lst | 13 ++++++++++++- centos-mirror-tools/tarball-dl.lst | 3 +++ .../yum.repos.d/StarlingX_3rd_katacontainer.repo | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo diff --git a/centos-mirror-tools/rpms_centos3rdparties.lst b/centos-mirror-tools/rpms_centos3rdparties.lst index f4456be9..6c490229 100644 --- a/centos-mirror-tools/rpms_centos3rdparties.lst +++ b/centos-mirror-tools/rpms_centos3rdparties.lst @@ -8,7 +8,6 @@ audit-libs-devel-2.8.4-4.el7.x86_64.rpm audit-libs-python-2.8.4-4.el7.x86_64.rpm collectd-5.8.1-4.el7.x86_64.rpm collectd-python-5.8.1-4.el7.x86_64.rpm -containerd.io-1.2.5-3.1.el7.x86_64.rpm containernetworking-plugins-0.8.1-1.el7.centos.x86_64.rpm copy-jdk-configs-3.3-10.el7_5.noarch.rpm cppcheck-1.88-3.el7.x86_64.rpm @@ -42,6 +41,15 @@ iprutils-2.4.16.1-1.el7.x86_64.rpm java-1.8.0-openjdk-1.8.0.191.b12-1.el7_6.x86_64.rpm java-1.8.0-openjdk-devel-1.8.0.191.b12-1.el7_6.x86_64.rpm java-1.8.0-openjdk-headless-1.8.0.191.b12-1.el7_6.x86_64.rpm +kata-containers-image-1.10.0-4.1.x86_64.rpm +kata-ksm-throttler-1.10.0-4.1.x86_64.rpm +kata-linux-container-4.19.86.60-4.1.x86_64.rpm +kata-linux-container-debug-4.19.86.60-4.1.x86_64.rpm +kata-proxy-1.10.0-4.1.x86_64.rpm +kata-proxy-bin-1.10.0-4.1.x86_64.rpm +kata-runtime-1.10.0-4.1.x86_64.rpm +kata-shim-1.10.0-4.1.x86_64.rpm +kata-shim-bin-1.10.0-4.1.x86_64.rpm kernel-rt-3.10.0-1062.1.2.rt56.1025.el7.src.rpm kexec-tools-2.0.15-21.el7.x86_64.rpm libblkid-2.23.2-59.el7.x86_64.rpm @@ -112,6 +120,9 @@ python-requests-mock-1.3.0-1.el7.noarch.rpm python-setuptools-22.0.5-1.el7.src.rpm python-tempest-17.2.0-4.el7.noarch.rpm python-virtualenv-15.1.0-2.el7.noarch.rpm +qemu-vanilla-4.1.0+git.9e06029aea-4.1.x86_64.rpm +qemu-vanilla-bin-4.1.0+git.9e06029aea-4.1.x86_64.rpm +qemu-vanilla-data-4.1.0+git.9e06029aea-4.1.x86_64.rpm rest-0.8.1-2.el7.x86_64.rpm samba-client-libs-4.8.3-4.el7.x86_64.rpm samba-common-4.8.3-4.el7.noarch.rpm diff --git a/centos-mirror-tools/tarball-dl.lst b/centos-mirror-tools/tarball-dl.lst index 2028c741..a58649da 100644 --- a/centos-mirror-tools/tarball-dl.lst +++ b/centos-mirror-tools/tarball-dl.lst @@ -3,6 +3,8 @@ boost_1_67_0.tar.bz2#boost_1_67_0#https://dl.bintray.com/boostorg/release/1.67.0 ceph-erasure-code-corpus-2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7.tar.gz#ceph-erasure-code-corpus#https://api.github.com/repos/ceph/ceph-erasure-code-corpus/tarball/2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7#https## ceph-object-corpus-e32bf8ca3dc6151ebe7f205ba187815bc18e1cef.tar.gz#ceph-object-corpus#https://api.github.com/repos/ceph/ceph-object-corpus/tarball/e32bf8ca3dc6151ebe7f205ba187815bc18e1cef#https## civetweb-ff2881e2cd5869a71ca91083bad5d12cccd22136.tar.gz#civetweb#https://api.github.com/repos/ceph/civetweb/tarball/ff2881e2cd5869a71ca91083bad5d12cccd22136#https## +containerd-v1.3.0.tar.gz#containerd#https://github.com/containerd/containerd/archive/v1.3.0.tar.gz#https## +crictl-v1.16.0-linux-amd64.tar.gz#crictl#https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.16.0/crictl-v1.16.0-linux-amd64.tar.gz#https## dep-v0.5.0.tar.gz#dep-v0.5.0#https://github.com/golang/dep/archive/v0.5.0.tar.gz#http## docker-distribution-48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz#docker-distribution#github.com/docker/distribution/archive/48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz#http## docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#docker-libtrust#https://github.com/docker/libtrust/archive/fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#http## @@ -71,6 +73,7 @@ requests-toolbelt-0.9.1.tar.gz#requests-toolbelt-0.9.1#https://github.com/reques rocksdb-f4a857da0b720691effc524469f6db895ad00d8e.tar.gz#rocksdb#https://api.github.com/repos/ceph/rocksdb/tarball/f4a857da0b720691effc524469f6db895ad00d8e#https## rook-1.1.1.tar.gz#rook-1.1.1#https://github.com/rook/rook/archive/v1.1.1.tar.gz## rpm-4.14.0.tar.bz2#rpm-4.14.0#https://ftp.osuosl.org/pub/rpm/releases/rpm-4.14.x/rpm-4.14.0.tar.bz2#http## +runc-1.0.0-rc8.tar.gz#runc#https://github.com/opencontainers/runc/archive/v1.0.0-rc8.tar.gz#https## Sirupsen-logrus-55eb11d21d2a31a3cc93838241d04800f52e823d.tar.gz#Sirupsen-logrus#github.com/Sirupsen/logrus/archive/55eb11d21d2a31a3cc93838241d04800f52e823d.tar.gz#http## spdk-f474ce6930f0a44360e1cc4ecd606d2348481c4c.tar.gz#spdk#https://api.github.com/repos/ceph/spdk/tarball/f474ce6930f0a44360e1cc4ecd606d2348481c4c#https## spectre-meltdown-checker-0.37+-5cc77741.tar.gz#spectre-meltdown-checker#https://github.com/speed47/spectre-meltdown-checker/tarball/5cc77741af1d2f52140aa9f89339f56b6c4b6783#http## diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo new file mode 100644 index 00000000..a0a9747b --- /dev/null +++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo @@ -0,0 +1,7 @@ +[home_katacontainers_releases_x86_64_stable-1.10] +name=Branch project for Kata Containers branch stable-1.10 (CentOS_7) +type=rpm-md +baseurl=http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/CentOS_7/ +gpgcheck=1 +gpgkey=http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/CentOS_7/repodata/repomd.xml.key +enabled=1