Skip to content

Commit 1cb6222

Browse files
committed
Update image tag
1 parent 56b4b99 commit 1cb6222

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BIN_DIR=_output/bin
22
IMAGE=volcano
3-
TAG = 1.0
3+
TAG = 0.1
44

55
.EXPORT_ALL_VARIABLES:
66

hack/run-e2e-kind.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function install-volcano {
6262
helm gen-admission-secret --service integration-admission-service --namespace kube-system
6363

6464
echo "Install volcano chart"
65-
helm install installer/chart/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG}
65+
helm install installer/chart/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG}
6666
}
6767

6868
function uninstall-volcano {

installer/chart/volcano/config/kube-batch.conf

+2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ tiers:
33
- plugins:
44
- name: priority
55
- name: gang
6+
- name: conformance
67
- plugins:
78
- name: drf
89
- name: predicates
910
- name: proportion
11+
- name: nodeorder

pkg/scheduler/actions/preempt/preempt.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,9 @@ func preempt(
232232
}
233233
preempted.Add(preemptee.Resreq)
234234
// If reclaimed enough resources, break loop to avoid Sub panic.
235-
if resreq.LessEqual(preemptee.Resreq) {
235+
if resreq.LessEqual(preempted) {
236236
break
237237
}
238-
resreq.Sub(preemptee.Resreq)
239238
}
240239

241240
metrics.RegisterPreemptionAttempts()

pkg/scheduler/actions/reclaim/reclaim.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,9 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
166166
}
167167
reclaimed.Add(reclaimee.Resreq)
168168
// If reclaimed enough resources, break loop to avoid Sub panic.
169-
if resreq.LessEqual(reclaimee.Resreq) {
169+
if resreq.LessEqual(reclaimed) {
170170
break
171171
}
172-
resreq.Sub(reclaimee.Resreq)
173172
}
174173

175174
glog.V(3).Infof("Reclaimed <%v> for task <%s/%s> requested <%v>.",

0 commit comments

Comments
 (0)