From b2c002415cd52f786030cbbd53fbf67c5e0998ac Mon Sep 17 00:00:00 2001 From: Marco Vedovati Date: Thu, 23 May 2019 12:53:22 +0200 Subject: [PATCH] install: better support for all openSUSE distros Support installing kata packages on all openSUSE distros. Fixes: #483 Signed-off-by: Marco Vedovati --- install/README.md | 20 +++++++++---------- install/docker/opensuse-docker-install.md | 2 +- .../docker/opensuse-leap-docker-install.md | 14 +++++++++++++ .../opensuse-tumbleweed-docker-install.md | 14 +++++++++++++ install/opensuse-installation-guide.md | 13 +++++++++--- install/opensuse-leap-installation-guide.md | 14 +++++++++++++ .../opensuse-tumbleweed-installation-guide.md | 14 +++++++++++++ 7 files changed, 77 insertions(+), 14 deletions(-) create mode 100644 install/docker/opensuse-leap-docker-install.md create mode 100644 install/docker/opensuse-tumbleweed-docker-install.md create mode 100644 install/opensuse-leap-installation-guide.md create mode 100644 install/opensuse-tumbleweed-installation-guide.md diff --git a/install/README.md b/install/README.md index e74d77028..57ec55d3d 100644 --- a/install/README.md +++ b/install/README.md @@ -49,7 +49,7 @@ Manual installation instructions are available for [these distributions](#suppor 1. Add the Kata Containers repository to your distro package manager, and import the packages signing key. 2. Install the Kata Containers packages. 3. Install a supported container manager. -4. Configure the container manager to use `kata-runtime` as the default OCI runtime. Or, for Kata Containers 1.5.0 or above, configure the +4. Configure the container manager to use `kata-runtime` as the default OCI runtime. Or, for Kata Containers 1.5.0 or above, configure the `io.containerd.kata.v2` to be the runtime shim (see [containerd runtime v2 (shim API)](https://github.com/containerd/containerd/tree/master/runtime/v2) and [How to use Kata Containers and CRI (containerd plugin) with Kubernetes](https://github.com/kata-containers/documentation/blob/master/how-to/how-to-use-k8s-with-cri-containerd-and-kata.md)). @@ -83,15 +83,15 @@ Manual installation instructions are available for [these distributions](#suppor [Use snap](snap-installation-guide.md) to install Kata Containers from snapcraft.io. #### Supported Distributions -|Distro specific installation instructions | Versions | -|-------------------------------------------------------------------|-----------------| -|[CentOS](centos-installation-guide.md) | 7 | -|[Debian](debian-installation-guide.md) | 9 | -|[Fedora](fedora-installation-guide.md) | 27, 28 | -|[openSUSE](opensuse-installation-guide.md) | Leap (42.3) | -|[Red Hat Enterprise Linux (RHEL)](rhel-installation-guide.md) | 7 | -|[SUSE Linux Enterprise Server (SLES)](sles-installation-guide.md) | SLES 12 SP3 | -|[Ubuntu](ubuntu-installation-guide.md) | 16.04, 18.04 | +|Distro specific installation instructions | Versions | +|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------| +|[CentOS](centos-installation-guide.md) | 7 | +|[Debian](debian-installation-guide.md) | 9 | +|[Fedora](fedora-installation-guide.md) | 27, 28, 29 | +|[openSUSE](opensuse-installation-guide.md) | [Leap](opensuse-leap-installation-guide.md) (42.3, 15)
[Tumbleweed](opensuse-tumbleweed-installation-guide.md) | +|[Red Hat Enterprise Linux (RHEL)](rhel-installation-guide.md) | 7 | +|[SUSE Linux Enterprise Server (SLES)](sles-installation-guide.md)| SLES 12 SP3 | +|[Ubuntu](ubuntu-installation-guide.md) | 16.04, 18.04 | ## Installing on a Cloud Service Platform * [Amazon Web Services (AWS)](aws-installation-guide.md) diff --git a/install/docker/opensuse-docker-install.md b/install/docker/opensuse-docker-install.md index 120d641bb..74e4c33a4 100644 --- a/install/docker/opensuse-docker-install.md +++ b/install/docker/opensuse-docker-install.md @@ -1,4 +1,4 @@ -# Install Docker for Kata Containers on openSUSE Leap +# Install Docker for Kata Containers on openSUSE Leap/Tumbleweed > **Note:** > diff --git a/install/docker/opensuse-leap-docker-install.md b/install/docker/opensuse-leap-docker-install.md new file mode 100644 index 000000000..c743f4bda --- /dev/null +++ b/install/docker/opensuse-leap-docker-install.md @@ -0,0 +1,14 @@ +# Install Docker for Kata Containers on openSUSE Leap + +Follow the instructions in the generic [openSUSE Docker install guide](opensuse-docker-install.md). + diff --git a/install/docker/opensuse-tumbleweed-docker-install.md b/install/docker/opensuse-tumbleweed-docker-install.md new file mode 100644 index 000000000..8d1c5a369 --- /dev/null +++ b/install/docker/opensuse-tumbleweed-docker-install.md @@ -0,0 +1,14 @@ +# Install Docker for Kata Containers on openSUSE Tumbleweed + +Follow the instructions in the generic [openSUSE Docker install guide](opensuse-docker-install.md). + diff --git a/install/opensuse-installation-guide.md b/install/opensuse-installation-guide.md index 7489f63da..14c5424ef 100644 --- a/install/opensuse-installation-guide.md +++ b/install/opensuse-installation-guide.md @@ -1,13 +1,20 @@ -# Install Kata Containers on openSUSE Leap +# Install Kata Containers on openSUSE Leap/Tumbleweed 1. Install the Kata Containers components with the following commands: ```bash $ source /etc/os-release + $ DISTRO_REPO=$(sed "s/ /_/g" <<< "$NAME") + $ [ -n "$VERSION" ] && DISTRO_REPO+="_${VERSION}" $ ARCH=$(arch) $ BRANCH="${BRANCH:-master}" - $ sudo -E zypper addrepo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/openSUSE_Leap_${VERSION_ID}/home:katacontainers:releases:${ARCH}:${BRANCH}.repo" - $ sudo -E zypper -n --no-gpg-checks install kata-runtime kata-proxy kata-shim + $ REPO_ALIAS="kata-${BRANCH}" + $ PUBKEY="/tmp/rpm-signkey.pub" + $ curl -SsL -o "$PUBKEY" "https://raw.githubusercontent.com/kata-containers/tests/master/data/rpm-signkey.pub" + $ sudo -E rpm --import "$PUBKEY" + $ zypper lr "$REPO_ALIAS" && sudo -E zypper -n removerepo "$REPO_ALIAS" + $ sudo -E zypper addrepo --refresh "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/${DISTRO_REPO}/" "$REPO_ALIAS" + $ sudo -E zypper -n install kata-runtime ``` 2. Decide which container manager to use and select the corresponding link that follows: diff --git a/install/opensuse-leap-installation-guide.md b/install/opensuse-leap-installation-guide.md new file mode 100644 index 000000000..1e407c875 --- /dev/null +++ b/install/opensuse-leap-installation-guide.md @@ -0,0 +1,14 @@ +# Install Kata Containers on openSUSE Leap + +Follow the instructions in the generic [openSUSE install guide](opensuse-installation-guide.md). + diff --git a/install/opensuse-tumbleweed-installation-guide.md b/install/opensuse-tumbleweed-installation-guide.md new file mode 100644 index 000000000..66d5867f2 --- /dev/null +++ b/install/opensuse-tumbleweed-installation-guide.md @@ -0,0 +1,14 @@ +# Install Kata Containers on openSUSE Tumbleweed + +Follow the instructions in the generic [openSUSE install guide](opensuse-installation-guide.md). +