From 0d660b8382566f2f4cdd150bf0a2691a7a8c8a87 Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Sat, 14 Dec 2019 18:10:34 +0800 Subject: [PATCH] Rename binaries. Signed-off-by: Klaus Ma --- Makefile | 12 ++++++------ .../app/options/options.go | 0 .../app/options/options_test.go | 0 .../app/server.go | 2 +- cmd/{controllers => controller-manager}/main.go | 4 ++-- .../app/options/options.go | 0 cmd/{admission => webhook-manager}/app/server.go | 2 +- cmd/{admission => webhook-manager}/app/util.go | 2 +- cmd/{admission => webhook-manager}/main.go | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) rename cmd/{controllers => controller-manager}/app/options/options.go (100%) rename cmd/{controllers => controller-manager}/app/options/options_test.go (100%) rename cmd/{controllers => controller-manager}/app/server.go (98%) rename cmd/{controllers => controller-manager}/main.go (93%) rename cmd/{admission => webhook-manager}/app/options/options.go (100%) rename cmd/{admission => webhook-manager}/app/server.go (98%) rename cmd/{admission => webhook-manager}/app/util.go (99%) rename cmd/{admission => webhook-manager}/main.go (93%) diff --git a/Makefile b/Makefile index e9b4a45d5d4..7788501f5f8 100644 --- 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 b/cmd/controller-manager/app/options/options.go similarity index 100% rename from cmd/controllers/app/options/options.go rename to cmd/controller-manager/app/options/options.go diff --git a/cmd/controllers/app/options/options_test.go b/cmd/controller-manager/app/options/options_test.go similarity index 100% rename from cmd/controllers/app/options/options_test.go rename to cmd/controller-manager/app/options/options_test.go diff --git a/cmd/controllers/app/server.go b/cmd/controller-manager/app/server.go similarity index 98% rename from cmd/controllers/app/server.go rename to cmd/controller-manager/app/server.go index 5f5496dd612..d5ac9413f2b 100644 --- a/cmd/controllers/app/server.go +++ b/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 b/cmd/controller-manager/main.go similarity index 93% rename from cmd/controllers/main.go rename to cmd/controller-manager/main.go index 20df8642e3d..acfe428c6db 100644 --- a/cmd/controllers/main.go +++ b/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 b/cmd/webhook-manager/app/options/options.go similarity index 100% rename from cmd/admission/app/options/options.go rename to cmd/webhook-manager/app/options/options.go diff --git a/cmd/admission/app/server.go b/cmd/webhook-manager/app/server.go similarity index 98% rename from cmd/admission/app/server.go rename to cmd/webhook-manager/app/server.go index c54acc23cb8..672b85278f1 100644 --- a/cmd/admission/app/server.go +++ b/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 b/cmd/webhook-manager/app/util.go similarity index 99% rename from cmd/admission/app/util.go rename to cmd/webhook-manager/app/util.go index 132e88ff4ed..da5586aea23 100644 --- a/cmd/admission/app/util.go +++ b/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 b/cmd/webhook-manager/main.go similarity index 93% rename from cmd/admission/main.go rename to cmd/webhook-manager/main.go index 13ca613565f..8c6ebbcb6d4 100644 --- a/cmd/admission/main.go +++ b/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"