diff --git a/Makefile b/Makefile index 475075e282..31d49cd3d8 100644 --- a/Makefile +++ b/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; \ diff --git a/README.md b/README.md index e36c91571b..5c67953cf4 100644 --- a/README.md +++ b/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 ``` diff --git a/cmd/kube-batch/app/options/options.go b/cmd/scheduler/app/options/options.go similarity index 100% rename from cmd/kube-batch/app/options/options.go rename to cmd/scheduler/app/options/options.go diff --git a/cmd/kube-batch/app/options/options_test.go b/cmd/scheduler/app/options/options_test.go similarity index 100% rename from cmd/kube-batch/app/options/options_test.go rename to cmd/scheduler/app/options/options_test.go diff --git a/cmd/kube-batch/app/server.go b/cmd/scheduler/app/server.go similarity index 98% rename from cmd/kube-batch/app/server.go rename to cmd/scheduler/app/server.go index 47de5895a8..698ca03d06 100644 --- a/cmd/kube-batch/app/server.go +++ b/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" diff --git a/cmd/kube-batch/main.go b/cmd/scheduler/main.go similarity index 94% rename from cmd/kube-batch/main.go rename to cmd/scheduler/main.go index 63fead43b5..63ea46e1b3 100644 --- a/cmd/kube-batch/main.go +++ b/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" diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh index b7966a75c9..8073e69d4a 100755 --- a/hack/run-e2e-kind.sh +++ b/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 } diff --git a/installer/dockerfile/kube-batch/Dockerfile b/installer/dockerfile/scheduler/Dockerfile similarity index 90% rename from installer/dockerfile/kube-batch/Dockerfile rename to installer/dockerfile/scheduler/Dockerfile index b6aef1113d..05811917e9 100644 --- a/installer/dockerfile/kube-batch/Dockerfile +++ b/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"] diff --git a/pkg/scheduler/cache/cache.go b/pkg/scheduler/cache/cache.go index 6df3edb084..589c42f2cf 100644 --- a/pkg/scheduler/cache/cache.go +++ b/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"