From 41e9273e0b570aa9463f113476bb6e149df311ef Mon Sep 17 00:00:00 2001 From: liz Date: Fri, 13 Jul 2018 15:19:07 -0400 Subject: [PATCH] Keep packages back from package manager upgrades closes kubernetes/kubeadm#954 --- .../administer-cluster/kubeadm/kubeadm-upgrade-1-11.md | 2 +- content/en/docs/tasks/tools/install-kubeadm.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11.md index d9746c902d914..821d0631c6083 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11.md @@ -217,7 +217,7 @@ To keep `kube-dns`, pass `--feature-flags=CoreDNS=false` to `kubeadm upgrade app apt-get upgrade -y kubelet kubeadm {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} - yum upgrade -y kubelet kubeadm + yum upgrade -y kubelet kubeadm --disableexcludes=kubernetes {{% /tab %}} {{< /tabs >}} diff --git a/content/en/docs/tasks/tools/install-kubeadm.md b/content/en/docs/tasks/tools/install-kubeadm.md index 07e54f1762036..ab32a58ff6583 100644 --- a/content/en/docs/tasks/tools/install-kubeadm.md +++ b/content/en/docs/tasks/tools/install-kubeadm.md @@ -150,6 +150,11 @@ kubelet and the control plane is supported, but the kubelet version may never ex server version. For example, kubelets running 1.7.0 should be fully compatible with a 1.8.0 API server, but not vice versa. +{{< warning >}} +Kubeadm and Kubernetes components must be [carefully upgraded](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11/), +and should not be upgraded with other packages. These install instructions exclude all kubernetes packages from system upgrades. +{{}} + For more information on version skews, please read our [version skew policy](/docs/setup/independent/create-cluster-kubeadm/#version-skew-policy). @@ -163,6 +168,7 @@ deb http://apt.kubernetes.io/ kubernetes-xenial main EOF apt-get update apt-get install -y kubelet kubeadm kubectl +apt-mark hold kubelet kubeadm kubectl ``` {{% /tab %}} {{% tab name="CentOS, RHEL or Fedora" %}} @@ -175,6 +181,7 @@ enabled=1 gpgcheck=1 repo_gpgcheck=1 gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg +exclude=kube* EOF setenforce 0 yum install -y kubelet kubeadm kubectl