From 924d7642331d709eef10e22c0015efaa03482159 Mon Sep 17 00:00:00 2001 From: Linus Lee <708863861@qq.com> Date: Sun, 24 Feb 2019 22:14:42 -0600 Subject: [PATCH] Fix bugs about kubeadm upgrading. (#12809) * Fix bug about kubeadm upgrading It will lead to the following error if using `yum upgrade -y kubeadm --disableexcludes=kubernetes` command: Running `yum upgrade -y kubeadm --disableexcludes=kubernetes` command will upgrade the kubeadm to v1.13 but kubeadm v1.13 could not upgrade the v1.12 kubeadm cluster. * Update kubeadm-upgrade-1-12.md * Update kubeadm-upgrade-1-12.md * Update kubeadm-upgrade-1-12.md --- .../kubeadm/kubeadm-upgrade-1-12.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md index 314b5cde706..fa8831a92ca 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md @@ -39,12 +39,14 @@ This page explains how to upgrade a Kubernetes cluster created with `kubeadm` fr {{< tabs name="k8s_install" >}} {{% tab name="Ubuntu, Debian or HypriotOS" %}} + # replace "x" with the latest patch version apt-mark unhold kubeadm && \ - apt-get update && apt-get upgrade -y kubeadm && \ + apt-get update && apt-get upgrade -y kubeadm=1.12.x-00 && \ apt-mark hold kubeadm {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} - yum upgrade -y kubeadm --disableexcludes=kubernetes + # replace "x" with the latest patch version + yum upgrade -y kubeadm-1.12.x --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} @@ -230,11 +232,13 @@ This page explains how to upgrade a Kubernetes cluster created with `kubeadm` fr {{< tabs name="k8s_upgrade" >}} {{% tab name="Ubuntu, Debian or HypriotOS" %}} + # replace "x" with the latest patch version apt-get update - apt-get upgrade -y kubelet kubeadm + apt-get upgrade -y kubelet=1.12.x-00 kubeadm=1.12.x-00 {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} - yum upgrade -y kubelet kubeadm --disableexcludes=kubernetes + # replace "x" with the latest patch version + yum upgrade -y kubelet-1.12.x kubeadm-1.12.x --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}}