diff --git a/installer/chart/volcano/config/kube-batch.conf b/installer/chart/volcano/config/kube-batch.conf new file mode 100644 index 0000000000..25df16501b --- /dev/null +++ b/installer/chart/volcano/config/kube-batch.conf @@ -0,0 +1,9 @@ +actions: "reclaim, allocate, backfill, preempt" +tiers: +- plugins: + - name: priority + - name: gang +- plugins: + - name: drf + - name: predicates + - name: proportion diff --git a/installer/chart/volcano/templates/scheduler.yaml b/installer/chart/volcano/templates/scheduler.yaml index 1e51377de5..8a4423316a 100644 --- a/installer/chart/volcano/templates/scheduler.yaml +++ b/installer/chart/volcano/templates/scheduler.yaml @@ -1,4 +1,11 @@ apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-scheduler-configmap +data: + {{- (.Files.Glob "config/*").AsConfig | nindent 2 }} +--- +apiVersion: v1 kind: ServiceAccount metadata: name: {{ .Release.Name }}-scheduler @@ -89,11 +96,18 @@ spec: spec: serviceAccount: {{ .Release.Name }}-scheduler containers: - - name: {{ .Release.Name }}-scheduler - image: {{.Values.basic.scheduler_image_name}}:{{.Values.basic.image_tag_version}} - args: - - --alsologtostderr - - -v=2 - - 2>&1 - imagePullPolicy: "IfNotPresent" - + - name: {{ .Release.Name }}-scheduler + image: {{.Values.basic.scheduler_image_name}}:{{.Values.basic.image_tag_version}} + args: + - --alsologtostderr + - --scheduler-conf=/volcano.scheduler/kube-batch.conf + - -v=3 + - 2>&1 + imagePullPolicy: "IfNotPresent" + volumeMounts: + - name: scheduler-config + mountPath: /volcano.scheduler + volumes: + - name: scheduler-config + configMap: + name: {{ .Release.Name }}-scheduler-configmap diff --git a/test/e2e/job_scheduling.go b/test/e2e/job_scheduling.go index 83a7796909..e7a6d4e161 100644 --- a/test/e2e/job_scheduling.go +++ b/test/e2e/job_scheduling.go @@ -196,16 +196,16 @@ var _ = Describe("Job E2E Test", func() { }, } - job.name = "preemptee-qj" + job.name = "multipreemptee-qj" job1 := createJob(context, job) err := waitTasksReady(context, job1, int(rep)) Expect(err).NotTo(HaveOccurred()) - job.name = "preemptor-qj1" + job.name = "multipreemptor-qj1" job2 := createJob(context, job) Expect(err).NotTo(HaveOccurred()) - job.name = "preemptor-qj2" + job.name = "multipreemptor-qj2" job3 := createJob(context, job) Expect(err).NotTo(HaveOccurred())