whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to curl, remove code formatting on the product names, use OS family name on tabs

Browse Source
This commit is contained in:
Terry Moschou
2021-03-09 11:47:15 +10:30
parent 21382af32e
commit b1686cc43a
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/setup/production-environment/container-runtimes.md
+16 -16
View File
@@ -63,7 +63,7 @@ configuration, or reinstall it using automation.
### containerd ### 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: Use the following commands to install Containerd on your system:
@@ -89,27 +89,27 @@ EOF
sudo sysctl --system sudo sysctl --system
``` ```
Install `containerd`: Install containerd:
{{< tabs name="tab-cri-containerd-installation" >}} {{< tabs name="tab-cri-containerd-installation" >}}
{{% tab name="Ubuntu 16.04" %}} {{% tab name="Ubuntu 16.04" %}}
1. Setup the [Docker Engine repository for Ubuntu](https://docs.docker.com/engine/install/ubuntu/#set-up-the-repository) 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 ```shell
sudo apt-get update && sudo apt-get install -y containerd.io sudo apt-get update && sudo apt-get install -y containerd.io
``` ```
3. Configure `containerd`: 3. Configure containerd:
```shell ```shell
sudo mkdir -p /etc/containerd sudo mkdir -p /etc/containerd
containerd config default | sudo tee /etc/containerd/config.toml containerd config default | sudo tee /etc/containerd/config.toml
``` ```
4. Restart `containerd`: 4. Restart containerd:
```shell ```shell
sudo systemctl restart containerd sudo systemctl restart containerd
@@ -118,20 +118,20 @@ Install `containerd`:
{{% /tab %}} {{% /tab %}}
{{% tab name="Ubuntu 18.04/20.04" %}} {{% tab name="Ubuntu 18.04/20.04" %}}
1. Install `containerd`: 1. Install containerd:
```shell ```shell
sudo apt-get update && sudo apt-get install -y containerd sudo apt-get update && sudo apt-get install -y containerd
``` ```
2. Configure `containerd`: 2. Configure containerd:
```shell ```shell
sudo mkdir -p /etc/containerd sudo mkdir -p /etc/containerd
containerd config default | sudo tee /etc/containerd/config.toml containerd config default | sudo tee /etc/containerd/config.toml
``` ```
3. Restart `containerd`: 3. Restart containerd:
```shell ```shell
sudo systemctl restart containerd 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) 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 ```shell
sudo apt-get update && sudo apt-get install -y containerd.io sudo apt-get update && sudo apt-get install -y containerd.io
``` ```
3. Configure `containerd`: 3. Configure containerd:
```shell ```shell
sudo mkdir -p /etc/containerd sudo mkdir -p /etc/containerd
containerd config default | sudo tee /etc/containerd/config.toml containerd config default | sudo tee /etc/containerd/config.toml
``` ```
4. Restart `containerd`: 4. Restart containerd:
```shell ```shell
sudo systemctl restart containerd 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) 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 ```shell
sudo yum update -y && sudo yum install -y containerd.io sudo yum update -y && sudo yum install -y containerd.io
``` ```
3. Configure `containerd`: 3. Configure containerd:
```shell ```shell
sudo mkdir -p /etc/containerd sudo mkdir -p /etc/containerd
containerd config default | sudo tee /etc/containerd/config.toml containerd config default | sudo tee /etc/containerd/config.toml
``` ```
4. Restart `containerd`: 4. Restart containerd:
```shell ```shell
sudo systemctl restart containerd 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: Start a Powershell session, set `$Version` to the desired version (ex: `$Version=1.4.3`), and then run the following commands:
<br /> <br />
1. Download `containerd`: 1. Download containerd:
```powershell ```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 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" Add-MpPreference -ExclusionProcess "$Env:ProgramFiles\containerd\containerd.exe"
``` ```
3. Start `containerd`: 3. Start containerd:
```powershell ```powershell
.\containerd.exe --register-service .\containerd.exe --register-service
content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md
+3 -3
View File
@@ -180,13 +180,13 @@ For more information on version skews, see:
```shell ```shell
sudo apt-get update 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: 2. Download the Google Cloud public signing key:
```shell ```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: 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 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 ```shell
sudo apt-get update sudo apt-get update
content/en/docs/tasks/tools/install-kubectl-linux.md
+6 -5
View File
@@ -100,19 +100,19 @@ For example, to download version {{< param "fullversion" >}} on Linux, type:
### Install using native package management ### Install using native package management
{{< tabs name="kubectl_install" >}} {{< 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: 1. Update the `apt` package index and install packages needed to use the Kubernetes `apt` repository:
```shell ```shell
sudo apt-get update 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: 2. Download the Google Cloud public signing key:
```shell ```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: 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 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 ```shell
sudo apt-get update sudo apt-get update
@@ -130,7 +130,8 @@ For example, to download version {{< param "fullversion" >}} on Linux, type:
{{% /tab %}} {{% /tab %}}
{{< tab name="CentOS, RHEL or Fedora" codelang="bash" >}}cat <<EOF > /etc/yum.repos.d/kubernetes.repo {{< tab name="Red Hat-based distributions" codelang="bash" >}}
cat <<EOF > /etc/yum.repos.d/kubernetes.repo
[kubernetes] [kubernetes]
name=Kubernetes name=Kubernetes
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64