Skip to content

Commit b1686cc

Browse files
committed
Switch to curl, remove code formatting on the product names, use OS family name on tabs
1 parent 21382af commit b1686cc

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

content/en/docs/setup/production-environment/container-runtimes.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ configuration, or reinstall it using automation.
6363

6464
### containerd
6565

66-
This section contains the necessary steps to use `containerd` as CRI runtime.
66+
This section contains the necessary steps to use containerd as CRI runtime.
6767

6868
Use the following commands to install Containerd on your system:
6969

@@ -89,27 +89,27 @@ EOF
8989
sudo sysctl --system
9090
```
9191

92-
Install `containerd`:
92+
Install containerd:
9393

9494
{{< tabs name="tab-cri-containerd-installation" >}}
9595
{{% tab name="Ubuntu 16.04" %}}
9696

9797
1. Setup the [Docker Engine repository for Ubuntu](https://docs.docker.com/engine/install/ubuntu/#set-up-the-repository)
9898

99-
2. Install `containerd`:
99+
2. Install containerd:
100100

101101
```shell
102102
sudo apt-get update && sudo apt-get install -y containerd.io
103103
```
104104

105-
3. Configure `containerd`:
105+
3. Configure containerd:
106106

107107
```shell
108108
sudo mkdir -p /etc/containerd
109109
containerd config default | sudo tee /etc/containerd/config.toml
110110
```
111111

112-
4. Restart `containerd`:
112+
4. Restart containerd:
113113

114114
```shell
115115
sudo systemctl restart containerd
@@ -118,20 +118,20 @@ Install `containerd`:
118118
{{% /tab %}}
119119
{{% tab name="Ubuntu 18.04/20.04" %}}
120120

121-
1. Install `containerd`:
121+
1. Install containerd:
122122

123123
```shell
124124
sudo apt-get update && sudo apt-get install -y containerd
125125
```
126126

127-
2. Configure `containerd`:
127+
2. Configure containerd:
128128

129129
```shell
130130
sudo mkdir -p /etc/containerd
131131
containerd config default | sudo tee /etc/containerd/config.toml
132132
```
133133

134-
3. Restart `containerd`:
134+
3. Restart containerd:
135135

136136
```shell
137137
sudo systemctl restart containerd
@@ -142,20 +142,20 @@ Install `containerd`:
142142

143143
1. Setup the [Docker Engine repository for Debian](https://docs.docker.com/engine/install/debian/#set-up-the-repository)
144144

145-
2. Install `containerd`:
145+
2. Install containerd:
146146

147147
```shell
148148
sudo apt-get update && sudo apt-get install -y containerd.io
149149
```
150150

151-
3. Configure `containerd`:
151+
3. Configure containerd:
152152

153153
```shell
154154
sudo mkdir -p /etc/containerd
155155
containerd config default | sudo tee /etc/containerd/config.toml
156156
```
157157

158-
4. Restart `containerd`:
158+
4. Restart containerd:
159159

160160
```shell
161161
sudo systemctl restart containerd
@@ -166,20 +166,20 @@ Install `containerd`:
166166

167167
1. Setup the [Docker Engine repository for CentOS/RHEL](https://docs.docker.com/engine/install/centos/#set-up-the-repository)
168168

169-
2. Install `containerd`:
169+
2. Install containerd:
170170

171171
```shell
172172
sudo yum update -y && sudo yum install -y containerd.io
173173
```
174174

175-
3. Configure `containerd`:
175+
3. Configure containerd:
176176

177177
```shell
178178
sudo mkdir -p /etc/containerd
179179
containerd config default | sudo tee /etc/containerd/config.toml
180180
```
181181

182-
4. Restart `containerd`:
182+
4. Restart containerd:
183183

184184
```shell
185185
sudo systemctl restart containerd
@@ -192,7 +192,7 @@ Install `containerd`:
192192
Start a Powershell session, set `$Version` to the desired version (ex: `$Version=1.4.3`), and then run the following commands:
193193
<br />
194194

195-
1. Download `containerd`:
195+
1. Download containerd:
196196

197197
```powershell
198198
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
215215
Add-MpPreference -ExclusionProcess "$Env:ProgramFiles\containerd\containerd.exe"
216216
```
217217

218-
3. Start `containerd`:
218+
3. Start containerd:
219219

220220
```powershell
221221
.\containerd.exe --register-service

content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ For more information on version skews, see:
180180

181181
```shell
182182
sudo apt-get update
183-
sudo apt-get install -y apt-transport-https ca-certificates wget
183+
sudo apt-get install -y apt-transport-https ca-certificates curl
184184
```
185185

186186
2. Download the Google Cloud public signing key:
187187

188188
```shell
189-
sudo wget -O /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
189+
sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
190190
```
191191

192192
3. Add the Kubernetes `apt` repository:
@@ -195,7 +195,7 @@ For more information on version skews, see:
195195
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
196196
```
197197

198-
4. Update `apt` package index, install `kubelet`, `kubeadm` and `kubectl`, and pin their version:
198+
4. Update `apt` package index, install kubelet, kubeadm and kubectl, and pin their version:
199199

200200
```shell
201201
sudo apt-get update

content/en/docs/tasks/tools/install-kubectl-linux.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,19 @@ For example, to download version {{< param "fullversion" >}} on Linux, type:
100100
### Install using native package management
101101

102102
{{< tabs name="kubectl_install" >}}
103-
{{% tab name="Ubuntu, Debian or HypriotOS" %}}
103+
{{% tab name="Debian-based distributions" %}}
104104

105105
1. Update the `apt` package index and install packages needed to use the Kubernetes `apt` repository:
106106

107107
```shell
108108
sudo apt-get update
109-
sudo apt-get install -y apt-transport-https ca-certificates wget
109+
sudo apt-get install -y apt-transport-https ca-certificates curl
110110
```
111111

112112
2. Download the Google Cloud public signing key:
113113

114114
```shell
115-
sudo wget -O /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
115+
sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
116116
```
117117

118118
3. Add the Kubernetes `apt` repository:
@@ -121,7 +121,7 @@ For example, to download version {{< param "fullversion" >}} on Linux, type:
121121
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
122122
```
123123

124-
4. Update `apt` package index with the new repository and install `kubectl`:
124+
4. Update `apt` package index with the new repository and install kubectl:
125125

126126
```shell
127127
sudo apt-get update
@@ -130,7 +130,8 @@ For example, to download version {{< param "fullversion" >}} on Linux, type:
130130

131131
{{% /tab %}}
132132

133-
{{< tab name="CentOS, RHEL or Fedora" codelang="bash" >}}cat <<EOF > /etc/yum.repos.d/kubernetes.repo
133+
{{< tab name="Red Hat-based distributions" codelang="bash" >}}
134+
cat <<EOF > /etc/yum.repos.d/kubernetes.repo
134135
[kubernetes]
135136
name=Kubernetes
136137
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64

0 commit comments

Comments
 (0)