Tweak kubeadm-upgrade page for indentation nits

The indentation on the page is "messy". We don't encourage implicit code blocks (4-space indentations). The nesting of contents are not properly expressed either.
This commit is contained in:
Qiming Teng
2022-04-27 16:06:06 +08:00
parent d97df38b70
commit dc7bed20cf
@@ -81,19 +81,23 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc
- Upgrade kubeadm: - Upgrade kubeadm:
{{< tabs name="k8s_install_kubeadm_first_cp" >}} {{< tabs name="k8s_install_kubeadm_first_cp" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu, Debian or HypriotOS" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-00 with the latest patch version # replace x in {{< skew currentVersion >}}.x-00 with the latest patch version
apt-mark unhold kubeadm && \ apt-mark unhold kubeadm && \
apt-get update && apt-get install -y kubeadm={{< skew currentVersion >}}.x-00 && \ apt-get update && apt-get install -y kubeadm={{< skew currentVersion >}}.x-00 && \
apt-mark hold kubeadm apt-mark hold kubeadm
{{% /tab %}} ```
{{% tab name="CentOS, RHEL or Fedora" %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-0 with the latest patch version # replace x in {{< skew currentVersion >}}.x-0 with the latest patch version
yum install -y kubeadm-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes yum install -y kubeadm-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes
{{% /tab %}} ```
{{< /tabs >}} {{% /tab %}}
<br /> {{< /tabs >}}
<br />
- Verify that the download works and has the expected version: - Verify that the download works and has the expected version:
@@ -110,17 +114,17 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc
This command checks that your cluster can be upgraded, and fetches the versions you can upgrade to. This command checks that your cluster can be upgraded, and fetches the versions you can upgrade to.
It also shows a table with the component config version states. It also shows a table with the component config version states.
{{< note >}} {{< note >}}
`kubeadm upgrade` also automatically renews the certificates that it manages on this node. `kubeadm upgrade` also automatically renews the certificates that it manages on this node.
To opt-out of certificate renewal the flag `--certificate-renewal=false` can be used. To opt-out of certificate renewal the flag `--certificate-renewal=false` can be used.
For more information see the [certificate management guide](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs). For more information see the [certificate management guide](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs).
{{</ note >}} {{</ note >}}
{{< note >}} {{< note >}}
If `kubeadm upgrade plan` shows any component configs that require manual upgrade, users must provide If `kubeadm upgrade plan` shows any component configs that require manual upgrade, users must provide
a config file with replacement configs to `kubeadm upgrade apply` via the `--config` command line flag. a config file with replacement configs to `kubeadm upgrade apply` via the `--config` command line flag.
Failing to do so will cause `kubeadm upgrade apply` to exit with an error and not perform an upgrade. Failing to do so will cause `kubeadm upgrade apply` to exit with an error and not perform an upgrade.
{{</ note >}} {{</ note >}}
- Choose a version to upgrade to, and run the appropriate command. For example: - Choose a version to upgrade to, and run the appropriate command. For example:
@@ -149,13 +153,13 @@ Failing to do so will cause `kubeadm upgrade apply` to exit with an error and no
Same as the first control plane node but use: Same as the first control plane node but use:
``` ```shell
sudo kubeadm upgrade node sudo kubeadm upgrade node
``` ```
instead of: instead of:
``` ```shell
sudo kubeadm upgrade apply sudo kubeadm upgrade apply
``` ```
@@ -174,19 +178,23 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no
- Upgrade the kubelet and kubectl: - Upgrade the kubelet and kubectl:
{{< tabs name="k8s_install_kubelet" >}} {{< tabs name="k8s_install_kubelet" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu, Debian or HypriotOS" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-00 with the latest patch version # replace x in {{< skew currentVersion >}}.x-00 with the latest patch version
apt-mark unhold kubelet kubectl && \ apt-mark unhold kubelet kubectl && \
apt-get update && apt-get install -y kubelet={{< skew currentVersion >}}.x-00 kubectl={{< skew currentVersion >}}.x-00 && \ apt-get update && apt-get install -y kubelet={{< skew currentVersion >}}.x-00 kubectl={{< skew currentVersion >}}.x-00 && \
apt-mark hold kubelet kubectl apt-mark hold kubelet kubectl
{{% /tab %}} ```
{{% tab name="CentOS, RHEL or Fedora" %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-0 with the latest patch version # replace x in {{< skew currentVersion >}}.x-0 with the latest patch version
yum install -y kubelet-{{< skew currentVersion >}}.x-0 kubectl-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes yum install -y kubelet-{{< skew currentVersion >}}.x-0 kubectl-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes
{{% /tab %}} ```
{{< /tabs >}} {{% /tab %}}
<br /> {{< /tabs >}}
<br />
- Restart the kubelet: - Restart the kubelet:
@@ -213,18 +221,22 @@ without compromising the minimum required capacity for running your workloads.
- Upgrade kubeadm: - Upgrade kubeadm:
{{< tabs name="k8s_install_kubeadm_worker_nodes" >}} {{< tabs name="k8s_install_kubeadm_worker_nodes" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu, Debian or HypriotOS" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-00 with the latest patch version # replace x in {{< skew currentVersion >}}.x-00 with the latest patch version
apt-mark unhold kubeadm && \ apt-mark unhold kubeadm && \
apt-get update && apt-get install -y kubeadm={{< skew currentVersion >}}.x-00 && \ apt-get update && apt-get install -y kubeadm={{< skew currentVersion >}}.x-00 && \
apt-mark hold kubeadm apt-mark hold kubeadm
{{% /tab %}} ```
{{% tab name="CentOS, RHEL or Fedora" %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-0 with the latest patch version # replace x in {{< skew currentVersion >}}.x-0 with the latest patch version
yum install -y kubeadm-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes yum install -y kubeadm-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes
{{% /tab %}} ```
{{< /tabs >}} {{% /tab %}}
{{< /tabs >}}
### Call "kubeadm upgrade" ### Call "kubeadm upgrade"
@@ -247,19 +259,22 @@ without compromising the minimum required capacity for running your workloads.
- Upgrade the kubelet and kubectl: - Upgrade the kubelet and kubectl:
{{< tabs name="k8s_kubelet_and_kubectl" >}} {{< tabs name="k8s_kubelet_and_kubectl" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu, Debian or HypriotOS" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-00 with the latest patch version # replace x in {{< skew currentVersion >}}.x-00 with the latest patch version
apt-mark unhold kubelet kubectl && \ apt-mark unhold kubelet kubectl && \
apt-get update && apt-get install -y kubelet={{< skew currentVersion >}}.x-00 kubectl={{< skew currentVersion >}}.x-00 && \ apt-get update && apt-get install -y kubelet={{< skew currentVersion >}}.x-00 kubectl={{< skew currentVersion >}}.x-00 && \
apt-mark hold kubelet kubectl apt-mark hold kubelet kubectl
{{% /tab %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}} {{% tab name="CentOS, RHEL or Fedora" %}}
```shell
# replace x in {{< skew currentVersion >}}.x-0 with the latest patch version # replace x in {{< skew currentVersion >}}.x-0 with the latest patch version
yum install -y kubelet-{{< skew currentVersion >}}.x-0 kubectl-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes yum install -y kubelet-{{< skew currentVersion >}}.x-0 kubectl-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes
{{% /tab %}} ```
{{< /tabs >}} {{% /tab %}}
<br /> {{< /tabs >}}
<br />
- Restart the kubelet: - Restart the kubelet:
@@ -279,8 +294,8 @@ without compromising the minimum required capacity for running your workloads.
## Verify the status of the cluster ## Verify the status of the cluster
After the kubelet is upgraded on all nodes verify that all nodes are available again by running the following command After the kubelet is upgraded on all nodes verify that all nodes are available again by running
from anywhere kubectl can access the cluster: the following command from anywhere kubectl can access the cluster:
```shell ```shell
kubectl get nodes kubectl get nodes
@@ -296,6 +311,7 @@ This command is idempotent and eventually makes sure that the actual state is th
To recover from a bad state, you can also run `kubeadm upgrade apply --force` without changing the version that your cluster is running. To recover from a bad state, you can also run `kubeadm upgrade apply --force` without changing the version that your cluster is running.
During upgrade kubeadm writes the following backup folders under `/etc/kubernetes/tmp`: During upgrade kubeadm writes the following backup folders under `/etc/kubernetes/tmp`:
- `kubeadm-backup-etcd-<date>-<time>` - `kubeadm-backup-etcd-<date>-<time>`
- `kubeadm-backup-manifests-<date>-<time>` - `kubeadm-backup-manifests-<date>-<time>`
@@ -334,3 +350,4 @@ and post-upgrade manifest file for a certain component, a backup file for it wil
- Fetches the kubeadm `ClusterConfiguration` from the cluster. - Fetches the kubeadm `ClusterConfiguration` from the cluster.
- Upgrades the kubelet configuration for this node. - Upgrades the kubelet configuration for this node.