From 6b610b8e33e8f02aaacced0cfee01009dd687424 Mon Sep 17 00:00:00 2001 From: Jacob Valdemar Date: Sun, 19 Sep 2021 17:55:11 +0200 Subject: [PATCH 1/5] Remove prefixed spaces in code environment --- .../kubeadm/kubeadm-upgrade.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md index da07ed672e..d3b2fd9c07 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md @@ -166,11 +166,10 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no ### Upgrade kubelet and kubectl -- Upgrade the kubelet and kubectl +- Upgrade the kubelet and kubectl: -{{< tabs name="k8s_install_kubelet" >}} -{{< tab name="Ubuntu, Debian or HypriotOS" >}} - 
+{{< tabs name="k8s_kubelet_and_kubectl" >}}
+{{% tab name="Ubuntu, Debian or HypriotOS" %}}
     # replace x in {{< skew latestVersion >}}.x-00 with the latest patch version
     apt-mark unhold kubelet kubectl && \
     apt-get update && apt-get install -y kubelet={{< skew latestVersion >}}.x-00 kubectl={{< skew latestVersion >}}.x-00 && \
@@ -179,14 +178,11 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no
     # since apt-get version 1.1 you can also use the following method
     apt-get update && \
     apt-get install -y --allow-change-held-packages kubelet={{< skew latestVersion >}}.x-00 kubectl={{< skew latestVersion >}}.x-00
-
-{{< /tab >}} -{{< tab name="CentOS, RHEL or Fedora" >}} - 
+{{% /tab %}}
+{{% tab name="CentOS, RHEL or Fedora" %}}
     # replace x in {{< skew latestVersion >}}.x-0 with the latest patch version
     yum install -y kubelet-{{< skew latestVersion >}}.x-0 kubectl-{{< skew latestVersion >}}.x-0 --disableexcludes=kubernetes
-
-{{< /tab >}} +{{% /tab %}} {{< /tabs >}} - Restart the kubelet: From 483779104b88b4297b2967d5a66c5f7ec5c8887a Mon Sep 17 00:00:00 2001 From: Jacob Valdemar Date: Sun, 19 Sep 2021 18:01:51 +0200 Subject: [PATCH 2/5] Undo accidental change to tabs name --- .../en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md index d3b2fd9c07..f855c2be5c 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md @@ -168,7 +168,7 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no - Upgrade the kubelet and kubectl: -{{< tabs name="k8s_kubelet_and_kubectl" >}} +{{< tabs name="k8s_install_kubelet" >}} {{% tab name="Ubuntu, Debian or HypriotOS" %}} # replace x in {{< skew latestVersion >}}.x-00 with the latest patch version apt-mark unhold kubelet kubectl && \ From cc8bda3f410cfe51f2d04060a6e1da2389b24f98 Mon Sep 17 00:00:00 2001 From: Jacob Valdemar Date: Sun, 19 Sep 2021 22:07:09 +0200 Subject: [PATCH 3/5] Add another newline after the tab widgets --- .../docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md index f855c2be5c..288852cd1f 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md @@ -89,6 +89,7 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc {{% /tab %}} {{< /tabs >}} + - Verify that the download works and has the expected version: ```shell @@ -185,6 +186,7 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no {{% /tab %}} {{< /tabs >}} + - Restart the kubelet: ```shell @@ -265,6 +267,7 @@ without compromising the minimum required capacity for running your workloads. {{% /tab %}} {{< /tabs >}} + - Restart the kubelet: ```shell From 2cac383a7c373611f23804febc78edba49977d54 Mon Sep 17 00:00:00 2001 From: Jacob Valdemar Date: Sun, 19 Sep 2021 22:17:40 +0200 Subject: [PATCH 4/5] Undo "Add another newline after the tab widgets" --- .../docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md index 288852cd1f..f855c2be5c 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md @@ -89,7 +89,6 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc {{% /tab %}} {{< /tabs >}} - - Verify that the download works and has the expected version: ```shell @@ -186,7 +185,6 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no {{% /tab %}} {{< /tabs >}} - - Restart the kubelet: ```shell @@ -267,7 +265,6 @@ without compromising the minimum required capacity for running your workloads. {{% /tab %}} {{< /tabs >}} - - Restart the kubelet: ```shell From c724a097bdbfdae8ccbd9f066896f56d89621d08 Mon Sep 17 00:00:00 2001 From: Jacob Valdemar Date: Tue, 21 Sep 2021 07:09:11 +0200 Subject: [PATCH 5/5] Add Line Break element after tab widget --- .../docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md index ad3587ad41..4cc9d1445b 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md @@ -88,6 +88,7 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc yum install -y kubeadm-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} +
- Verify that the download works and has the expected version: @@ -184,6 +185,7 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no yum install -y kubelet-{{< skew currentVersion >}}.x-0 kubectl-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} +
- Restart the kubelet: @@ -264,6 +266,7 @@ without compromising the minimum required capacity for running your workloads. yum install -y kubelet-{{< skew currentVersion >}}.x-0 kubectl-{{< skew currentVersion >}}.x-0 --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} +
- Restart the kubelet: