Rename binaries.

Signed-off-by: Klaus Ma <klaus1982.cn@gmail.com>
volcano-sh · Dec 14, 2019 · 0d660b8 · 0d660b8
1 parent 4db0bf2
commit 0d660b8
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ LD_FLAGS=" \
 
 .EXPORT_ALL_VARIABLES:
 
-all: vc-scheduler vc-controllers vc-admission vcctl
+all: vc-scheduler vc-controller-manager vc-webhook-manager vcctl
 
 init:
 	mkdir -p ${BIN_DIR}
@@ -38,11 +38,11 @@ init:
 vc-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
+vc-controller-manager: init
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controller-manager ./cmd/controller-manager
 
-vc-admission: init
-	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-admission ./cmd/admission
+vc-webhook-manager: init
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-webhook-manager ./cmd/webhook-manager
 
 vcctl: init
 	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vcctl ./cmd/cli
@@ -55,7 +55,7 @@ image_bins: init
 	done
 
 images: image_bins
-	for name in controllers scheduler admission; do\
+	for name in controller-manager scheduler webhook-manager; 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/cmd/controllers/app/options/options.go → ...controller-manager/app/options/options.go b/cmd/controllers/app/options/options.go → ...controller-manager/app/options/options.go
diff --git a/cmd/controllers/app/options/options_test.go → ...oller-manager/app/options/options_test.go b/cmd/controllers/app/options/options_test.go → ...oller-manager/app/options/options_test.go
diff --git a/cmd/controllers/app/server.go → cmd/controller-manager/app/server.go b/cmd/controllers/app/server.go → cmd/controller-manager/app/server.go
@@ -39,7 +39,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
 
-	"volcano.sh/volcano/cmd/controllers/app/options"
+	"volcano.sh/volcano/cmd/controller-manager/app/options"
 	"volcano.sh/volcano/pkg/apis/helpers"
 	vcclientset "volcano.sh/volcano/pkg/client/clientset/versioned"
 	"volcano.sh/volcano/pkg/controllers/garbagecollector"

diff --git a/cmd/controllers/main.go → cmd/controller-manager/main.go b/cmd/controllers/main.go → cmd/controller-manager/main.go
@@ -27,8 +27,8 @@ import (
 	"k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/cmd/controllers/app"
-	"volcano.sh/volcano/cmd/controllers/app/options"
+	"volcano.sh/volcano/cmd/controller-manager/app"
+	"volcano.sh/volcano/cmd/controller-manager/app/options"
 	"volcano.sh/volcano/pkg/version"
 )
 

diff --git a/cmd/admission/app/options/options.go → cmd/webhook-manager/app/options/options.go b/cmd/admission/app/options/options.go → cmd/webhook-manager/app/options/options.go
diff --git a/cmd/admission/app/server.go → cmd/webhook-manager/app/server.go b/cmd/admission/app/server.go → cmd/webhook-manager/app/server.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/cmd/admission/app/options"
+	"volcano.sh/volcano/cmd/webhook-manager/app/options"
 	"volcano.sh/volcano/pkg/admission/router"
 	"volcano.sh/volcano/pkg/version"
 )

diff --git a/cmd/admission/app/util.go → cmd/webhook-manager/app/util.go b/cmd/admission/app/util.go → cmd/webhook-manager/app/util.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/cmd/admission/app/options"
+	"volcano.sh/volcano/cmd/webhook-manager/app/options"
 	"volcano.sh/volcano/pkg/admission/router"
 	"volcano.sh/volcano/pkg/client/clientset/versioned"
 )

diff --git a/cmd/admission/main.go → cmd/webhook-manager/main.go b/cmd/admission/main.go → cmd/webhook-manager/main.go
@@ -27,8 +27,8 @@ import (
 	"k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/cmd/admission/app"
-	"volcano.sh/volcano/cmd/admission/app/options"
+	"volcano.sh/volcano/cmd/webhook-manager/app"
+	"volcano.sh/volcano/cmd/webhook-manager/app/options"
 
 	_ "volcano.sh/volcano/pkg/admission/jobs/mutate"
 	_ "volcano.sh/volcano/pkg/admission/jobs/validate"