From 07960aeb6f31d0cc4e1110ab8a0b07d78926ac26 Mon Sep 17 00:00:00 2001 From: Linus Lee <708863861@qq.com> Date: Sun, 24 Feb 2019 12:56:25 +0800 Subject: [PATCH 1/4] 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. --- .../tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 314b5cde7065b..1db5408d3e6f1 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 @@ -44,7 +44,7 @@ This page explains how to upgrade a Kubernetes cluster created with `kubeadm` fr apt-mark hold kubeadm {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} - yum upgrade -y kubeadm --disableexcludes=kubernetes + yum upgrade -y kubeadm-1.12.5 --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} From 5d5591c1b1f6880eb7afecb832b0c6ab195eca12 Mon Sep 17 00:00:00 2001 From: Linus Lee <708863861@qq.com> Date: Sun, 24 Feb 2019 13:05:40 +0800 Subject: [PATCH 2/4] Update kubeadm-upgrade-1-12.md --- .../tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1db5408d3e6f1..82ad072e98216 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 @@ -44,7 +44,8 @@ This page explains how to upgrade a Kubernetes cluster created with `kubeadm` fr apt-mark hold kubeadm {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} - yum upgrade -y kubeadm-1.12.5 --disableexcludes=kubernetes + # replace "x" with the latest patch version + yum upgrade -y kubeadm-1.12.x --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} From b2abf4440d543f16eeb6240fe999122cde23112d Mon Sep 17 00:00:00 2001 From: Linus Lee <708863861@qq.com> Date: Sun, 24 Feb 2019 13:09:13 +0800 Subject: [PATCH 3/4] Update kubeadm-upgrade-1-12.md --- .../tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 82ad072e98216..7772220a8d928 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 @@ -235,7 +235,8 @@ This page explains how to upgrade a Kubernetes cluster created with `kubeadm` fr apt-get upgrade -y kubelet kubeadm {{% /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 >}} From 7a424f3221521606130c7c2424e26d766eeb4946 Mon Sep 17 00:00:00 2001 From: Linus Lee <708863861@qq.com> Date: Sun, 24 Feb 2019 13:35:19 +0800 Subject: [PATCH 4/4] Update kubeadm-upgrade-1-12.md --- .../administer-cluster/kubeadm/kubeadm-upgrade-1-12.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 7772220a8d928..fa8831a92ca05 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,8 +39,9 @@ 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" %}} @@ -231,8 +232,9 @@ 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" %}} # replace "x" with the latest patch version