Merge pull request volcano-sh#342 from k82cn/rm_ext

Move extensions out of tree.

Makefile

@@ -2,9 +2,7 @@ BIN_DIR=_output/bin
 RELEASE_VER=0.2
 
 kube-arbitrator: init
-	go build -o ${BIN_DIR}/kar-scheduler ./cmd/kar-scheduler/
-	go build -o ${BIN_DIR}/kar-controllers ./cmd/kar-controllers/
-	go build -o ${BIN_DIR}/karcli ./cmd/karcli
+	go build -o ${BIN_DIR}/kube-batchd ./cmd/kube-batchd/
 
 verify: generate-code
 	hack/verify-gofmt.sh
@@ -17,15 +15,11 @@ init:
 generate-code:
 	go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
 	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/scheduling/v1alpha1/ -O zz_generated.deepcopy
-	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/extensions/v1alpha1/ -O zz_generated.deepcopy
 
 images: kube-arbitrator
-	cp ./_output/bin/kar-scheduler ./deployment/
-	cp ./_output/bin/kar-controllers ./deployment/
-	cp ./_output/bin/karcli ./deployment/
-	docker build ./deployment/ -f ./deployment/Dockerfile.sched -t kubearbitrator/kar-scheduler:${RELEASE_VER}
-	docker build ./deployment/ -f ./deployment/Dockerfile.ctrl -t kubearbitrator/kar-controllers:${RELEASE_VER}
-	rm -f ./deployment/kar*
+	cp ./_output/bin/kube-batchd ./deployment/
+	docker build ./deployment/ -f ./deployment/Dockerfile.sched -t kubearbitrator/kube-batchd:${RELEASE_VER}
+	rm -f ./deployment/kube-batchd
 
 run-test:
 	hack/make-rules/test.sh $(WHAT) $(TESTS)

cmd/kar-scheduler/app/options/options.go → cmd/kube-batchd/app/options/options.go

@@ -18,6 +18,7 @@ package options
 
 import (
 	"fmt"
+
 	"github.com/spf13/pflag"
 )
 
@@ -42,7 +43,7 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.Master, "master", s.Master, "The address of the Kubernetes API server (overrides any value in kubeconfig)")
 	fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information")
 	// kube-arbitrator will ignore pods with scheduler names other than specified with the option
-	fs.StringVar(&s.SchedulerName, "scheduler-name", "kar-scheduler", "kube-arbitrator will handle pods with the scheduler-name")
+	fs.StringVar(&s.SchedulerName, "scheduler-name", "kube-batchd", "kube-batchd will handle pods with the scheduler-name")
 	fs.StringVar(&s.SchedulerConf, "scheduler-conf", "", "The namespace and name of ConfigMap for scheduler configuration")
 	fs.BoolVar(&s.EnableLeaderElection, "leader-elect", s.EnableLeaderElection, "Start a leader election client and gain leadership before "+
 		"executing the main loop. Enable this when running replicated kar-scheduler for high availability.")

cmd/kar-scheduler/app/server.go → cmd/kube-batchd/app/server.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kar-scheduler/app/options"
+	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kube-batchd/app/options"
 	"github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"

cmd/kar-scheduler/main.go → cmd/kube-batchd/main.go

@@ -26,8 +26,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apiserver/pkg/util/flag"
 
-	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kar-scheduler/app"
-	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kar-scheduler/app/options"
+	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kube-batchd/app"
+	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kube-batchd/app/options"
 )
 
 var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes")