Merge pull request #680 from lianghao208/doc_v1beta3

docs: update the version of scheduler config and use MultiPoint to simplify them

Author: k8s-ci-robot

manifests/appgroup/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false
@@ -7,23 +7,17 @@ clientConnection:
 profiles:
 - schedulerName: network-aware-scheduler
   plugins:
+    multiPoint:
+      enabled:
+      - name: NetworkOverhead
+        weight: 5 # A higher weight is given to NetworkOverhead to favor allocation schemes with lower latency.
+      disabled:
+      - name: NodeResourcesFit # Preferably avoid the combination of NodeResourcesFit with NetworkOverhead
     queueSort:
       enabled:
       - name: TopologicalSort
       disabled:
       - name: "*"
-    preFilter:
-      enabled:
-        - name: NetworkOverhead
-    filter:
-      enabled:
-      - name: NetworkOverhead
-    score:
-      disabled: # Preferably avoid the combination of NodeResourcesFit with NetworkOverhead
-        - name: NodeResourcesFit
-      enabled: # A higher weight is given to NetworkOverhead to favor allocation schemes with lower latency.
-        - name: NetworkOverhead
-          weight: 5
   pluginConfig:
   - name: TopologicalSort
     args:

manifests/capacityscheduling/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false
@@ -7,14 +7,11 @@ clientConnection:
 profiles:
 - schedulerName: default-scheduler
   plugins:
-    preFilter:
+    multiPoint:
       enabled:
       - name: CapacityScheduling
     postFilter:
       enabled:
       - name: CapacityScheduling
       disabled:
       - name: "*"
-    reserve:
-      enabled:
-      - name: CapacityScheduling

manifests/coscheduling/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false
@@ -7,23 +7,14 @@ clientConnection:
 profiles:
 - schedulerName: default-scheduler
   plugins:
+    multiPoint:
+      enabled:
+      - name: Coscheduling
     queueSort:
       enabled:
       - name: Coscheduling
       disabled:
       - name: "*"
-    preFilter:
-      enabled:
-      - name: Coscheduling
-    postFilter:
-      enabled:
-      - name: Coscheduling
-    permit:
-      enabled:
-      - name: Coscheduling
-    reserve:
-      enabled:
-      - name: Coscheduling
   pluginConfig:
   - name: Coscheduling
     args:

manifests/networktopology/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false
@@ -7,23 +7,17 @@ clientConnection:
 profiles:
   - schedulerName: network-aware-scheduler
     plugins:
+      multiPoint:
+        enabled:
+          - name: NetworkOverhead
+            weight: 5 # A higher weight is given to NetworkOverhead to favor allocation schemes with lower latency.
+        disabled:
+          - name: NodeResourcesFit # Preferably avoid the combination of NodeResourcesFit with NetworkOverhead
       queueSort:
         enabled:
           - name: TopologicalSort
         disabled:
           - name: "*"
-      preFilter:
-        enabled:
-          - name: NetworkOverhead
-      filter:
-        enabled:
-          - name: NetworkOverhead
-      score:
-        disabled: # Preferably avoid the combination of NodeResourcesFit with NetworkOverhead
-          - name: NodeResourcesFit
-        enabled: # A higher weight is given to NetworkOverhead to favor allocation schemes with lower latency.
-          - name: NetworkOverhead
-            weight: 5
     pluginConfig:
       - name: TopologicalSort
         args:

manifests/noderesources/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false

manifests/noderesourcetopology/scheduler-configmap.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: kube-system
 data:
   scheduler-config.yaml: |
-      apiVersion: kubescheduler.config.k8s.io/v1beta3
+      apiVersion: kubescheduler.config.k8s.io/v1
       kind: KubeSchedulerConfiguration
       leaderElection:
         leaderElect: false
@@ -14,12 +14,12 @@ data:
       profiles:
         - schedulerName: topo-aware-scheduler
           plugins:
-            filter:
+            multiPoint:
               enabled:
-                - name: NodeResourceTopologyMatch
-            score:
-              enabled:
-                - name: NodeResourceTopologyMatch
+              - name: NodeResourceTopologyMatch
+            reserve:
+              disabled:
+              - name: NodeResourceTopologyMatch
           # optional plugin configs
           pluginConfig:
           - name: NodeResourceTopologyMatch

manifests/podstate/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false

pkg/capacityscheduling/README.md

@@ -16,7 +16,7 @@ This folder holds the capacity scheduling plugin implementations based on [Capac
 Example config:
 
 ```yaml
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false
@@ -25,17 +25,14 @@ clientConnection:
 profiles:
 - schedulerName: default-scheduler
   plugins:
-    preFilter:
+    multiPoint:
       enabled:
-      - name: CapacityScheduling
+        - name: CapacityScheduling
     postFilter:
       enabled:
       - name: CapacityScheduling
       disabled:
       - name: "*"
-    reserve:
-      enabled:
-      - name: CapacityScheduling
 ```
 
 ### ElasticQuota

pkg/coscheduling/README.md

@@ -49,7 +49,7 @@ Pods in the same PodGroup with different priorities might lead to unintended beh
 2. preFilter is enhanced feature to reduce the overall scheduling time for the whole group. It will check the total number of pods belonging to the same `PodGroup`. If the total number is less than minMember, the pod will reject in preFilter, then the scheduling cycle will interrupt. And the preFilter is user selectable according to the actual situation of users. If the minMember of PodGroup is relatively small, for example less than 5, you can disable this plugin. But if the minMember of PodGroup is relatively large, please enable this plugin to reduce the overall scheduling time.
 
 ```
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false
@@ -58,23 +58,14 @@ clientConnection:
 profiles:
 - schedulerName: default-scheduler
   plugins:
+    multiPoint:
+      enabled:
+      - name: Coscheduling
     queueSort:
       enabled:
       - name: Coscheduling
       disabled:
       - name: "*"
-    preFilter:
-      enabled:
-      - name: Coscheduling
-    postFilter:
-      enabled:
-      - name: Coscheduling
-    permit:
-      enabled:
-      - name: Coscheduling
-    reserve:
-      enabled:
-      - name: Coscheduling
 ```
 
 ### Demo

pkg/crossnodepreemption/README.md

@@ -30,7 +30,7 @@ a group of Pods.
 ## Example config:
 
 ```yaml
-apiVersion: kubescheduler.config.k8s.io/v1beta3
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: false