From 52073165cbd08a42b6b7b0676d658f2e2b7c4ee9 Mon Sep 17 00:00:00 2001 From: 839 <8398a7@gmail.com> Date: Thu, 20 Jun 2019 05:02:20 +0900 Subject: [PATCH] update the upgrade method of kubelet / kubectl of worker nodes (#14871) * [#14870] update the upgrade method of kubelet / kubectl of worker nodes * [#14870] add link of how to update from 1.13 to 1.14 --- .../en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md | 3 ++- .../tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14.md | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md index 5c2300214b..2e9b9613e5 100644 --- a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md +++ b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md @@ -22,7 +22,8 @@ For more version-specific upgrade guidance, see the following resources: * [1.10 to 1.11 upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11/) * [1.11 to 1.12 upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12/) * [1.12 to 1.13 upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-13/) - + * [1.13 to 1.14 upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14/) + _For older versions, please refer to older documentation sets on the Kubernetes website._ In Kubernetes v1.11.0 and later, you can use `kubeadm upgrade diff` to see the changes that would be diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14.md index 6df1d9d0a9..014ac86383 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14.md @@ -316,8 +316,9 @@ without compromising the minimum required capacity for running your workloads. {{< tabs name="k8s_kubelet_and_kubectl" >}} {{% tab name="Ubuntu, Debian or HypriotOS" %}} # replace x in 1.14.x-00 with the latest patch version - apt-get update - apt-get install -y kubelet=1.14.x-00 kubectl=1.14.x-00 + apt-mark unhold kubelet kubectl && \ + apt-get update && apt-get install -y kubelet=1.14.x-00 kubectl=1.14.x-00 && \ + apt-mark hold kubelet kubectl {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} # replace x in 1.14.x-0 with the latest patch version