From e6ff42b8ad4010da1ad9e81e2fd722c05b944ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 27 Aug 2020 13:33:10 +0200 Subject: [PATCH] install: Update openSUSE information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's update the openSUSE Installation Guide to reflect the current information on how to install kata packages provided by the distro itself. The official packages are present on Leap 15.2 and Tumbleweed, and can be just installed. Leap 15.1 is slightly different, as the .repo file has to be added before the packages can be installed. Leap 15.0 has been removed as it already reached its EOL. Fixes: #623 Signed-off-by: Fabiano Fidêncio --- docs/install/README.md | 11 +++++------ docs/install/opensuse-installation-guide.md | 14 +------------- .../opensuse-leap-15.1-installation-guide.md | 12 ++++++++++++ .../opensuse-leap-installation-guide.md | 19 ------------------- .../opensuse-tumbleweed-installation-guide.md | 19 ------------------- 5 files changed, 18 insertions(+), 57 deletions(-) create mode 100644 docs/install/opensuse-leap-15.1-installation-guide.md delete mode 100644 docs/install/opensuse-leap-installation-guide.md delete mode 100644 docs/install/opensuse-tumbleweed-installation-guide.md diff --git a/docs/install/README.md b/docs/install/README.md index 54373accbd..a206bffa89 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -42,7 +42,6 @@ Kata is packaged by the Kata community for: |Distribution (link to installation guide) | Versions | |-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------| |[Debian](debian-installation-guide.md) | 9, 10 | -|[openSUSE](opensuse-installation-guide.md) | [Leap](opensuse-leap-installation-guide.md) (15, 15.1)
[Tumbleweed](opensuse-tumbleweed-installation-guide.md) | |[SUSE Linux Enterprise Server (SLES)](sles-installation-guide.md)| SLES 12 SP3 | |[Ubuntu](ubuntu-installation-guide.md) | 16.04, 18.04 | @@ -50,11 +49,11 @@ Kata is packaged by the Kata community for: Kata packages are provided by official distribution repositories for: -|Distribution (link to packages) | Versions | -|-----------------------------------------------------------------|-------------| -|[CentOS](centos-installation-guide.md) | 8 | -|[Fedora](fedora-installation-guide.md) | 32, Rawhide | -|[openSUSE](https://software.opensuse.org/package/katacontainers) | Tumbleweed | +|Distribution (link to packages) | Versions | +|-------------------------------------------|--------------------------------------------------------------------------------| +|[CentOS](centos-installation-guide.md) | 8 | +|[Fedora](fedora-installation-guide.md) | 32, Rawhide | +|[openSUSE](opensuse-installation-guide.md) | [Leap 15.1](opensuse-leap-15.1-installation-guide.md)
Leap 15.2, Tumbleweed | ### Automatic Installation diff --git a/docs/install/opensuse-installation-guide.md b/docs/install/opensuse-installation-guide.md index 2073b034fd..6d13981354 100644 --- a/docs/install/opensuse-installation-guide.md +++ b/docs/install/opensuse-installation-guide.md @@ -3,19 +3,7 @@ 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}" - $ DISTRO_REPO=$(echo $DISTRO_REPO | tr -d ' ') - $ ARCH=$(arch) - $ BRANCH="${BRANCH:-master}" - $ 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 + $ sudo -E zypper -n install katacontainers ``` 2. Decide which container manager to use and select the corresponding link that follows: diff --git a/docs/install/opensuse-leap-15.1-installation-guide.md b/docs/install/opensuse-leap-15.1-installation-guide.md new file mode 100644 index 0000000000..ccfe7dc851 --- /dev/null +++ b/docs/install/opensuse-leap-15.1-installation-guide.md @@ -0,0 +1,12 @@ +# Install Kata Containers on openSUSE Leap 15.1 + +1. Install the Kata Containers components with the following commands: + + ```bash + $ sudo -E zypper addrepo --refresh "https://download.opensuse.org/repositories/devel:/kubic/openSUSE_Leap_15.1/devel:kubic.repo" + $ sudo -E zypper -n --gpg-auto-import-keys install katacontainers + ``` + +2. Decide which container manager to use and select the corresponding link that follows: + - [Docker](docker/opensuse-docker-install.md) + - [Kubernetes](../Developer-Guide.md#run-kata-containers-with-kubernetes) diff --git a/docs/install/opensuse-leap-installation-guide.md b/docs/install/opensuse-leap-installation-guide.md deleted file mode 100644 index a4bf946f72..0000000000 --- a/docs/install/opensuse-leap-installation-guide.md +++ /dev/null @@ -1,19 +0,0 @@ -# Install Kata Containers on openSUSE Leap - -1. Install Kata Containers on openSUSE by following the instructions in the -[openSUSE install guide](opensuse-installation-guide.md). - - -2. Decide which container manager to use and select the corresponding link that follows: - - [Docker](docker/opensuse-leap-docker-install.md) - - [Kubernetes](../Developer-Guide.md#run-kata-containers-with-kubernetes) diff --git a/docs/install/opensuse-tumbleweed-installation-guide.md b/docs/install/opensuse-tumbleweed-installation-guide.md deleted file mode 100644 index 35ec2f2e3d..0000000000 --- a/docs/install/opensuse-tumbleweed-installation-guide.md +++ /dev/null @@ -1,19 +0,0 @@ -# Install Kata Containers on openSUSE Tumbleweed - -1. Install Kata Containers on openSUSE by following the instructions in the -[openSUSE install guide](opensuse-installation-guide.md). - - -2. Decide which container manager to use and select the corresponding link that follows: - - [Docker](docker/opensuse-tumbleweed-docker-install.md) - - [Kubernetes](../Developer-Guide.md#run-kata-containers-with-kubernetes)