From b1686cc43a55986c3c460ecf62715a50c632c3ba Mon Sep 17 00:00:00 2001 From: Terry Moschou Date: Tue, 9 Mar 2021 11:47:15 +1030 Subject: [PATCH] Switch to curl, remove code formatting on the product names, use OS family name on tabs --- .../container-runtimes.md | 32 +++++++++---------- .../tools/kubeadm/install-kubeadm.md | 6 ++-- .../docs/tasks/tools/install-kubectl-linux.md | 11 ++++--- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index d255780222..a59ebbddaf 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -63,7 +63,7 @@ configuration, or reinstall it using automation. ### containerd -This section contains the necessary steps to use `containerd` as CRI runtime. +This section contains the necessary steps to use containerd as CRI runtime. Use the following commands to install Containerd on your system: @@ -89,27 +89,27 @@ EOF sudo sysctl --system ``` -Install `containerd`: +Install containerd: {{< tabs name="tab-cri-containerd-installation" >}} {{% tab name="Ubuntu 16.04" %}} 1. Setup the [Docker Engine repository for Ubuntu](https://docs.docker.com/engine/install/ubuntu/#set-up-the-repository) -2. Install `containerd`: +2. Install containerd: ```shell sudo apt-get update && sudo apt-get install -y containerd.io ``` -3. Configure `containerd`: +3. Configure containerd: ```shell sudo mkdir -p /etc/containerd containerd config default | sudo tee /etc/containerd/config.toml ``` -4. Restart `containerd`: +4. Restart containerd: ```shell sudo systemctl restart containerd @@ -118,20 +118,20 @@ Install `containerd`: {{% /tab %}} {{% tab name="Ubuntu 18.04/20.04" %}} -1. Install `containerd`: +1. Install containerd: ```shell sudo apt-get update && sudo apt-get install -y containerd ``` -2. Configure `containerd`: +2. Configure containerd: ```shell sudo mkdir -p /etc/containerd containerd config default | sudo tee /etc/containerd/config.toml ``` -3. Restart `containerd`: +3. Restart containerd: ```shell sudo systemctl restart containerd @@ -142,20 +142,20 @@ Install `containerd`: 1. Setup the [Docker Engine repository for Debian](https://docs.docker.com/engine/install/debian/#set-up-the-repository) -2. Install `containerd`: +2. Install containerd: ```shell sudo apt-get update && sudo apt-get install -y containerd.io ``` -3. Configure `containerd`: +3. Configure containerd: ```shell sudo mkdir -p /etc/containerd containerd config default | sudo tee /etc/containerd/config.toml ``` -4. Restart `containerd`: +4. Restart containerd: ```shell sudo systemctl restart containerd @@ -166,20 +166,20 @@ Install `containerd`: 1. Setup the [Docker Engine repository for CentOS/RHEL](https://docs.docker.com/engine/install/centos/#set-up-the-repository) -2. Install `containerd`: +2. Install containerd: ```shell sudo yum update -y && sudo yum install -y containerd.io ``` -3. Configure `containerd`: +3. Configure containerd: ```shell sudo mkdir -p /etc/containerd containerd config default | sudo tee /etc/containerd/config.toml ``` -4. Restart `containerd`: +4. Restart containerd: ```shell sudo systemctl restart containerd @@ -192,7 +192,7 @@ Install `containerd`: Start a Powershell session, set `$Version` to the desired version (ex: `$Version=1.4.3`), and then run the following commands:
-1. Download `containerd`: +1. Download containerd: ```powershell curl.exe -L https://github.com/containerd/containerd/releases/download/v$Version/containerd-$Version-windows-amd64.tar.gz -o containerd-windows-amd64.tar.gz @@ -215,7 +215,7 @@ Start a Powershell session, set `$Version` to the desired version (ex: `$Version Add-MpPreference -ExclusionProcess "$Env:ProgramFiles\containerd\containerd.exe" ``` -3. Start `containerd`: +3. Start containerd: ```powershell .\containerd.exe --register-service diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index 86186d1713..7d74a862f9 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md @@ -180,13 +180,13 @@ For more information on version skews, see: ```shell sudo apt-get update - sudo apt-get install -y apt-transport-https ca-certificates wget + sudo apt-get install -y apt-transport-https ca-certificates curl ``` 2. Download the Google Cloud public signing key: ```shell - sudo wget -O /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg + sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg ``` 3. Add the Kubernetes `apt` repository: @@ -195,7 +195,7 @@ For more information on version skews, see: echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list ``` -4. Update `apt` package index, install `kubelet`, `kubeadm` and `kubectl`, and pin their version: +4. Update `apt` package index, install kubelet, kubeadm and kubectl, and pin their version: ```shell sudo apt-get update diff --git a/content/en/docs/tasks/tools/install-kubectl-linux.md b/content/en/docs/tasks/tools/install-kubectl-linux.md index e18adbe1b3..243dbf4e0d 100644 --- a/content/en/docs/tasks/tools/install-kubectl-linux.md +++ b/content/en/docs/tasks/tools/install-kubectl-linux.md @@ -100,19 +100,19 @@ For example, to download version {{< param "fullversion" >}} on Linux, type: ### Install using native package management {{< tabs name="kubectl_install" >}} -{{% tab name="Ubuntu, Debian or HypriotOS" %}} +{{% tab name="Debian-based distributions" %}} 1. Update the `apt` package index and install packages needed to use the Kubernetes `apt` repository: ```shell sudo apt-get update - sudo apt-get install -y apt-transport-https ca-certificates wget + sudo apt-get install -y apt-transport-https ca-certificates curl ``` 2. Download the Google Cloud public signing key: ```shell - sudo wget -O /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg + sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg ``` 3. Add the Kubernetes `apt` repository: @@ -121,7 +121,7 @@ For example, to download version {{< param "fullversion" >}} on Linux, type: echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list ``` -4. Update `apt` package index with the new repository and install `kubectl`: +4. Update `apt` package index with the new repository and install kubectl: ```shell sudo apt-get update @@ -130,7 +130,8 @@ For example, to download version {{< param "fullversion" >}} on Linux, type: {{% /tab %}} -{{< tab name="CentOS, RHEL or Fedora" codelang="bash" >}}cat < /etc/yum.repos.d/kubernetes.repo +{{< tab name="Red Hat-based distributions" codelang="bash" >}} +cat < /etc/yum.repos.d/kubernetes.repo [kubernetes] name=Kubernetes baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64