Skip to content

Commit

Permalink
Update image tag
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyLike committed Mar 25, 2019
1 parent 56b4b99 commit 1cb6222
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BIN_DIR=_output/bin
IMAGE=volcano
TAG = 1.0
TAG = 0.1

.EXPORT_ALL_VARIABLES:

Expand Down
2 changes: 1 addition & 1 deletion hack/run-e2e-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions installer/chart/volcano/config/kube-batch.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ tiers:
- plugins:
- name: priority
- name: gang
- name: conformance
- plugins:
- name: drf
- name: predicates
- name: proportion
- name: nodeorder
3 changes: 1 addition & 2 deletions pkg/scheduler/actions/preempt/preempt.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions pkg/scheduler/actions/reclaim/reclaim.go
Original file line number Diff line number Diff line change
Expand Up @@ -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>.",
Expand Down

0 comments on commit 1cb6222

Please sign in to comment.