Merge pull request #38 from volcano-sh/bug/fix_schedulr_issue

Add ConfigMap for scheduler chart

Author: Klaus Ma

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

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

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())