Merge branch 'master' into ttl

Makefile

@@ -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
@@ -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; \

hack/run-e2e-kind.sh

@@ -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}
 
@@ -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

installer/chart/volcano/values.yaml

@@ -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: ""

installer/dockerfile/scheduler/Dockerfile → installer/dockerfile/kube-batch/Dockerfile

@@ -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"]