Merge remote-tracking branch 'upstream/master' into dev-1.20 to keep in sync - 11-25-2020

2020-11-25 07:03:22 -08:00
parent 6fa3e91eb8 b4df624a5e
commit d8ae37587e
139 changed files with 6562 additions and 5229 deletions
@@ -321,9 +321,7 @@ Pod may be created that fits on the same Node. In this case, the scheduler will
 schedule the higher priority Pod instead of the preemptor.

 This is expected behavior: the Pod with the higher priority should take the place
-of a Pod with a lower priority. Other controller actions, such as
-[cluster autoscaling](/docs/tasks/administer-cluster/cluster-management/#cluster-autoscaling),
-may eventually provide capacity to schedule the pending Pods.
+of a Pod with a lower priority.

 ### Higher priority Pods are preempted before lower priority pods