From 1cb62222513ea0b1afec6fda8a25c0de287e997c Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Mon, 25 Mar 2019 19:01:15 +0800
Subject: [PATCH] Update image tag

---
 Makefile                                       | 2 +-
 hack/run-e2e-kind.sh                           | 2 +-
 installer/chart/volcano/config/kube-batch.conf | 2 ++
 pkg/scheduler/actions/preempt/preempt.go       | 3 +--
 pkg/scheduler/actions/reclaim/reclaim.go       | 3 +--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a7f8aaab8f4..64e02fa93da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BIN_DIR=_output/bin
 IMAGE=volcano
-TAG = 1.0
+TAG = 0.1
 
 .EXPORT_ALL_VARIABLES:
 
diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh
index 1bf2089fef1..f67f377ec27 100755
--- a/hack/run-e2e-kind.sh
+++ b/hack/run-e2e-kind.sh
@@ -62,7 +62,7 @@ function install-volcano {
   helm gen-admission-secret --service integration-admission-service --namespace kube-system
 
   echo "Install volcano chart"
-  helm install installer/chart/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG}
+  helm install installer/chart/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG}
 }
 
 function uninstall-volcano {
diff --git a/installer/chart/volcano/config/kube-batch.conf b/installer/chart/volcano/config/kube-batch.conf
index 25df16501bf..768db3ef4d3 100644
--- a/installer/chart/volcano/config/kube-batch.conf
+++ b/installer/chart/volcano/config/kube-batch.conf
@@ -3,7 +3,9 @@ tiers:
 - plugins:
   - name: priority
   - name: gang
+  - name: conformance
 - plugins:
   - name: drf
   - name: predicates
   - name: proportion
+  - name: nodeorder
diff --git a/pkg/scheduler/actions/preempt/preempt.go b/pkg/scheduler/actions/preempt/preempt.go
index 7289d92a03e..b408f61aaed 100644
--- a/pkg/scheduler/actions/preempt/preempt.go
+++ b/pkg/scheduler/actions/preempt/preempt.go
@@ -232,10 +232,9 @@ func preempt(
 			}
 			preempted.Add(preemptee.Resreq)
 			// If reclaimed enough resources, break loop to avoid Sub panic.
-			if resreq.LessEqual(preemptee.Resreq) {
+			if resreq.LessEqual(preempted) {
 				break
 			}
-			resreq.Sub(preemptee.Resreq)
 		}
 
 		metrics.RegisterPreemptionAttempts()
diff --git a/pkg/scheduler/actions/reclaim/reclaim.go b/pkg/scheduler/actions/reclaim/reclaim.go
index 4661db32ba6..68e96c8f984 100644
--- a/pkg/scheduler/actions/reclaim/reclaim.go
+++ b/pkg/scheduler/actions/reclaim/reclaim.go
@@ -166,10 +166,9 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
 				}
 				reclaimed.Add(reclaimee.Resreq)
 				// If reclaimed enough resources, break loop to avoid Sub panic.
-				if resreq.LessEqual(reclaimee.Resreq) {
+				if resreq.LessEqual(reclaimed) {
 					break
 				}
-				resreq.Sub(reclaimee.Resreq)
 			}
 
 			glog.V(3).Infof("Reclaimed <%v> for task <%s/%s> requested <%v>.",