Merge pull request kubernetes#27947 from shannonxtreme/priority-move

Move Priority and Preemption to Scheduling section
TonyGorman · May 11, 2021 · e751578 · e751578
2 parents 434ef0f + 8b0f264
commit e751578
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/content/en/docs/concepts/scheduling-eviction/_index.md b/content/en/docs/concepts/scheduling-eviction/_index.md
@@ -1,8 +1,11 @@
 ---
-title: "Scheduling and Eviction"
+title: "Scheduling, Preemption and Eviction"
 weight: 90
 description: >
-  In Kubernetes, scheduling refers to making sure that Pods are matched to Nodes so that the kubelet can run them.
-  Eviction is the process of proactively failing one or more Pods on resource-starved Nodes.
+  In Kubernetes, scheduling refers to making sure that Pods are matched to Nodes
+  so that the kubelet can run them. Preemption is the process of terminating 
+  Pods with lower Priority so that Pods with higher Priority can schedule on 
+  Nodes. Eviction is the process of proactively terminating one or more Pods on
+  resource-starved Nodes.
 ---
 
diff --git a/.../configuration/pod-priority-preemption.md → ...uling-eviction/pod-priority-preemption.md b/.../configuration/pod-priority-preemption.md → ...uling-eviction/pod-priority-preemption.md
diff --git a/static/_redirects b/static/_redirects
@@ -111,6 +111,7 @@
 /id/docs/concepts/configuration/scheduling-framework/     /id/docs/concepts/scheduling-eviction/scheduling-framework/    301
 /docs/concepts/configuration/taint-and-toleration/     /docs/concepts/scheduling-eviction/taint-and-toleration/ 301
 /id/docs/concepts/configuration/taint-and-toleration/     /id/docs/concepts/scheduling-eviction/taint-and-toleration/ 301
+/docs/concepts/configuration/pod-priority-preemption/    /docs/concepts/scheduling-eviction/pod-priority-preemption/ 301
 /docs/concepts/extend-kubernetes/extend-cluster/      /docs/concepts/extend-kubernetes/ 301
 /docs/concepts/jobs/cron-jobs/     /docs/concepts/workloads/controllers/cron-jobs/ 301
 /docs/concepts/jobs/run-to-completion-finite-workloads/      /docs/concepts/workloads/controllers/job/ 301