Merge pull request #26005 from mburke5678/BZ-1879382

Documentation gives example of deprecated priorityClass configuration apiVersion

Author: mburke5678

modules/nodes-pods-priority-about.adoc

@@ -22,10 +22,10 @@ $ oc get priorityclasses
 .Example output
 [source,terminal]
 ----
-NAME                      CREATED AT
-cluster-logging           2019-03-13T14:45:12Z
-system-cluster-critical   2019-03-13T14:01:10Z
-system-node-critical      2019-03-13T14:01:10Z
+NAME                      VALUE        GLOBAL-DEFAULT   AGE
+cluster-logging           1000000      false            29s
+system-cluster-critical   2000000000   false            72m
+system-node-critical      2000001000   false            72m
 ----
 
 * *system-node-critical* - This priority class has a value of 2000001000 and is used for all pods that should never be evicted from a node. Examples of pods that have this priority class are `sdn-ovs`, `sdn`, and so forth. A number of critical components include the `system-node-critical` priority class by default, for example:

modules/nodes-pods-priority-configuring.adoc

@@ -11,7 +11,7 @@ You apply pod priority and preemption by creating a priority class object and as
 .Sample priority class object
 [source,yaml]
 ----
-apiVersion: scheduling.k8s.io/v1beta1
+apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
   name: high-priority <1>

modules/nodes-pods-priority-disabling.adoc

@@ -11,7 +11,6 @@ Pod priority also affects the scheduling order of pods and out-of-resource evict
 
 To use priority and preemption, you create priority classes that define the relative weight of your pods. Then, reference a priority class in the pod specification to apply that weight for scheduling.
 
-Preemption is controlled by the `disablePreemption` parameter in the scheduler configuration file, which is set to `false` by default.
 
 
 // The following include statements pull in the module files that comprise
@@ -25,5 +24,4 @@ include::modules/nodes-pods-priority-preempt-about.adoc[leveloffset=+1]
 
 include::modules/nodes-pods-priority-configuring.adoc[leveloffset=+1]
 
-include::modules/nodes-pods-priority-disabling.adoc[leveloffset=+1]