From 9a583931922170e8d42d8f5bca6315709abd5c37 Mon Sep 17 00:00:00 2001
From: karolflont <40664204+karolflont@users.noreply.github.com>
Date: Wed, 10 Jul 2019 05:24:25 +0200
Subject: [PATCH] Update kubeadm-upgrade-1-14.md (#15359)

Ubuntu 16.04.5 LTS
apt-mark unhold kubeadm && apt-get update && apt-get install -y kubeadm=1.14.x-00 && apt-mark hold kubeadm gives the below error
The following packages have unmet dependencies:
kubelet : Depends: kubernetes-cni (= 0.6.0) but 0.7.5-00 is to be installed
E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.

Unholding the kubelet with kubeadm fixes the problem.
---
 .../tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-14.md  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 014ac86383..b60071c3a2 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
@@ -68,7 +68,7 @@ are merged into a single document.
     {{< tabs name="k8s_install_kubeadm_first_cp" >}}
     {{% tab name="Ubuntu, Debian or HypriotOS" %}}
     # replace x in 1.14.x-00 with the latest patch version
-    apt-mark unhold kubeadm && \
+    apt-mark unhold kubeadm kubelet && \
     apt-get update && apt-get install -y kubeadm=1.14.x-00 && \
     apt-mark hold kubeadm
     {{% /tab %}}
@@ -272,7 +272,7 @@ without compromising the minimum required capacity for running your workloads.
     {{< tabs name="k8s_install_kubeadm_worker_nodes" >}}
     {{% tab name="Ubuntu, Debian or HypriotOS" %}}
     # replace x in 1.14.x-00 with the latest patch version
-    apt-mark unhold kubeadm && \
+    apt-mark unhold kubeadm kubelet && \
     apt-get update && apt-get install -y kubeadm=1.14.x-00 && \
     apt-mark hold kubeadm
     {{% /tab %}}