Skip to content

Commit 0a14853

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #824 from shkrid/priorityclassname
allow priorityClassName to be configured in Helm chart
2 parents be7f71f + 36b6708 commit 0a14853

File tree

4 files changed

+52
-40
lines changed

4 files changed

+52
-40
lines changed

‎manifests/install/charts/as-a-second-scheduler/README.md‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,25 @@ scheduler-plugins-scheduler 1/1 1 1 7s
4444

4545
The following table lists the configurable parameters of the as-a-second-scheduler chart and their default values.
4646

47-
| Parameter | Description | Default |
48-
|---------------------------|-----------------------------|-------------------------------------------------------------------------------------------------|
49-
| `scheduler.name` | Scheduler name | `scheduler-plugins-scheduler` |
50-
| `scheduler.image` | Scheduler image | `registry.k8s.io/scheduler-plugins/kube-scheduler:v0.30.6` |
51-
| `scheduler.command` | Scheduler command | `["/bin/kube-scheduler"]` |
52-
| `scheduler.leaderElect` | Scheduler leaderElection | `false` |
53-
| `scheduler.replicaCount` | Scheduler replicaCount | `1` |
54-
| `scheduler.resources` | Scheduler resources | `{}` |
55-
| `scheduler.nodeSelector` | Scheduler nodeSelector | `{}` |
56-
| `scheduler.affinity` | Scheduler affinity | `{}` |
57-
| `scheduler.tolerations` | Scheduler tolerations | `[]` |
58-
| `controller.name` | Controller name | `scheduler-plugins-controller` |
59-
| `controller.image` | Controller image | `registry.k8s.io/scheduler-plugins/controller:v0.29.7` |
60-
| `controller.replicaCount` | Controller replicaCount | `1` |
61-
s| `controller.resources` | Controller resources | `{}` |
62-
| `controller.nodeSelector` | Controller nodeSelector | `{}` |
63-
| `controller.affinity` | Controller affinity | `{}` |
64-
| `controller.tolerations` | Controller tolerations | `[]` |
65-
| `plugins.enabled` | Plugins enabled by default | `["Coscheduling","CapacityScheduling","NodeResourceTopologyMatch", "NodeResourcesAllocatable"]` |
66-
| `plugins.disabled` | Plugins disabled by default | `["PrioritySort"]` |
47+
| Parameter | Description | Default |
48+
|--------------------------------|------------------------------|-------------------------------------------------------------------------------------------------|
49+
| `scheduler.name` | Scheduler name | `scheduler-plugins-scheduler` |
50+
| `scheduler.image` | Scheduler image | `registry.k8s.io/scheduler-plugins/kube-scheduler:v0.30.6` |
51+
| `scheduler.command` | Scheduler command | `["/bin/kube-scheduler"]` |
52+
| `scheduler.leaderElect` | Scheduler leaderElection | `false` |
53+
| `scheduler.replicaCount` | Scheduler replicaCount | `1` |
54+
| `scheduler.priorityClassName` | Scheduler priorityClassName | `""` |
55+
| `scheduler.resources` | Scheduler resources | `{}` |
56+
| `scheduler.nodeSelector` | Scheduler nodeSelector | `{}` |
57+
| `scheduler.affinity` | Scheduler affinity | `{}` |
58+
| `scheduler.tolerations` | Scheduler tolerations | `[]` |
59+
| `controller.name` | Controller name | `scheduler-plugins-controller` |
60+
| `controller.image` | Controller image | `registry.k8s.io/scheduler-plugins/controller:v0.29.7` |
61+
| `controller.replicaCount` | Controller replicaCount | `1` |
62+
| `controller.priorityClassName` | Controller priorityClassName | `""` |
63+
| `controller.resources` | Controller resources | `{}` |
64+
| `controller.nodeSelector` | Controller nodeSelector | `{}` |
65+
| `controller.affinity` | Controller affinity | `{}` |
66+
| `controller.tolerations` | Controller tolerations | `[]` |
67+
| `plugins.enabled` | Plugins enabled by default | `["Coscheduling","CapacityScheduling","NodeResourceTopologyMatch", "NodeResourcesAllocatable"]` |
68+
| `plugins.disabled` | Plugins disabled by default | `["PrioritySort"]` |

‎manifests/install/charts/as-a-second-scheduler/templates/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ spec:
1515
labels:
1616
app: scheduler-plugins-controller
1717
spec:
18+
{{- with .Values.controller.priorityClassName }}
19+
priorityClassName: {{ . }}
20+
{{- end }}
1821
serviceAccountName: {{ .Values.controller.name }}
1922
containers:
2023
- name: scheduler-plugins-controller
@@ -51,6 +54,9 @@ spec:
5154
labels:
5255
component: scheduler
5356
spec:
57+
{{- with .Values.scheduler.priorityClassName }}
58+
priorityClassName: {{ . }}
59+
{{- end }}
5460
serviceAccountName: {{ .Values.scheduler.name }}
5561
containers:
5662
- command: {{- toYaml .Values.scheduler.command | nindent 8 }}

‎manifests/install/charts/as-a-second-scheduler/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ scheduler:
99
- /bin/kube-scheduler
1010
replicaCount: 1
1111
leaderElect: false
12+
priorityClassName: ""
1213
resources: {}
1314
nodeSelector: {}
1415
affinity: {}
@@ -18,6 +19,7 @@ controller:
1819
name: scheduler-plugins-controller
1920
image: registry.k8s.io/scheduler-plugins/controller:v0.30.6
2021
replicaCount: 1
22+
priorityClassName: ""
2123
resources: {}
2224
nodeSelector: {}
2325
affinity: {}

‎site/content/en/docs/user-guide/installing-the-chart.md‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,25 @@ scheduler-plugins-scheduler 1/1 1 1 7s
4949

5050
The following table lists the configurable parameters of the as-a-second-scheduler chart and their default values.
5151

52-
| Parameter | Description | Default |
53-
|---------------------------|-----------------------------|-------------------------------------------------------------------------------------------------|
54-
| `scheduler.name` | Scheduler name | `scheduler-plugins-scheduler` |
55-
| `scheduler.image` | Scheduler image | `registry.k8s.io/scheduler-plugins/kube-scheduler:v0.30.6` |
56-
| `scheduler.command` | Scheduler command | `["/bin/kube-scheduler"]` |
57-
| `scheduler.leaderElect` | Scheduler leaderElection | `false` |
58-
| `scheduler.replicaCount` | Scheduler replicaCount | `1` |
59-
| `scheduler.resources` | Scheduler resources | `{}` |
60-
| `scheduler.nodeSelector` | Scheduler nodeSelector | `{}` |
61-
| `scheduler.affinity` | Scheduler affinity | `{}` |
62-
| `scheduler.tolerations` | Scheduler tolerations | `[]` |
63-
| `controller.name` | Controller name | `scheduler-plugins-controller` |
64-
| `controller.image` | Controller image | `registry.k8s.io/scheduler-plugins/controller:v0.29.7` |
65-
| `controller.replicaCount` | Controller replicaCount | `1` |
66-
| `controller.resources` | Controller resources | `{}` |
67-
| `controller.nodeSelector` | Controller nodeSelector | `{}` |
68-
| `controller.affinity` | Controller affinity | `{}` |
69-
| `controller.tolerations` | Controller tolerations | `[]` |
70-
| `plugins.enabled` | Plugins enabled by default | `["Coscheduling","CapacityScheduling","NodeResourceTopologyMatch", "NodeResourcesAllocatable"]` |
71-
| `plugins.disabled` | Plugins disabled by default | `["PrioritySort"]` |
52+
| Parameter | Description | Default |
53+
|--------------------------------|------------------------------|-------------------------------------------------------------------------------------------------|
54+
| `scheduler.name` | Scheduler name | `scheduler-plugins-scheduler` |
55+
| `scheduler.image` | Scheduler image | `registry.k8s.io/scheduler-plugins/kube-scheduler:v0.30.6` |
56+
| `scheduler.command` | Scheduler command | `["/bin/kube-scheduler"]` |
57+
| `scheduler.leaderElect` | Scheduler leaderElection | `false` |
58+
| `scheduler.replicaCount` | Scheduler replicaCount | `1` |
59+
| `scheduler.priorityClassName` | Scheduler priorityClassName | `""` |
60+
| `scheduler.resources` | Scheduler resources | `{}` |
61+
| `scheduler.nodeSelector` | Scheduler nodeSelector | `{}` |
62+
| `scheduler.affinity` | Scheduler affinity | `{}` |
63+
| `scheduler.tolerations` | Scheduler tolerations | `[]` |
64+
| `controller.name` | Controller name | `scheduler-plugins-controller` |
65+
| `controller.image` | Controller image | `registry.k8s.io/scheduler-plugins/controller:v0.29.7` |
66+
| `controller.replicaCount` | Controller replicaCount | `1` |
67+
| `controller.priorityClassName` | Controller priorityClassName | `""` |
68+
| `controller.resources` | Controller resources | `{}` |
69+
| `controller.nodeSelector` | Controller nodeSelector | `{}` |
70+
| `controller.affinity` | Controller affinity | `{}` |
71+
| `controller.tolerations` | Controller tolerations | `[]` |
72+
| `plugins.enabled` | Plugins enabled by default | `["Coscheduling","CapacityScheduling","NodeResourceTopologyMatch", "NodeResourcesAllocatable"]` |
73+
| `plugins.disabled` | Plugins disabled by default | `["PrioritySort"]` |

0 commit comments

Comments
 (0)