Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename scheduler to kube-batch #161

Merged
merged 1 commit into from
May 14, 2019
Merged

Rename scheduler to kube-batch #161

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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ init:
mkdir -p ${BIN_DIR}

kube-batch: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/kube-batch ./cmd/scheduler
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-kube-batch ./cmd/kube-batch

vk-controllers: init
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-controllers ./cmd/controllers
Expand All @@ -33,12 +33,12 @@ vkctl: init
image_bins:
go get github.com/mitchellh/gox
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vkctl ./cmd/cli
for name in controllers scheduler admission; do\
for name in controllers kube-batch admission; do\
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./cmd/$$name; \
done

images: image_bins
for name in controllers scheduler admission; do\
for name in controllers kube-batch admission; do\
cp ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./installer/dockerfile/$$name/; \
docker build --no-cache -t $(IMAGE_PREFIX)-$$name:$(TAG) ./installer/dockerfile/$$name; \
rm installer/dockerfile/$$name/vk-$$name; \
Expand Down
0 cmd/scheduler/main.go → cmd/kube-batch/main.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions hack/run-e2e-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function install-volcano {

echo "Loading docker images into kind cluster"
kind load docker-image ${IMAGE_PREFIX}-controllers:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-scheduler:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-kube-batch:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${IMAGE_PREFIX}-admission:${TAG} ${CLUSTER_CONTEXT}
kind load docker-image ${MPI_EXAMPLE_IMAGE} ${CLUSTER_CONTEXT}

Expand All @@ -84,7 +84,7 @@ function generate-log {
echo "Generating volcano log files"
kubectl logs deployment/${CLUSTER_NAME}-admission -n kube-system > volcano-admission.log
kubectl logs deployment/${CLUSTER_NAME}-controllers -n kube-system > volcano-controller.log
kubectl logs deployment/${CLUSTER_NAME}-scheduler -n kube-system > volcano-scheduler.log
kubectl logs deployment/${CLUSTER_NAME}-kube-batch -n kube-system > volcano-kube-batch.log
}

# clean up
Expand Down
2 changes: 1 addition & 1 deletion installer/chart/volcano/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
basic:
image_tag_version: "latest"
controller_image_name: "volcanosh/vk-controllers"
scheduler_image_name: "volcanosh/vk-scheduler"
scheduler_image_name: "volcanosh/vk-kube-batch"
admission_image_name: "volcanosh/vk-admission"
admission_secret_name: "volcano-admission-secret"
image_pull_secret: ""
4 changes: 2 additions & 2 deletions installer/dockerfile/scheduler/Dockerfile → installer/dockerfile/kube-batch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

FROM alpine:latest

ADD vk-scheduler /vk-scheduler
ENTRYPOINT ["/vk-scheduler"]
ADD vk-kube-batch /vk-kube-batch
ENTRYPOINT ["/vk-kube-batch"]