Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.

Remove reclaim and preempt in deployment #772

Merged
merged 1 commit into from
Apr 18, 2019
Merged

Remove reclaim and preempt in deployment #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/kube-batch-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
actions: "reclaim, allocate, backfill, preempt"
actions: "allocate, backfill"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why changing this file in config folder? Will we deprecate them both?

tiers:
- plugins:
- name: priority
Expand Down
11 changes: 11 additions & 0 deletions deployment/volcano/config/kube-batch-ci.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
actions: "reclaim, allocate, backfill, preempt"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought you were going to remove them in this file, not the original file. And if I am right, you need to update testcase as well.

Copy link
Contributor Author

@thandayuthapani thandayuthapani Apr 15, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since in CI, we need to test every action, deployment used in CI is same as the deployment provided for user. So, I have added new config file for CI which will be loaded only during CI run, when user is deploying using helm it will use default config file which will have allocate, backfill alone, which is our requirement as mentioned in the issue #770

tiers:
- plugins:
- name: priority
- name: gang
- name: conformance
- plugins:
- name: drf
- name: predicates
- name: proportion
- name: nodeorder
2 changes: 1 addition & 1 deletion deployment/volcano/config/kube-batch.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
actions: "reclaim, allocate, backfill, preempt"
actions: "allocate, backfill"
tiers:
- plugins:
- name: priority
Expand Down
2 changes: 1 addition & 1 deletion deployment/volcano/templates/scheduler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={{.Values.basic.scheduler_conf_file}}
- -v=3
- 2>&1
imagePullPolicy: "IfNotPresent"
Expand Down
1 change: 1 addition & 0 deletions deployment/volcano/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ basic:
admission_image_name: "kubesigs/vk-admission"
admission_secret_name: "volcano-admission-secret"
image_pull_secret: ""
scheduler_conf_file: "/volcano.scheduler/kube-batch.conf"
2 changes: 1 addition & 1 deletion hack/run-e2e-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function install-volcano {
helm gen-admission-secret --service integration-admission-service --namespace kube-system

echo "Install volcano chart"
helm install deployment/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${RELEASE_VER}
helm install deployment/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${RELEASE_VER} --set basic.scheduler_conf_file=/volcano.scheduler/kube-batch-ci.conf
}

function uninstall-volcano {
Expand Down