Merge master into dev-1.19 to keep in sync

2020-08-11 08:32:19 -05:00
parent d9784dc5b4 6b784ad586
commit 09d0f598fa
358 changed files with 16526 additions and 6800 deletions
@@ -27,11 +27,8 @@ The upgrade workflow at high level is the following:
 1. Upgrade additional control plane nodes.
 1. Upgrade worker nodes.

-
-
 ## {{% heading "prerequisites" %}}

-
 - You need to have a kubeadm Kubernetes cluster running version 1.18.0 or later.
 - [Swap must be disabled](https://serverfault.com/questions/684771/best-way-to-disable-swap-in-linux).
 - The cluster should use a static control plane and etcd pods or external etcd.
@@ -46,8 +43,6 @@ The upgrade workflow at high level is the following:
  or between PATCH versions of the same MINOR. That is, you cannot skip MINOR versions when you upgrade.
  For example, you can upgrade from 1.y to 1.y+1, but not from 1.y to 1.y+2.

-
-
 <!-- steps -->

 ## Determine which version to upgrade to