From 481aa2cce066996fe9fbcf2d8257d32e3b009a5a Mon Sep 17 00:00:00 2001
From: Wei Huang <hweicdl@gmail.com>
Date: Thu, 9 Jul 2020 17:48:17 -0700
Subject: [PATCH] Remove the "How to disable preemption" stanza and rewordings

---
 .../configuration/pod-priority-preemption.md  | 30 -------------------
 .../scheduling-framework.md                   | 10 +++----
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/content/en/docs/concepts/configuration/pod-priority-preemption.md b/content/en/docs/concepts/configuration/pod-priority-preemption.md
index 65a4bc4f35..fbc89035da 100644
--- a/content/en/docs/concepts/configuration/pod-priority-preemption.md
+++ b/content/en/docs/concepts/configuration/pod-priority-preemption.md
@@ -51,36 +51,6 @@ Kubernetes already ships with two PriorityClasses:
 These are common classes and are used to [ensure that critical components are always scheduled first](/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/).
 {{< /note >}}
 
-## How to disable preemption
-
-{{< caution >}}
-Critical pods rely on scheduler preemption to be scheduled when a cluster
-is under resource pressure. For this reason, it is not recommended to
-disable preemption.
-{{< /caution >}}
-
-{{< note >}}
-In Kubernetes 1.15 and later, if the feature `NonPreemptingPriority` is enabled,
-PriorityClasses have the option to set `preemptionPolicy: Never`.
-This will prevent pods of that PriorityClass from preempting other pods.
-{{< /note >}}
-
-Starting from Kubernetes 1.19, Preemption is controlled by a kube-scheduler
-plugin: `DefaultPreemption`, which is enabled by default.
-If you want to disable preemption despite the above note, below is a sample
-component config:
-
-```yaml
-apiVersion: kubescheduler.config.k8s.io/v1beta1
-kind: KubeSchedulerConfiguration
-profiles:
-  - schedulerName: default-scheduler
-    plugins:
-      postFilter:
-        disabled:
-        - name: DefaultPreemption
-```
-
 ## PriorityClass
 
 A PriorityClass is a non-namespaced object that defines a mapping from a
diff --git a/content/en/docs/concepts/scheduling-eviction/scheduling-framework.md b/content/en/docs/concepts/scheduling-eviction/scheduling-framework.md
index 1a81914fd9..5f471b013f 100644
--- a/content/en/docs/concepts/scheduling-eviction/scheduling-framework.md
+++ b/content/en/docs/concepts/scheduling-eviction/scheduling-framework.md
@@ -77,11 +77,11 @@ called for that node. Nodes may be evaluated concurrently.
 
 ### PostFilter {#post-filter}
 
-These plugins are called after Filter phase, but only when there is no feasible
-node. Each plugin is called by their configured order. If any postFilter plugin
-marks the node as `Schedulable`, the remaining plugins will not be called.
-A typical PostFilter implementation is preemption, which tries to make the pod
-schedulable by preempting other Pods.
+These plugins are called after Filter phase, but only when no feasible nodes
+were found for the node. Plugins are called called in their configured order. If
+any postFilter plugin marks the node as `Schedulable`, the remaining plugins
+will not be called. A typical PostFilter implementation is preemption, which
+tries to make the pod schedulable by preempting other Pods.
 
 ### PreScore {#pre-score}