Merge pull request #313 from asifdxtreme/master

Update kube-batch to scheduler

Makefile

@@ -13,13 +13,13 @@ LD_FLAGS=" \
 
 .EXPORT_ALL_VARIABLES:
 
-all: kube-batch vc-controllers vc-admission vkctl
+all: vc-scheduler vc-controllers vc-admission vkctl
 
 init:
 	mkdir -p ${BIN_DIR}
 
-kube-batch: init
-	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-kube-batch ./cmd/kube-batch
+scheduler: init
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-scheduler ./cmd/scheduler
 
 vc-controllers: init
 	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-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 kube-batch admission; do\
+	for name in controllers scheduler admission; do\
 		CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./cmd/$$name; \
 	done
 
 images: image_bins
-	for name in controllers kube-batch admission; do\
+	for name in controllers scheduler admission; do\
 		cp ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./installer/dockerfile/$$name/; \
 		docker build --no-cache -t $(IMAGE_PREFIX)-$$name:$(TAG) ./installer/dockerfile/$$name; \
 		rm installer/dockerfile/$$name/vc-$$name; \

README.md

@@ -104,7 +104,7 @@ make images
 # docker images
 REPOSITORY                      TAG                 IMAGE ID            CREATED             SIZE
 volcanosh/vc-admission     latest              a83338506638        8 seconds ago       41.4MB
-volcanosh/vc-kube-batch    latest              faa3c2a25ac3        9 seconds ago       49.6MB
+volcanosh/vc-scheduler    latest              faa3c2a25ac3        9 seconds ago       49.6MB
 volcanosh/vc-controllers   latest              7b11606ebfb8        10 seconds ago      44.2MB
 
 ``` 

cmd/kube-batch/app/server.go → cmd/scheduler/app/server.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"volcano.sh/volcano/cmd/kube-batch/app/options"
+	"volcano.sh/volcano/cmd/scheduler/app/options"
 	"volcano.sh/volcano/pkg/scheduler"
 	"volcano.sh/volcano/pkg/version"
 

cmd/kube-batch/main.go → cmd/scheduler/main.go

@@ -30,8 +30,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apiserver/pkg/util/flag"
 
-	"volcano.sh/volcano/cmd/kube-batch/app"
-	"volcano.sh/volcano/cmd/kube-batch/app/options"
+	"volcano.sh/volcano/cmd/scheduler/app"
+	"volcano.sh/volcano/cmd/scheduler/app/options"
 
 	// Import default actions/plugins.
 	_ "volcano.sh/volcano/pkg/scheduler/actions"

hack/run-e2e-kind.sh

@@ -59,7 +59,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}-kube-batch:${TAG}  ${CLUSTER_CONTEXT}
+  kind load docker-image ${IMAGE_PREFIX}-scheduler:${TAG}  ${CLUSTER_CONTEXT}
   kind load docker-image ${IMAGE_PREFIX}-admission:${TAG}  ${CLUSTER_CONTEXT}
   kind load docker-image ${MPI_EXAMPLE_IMAGE}  ${CLUSTER_CONTEXT}
 
@@ -77,7 +77,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}-kube-batch -n kube-system > volcano-kube-batch.log
+    kubectl logs deployment/${CLUSTER_NAME}-scheduler -n kube-system > volcano-kube-batch.log
 
 }
 

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

@@ -15,5 +15,5 @@
 
 FROM alpine:latest
 
-ADD vc-kube-batch /vc-kube-batch
-ENTRYPOINT ["/vc-kube-batch"]
+ADD vc-scheduler /vc-scheduler
+ENTRYPOINT ["/vc-scheduler"]

pkg/scheduler/cache/cache.go

@@ -43,7 +43,7 @@ import (
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 
-	"volcano.sh/volcano/cmd/kube-batch/app/options"
+	"volcano.sh/volcano/cmd/scheduler/app/options"
 	"volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
 	kbver "volcano.sh/volcano/pkg/client/clientset/versioned"
 	"volcano.sh/volcano/pkg/client/clientset/versioned/scheme"