Merge pull request #207 from thandayuthapani/helm

Remove reclaim and preempt by default
volcano-sh · May 30, 2019 · 377781d · 377781d
2 parents b97746f + 9e43564
commit 377781d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh
@@ -63,7 +63,7 @@ function install-volcano {
   kind load docker-image ${MPI_EXAMPLE_IMAGE}  ${CLUSTER_CONTEXT}
 
   echo "Install volcano chart"
-  helm install installer/chart --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --wait
+  helm install installer/chart --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=kube-batch-ci.conf --wait
 }
 
 function uninstall-volcano {

diff --git a/installer/chart/config/kube-batch-ci.conf b/installer/chart/config/kube-batch-ci.conf
@@ -0,0 +1,11 @@
+actions: "enqueue, reclaim, allocate, backfill, preempt"
+tiers:
+- plugins:
+  - name: priority
+  - name: gang
+  - name: conformance
+- plugins:
+  - name: drf
+  - name: predicates
+  - name: proportion
+  - name: nodeorder
diff --git a/installer/chart/config/kube-batch.conf b/installer/chart/config/kube-batch.conf
@@ -1,4 +1,4 @@
-actions: "enqueue, reclaim, allocate, backfill, preempt"
+actions: "enqueue, allocate, backfill"
 tiers:
 - plugins:
   - name: priority

diff --git a/installer/chart/templates/scheduler.yaml b/installer/chart/templates/scheduler.yaml
@@ -102,7 +102,7 @@ spec:
           image: {{.Values.basic.scheduler_image_name}}:{{.Values.basic.image_tag_version}}
           args:
             - --alsologtostderr
-            - --scheduler-conf=/volcano.scheduler/kube-batch.conf
+            - --scheduler-conf=/volcano.scheduler/{{.Values.basic.scheduler_config_file}}
             - -v=3
             - 2>&1
           imagePullPolicy: "IfNotPresent"

diff --git a/installer/chart/values.yaml b/installer/chart/values.yaml
@@ -4,4 +4,5 @@ basic:
   scheduler_image_name: "volcanosh/vk-kube-batch"
   admission_image_name: "volcanosh/vk-admission"
   admission_secret_name: "volcano-admission-secret"
+  scheduler_config_file: "kube-batch.conf"
   image_pull_secret: ""