Skip to content

Commit 3c897eb

Browse files
k82cnk82cn
committed
Rename binaries.
Signed-off-by: Klaus Ma <klaus1982.cn@gmail.com>
1 parent 4db0bf2 commit 3c897eb

File tree

17 files changed

+29
-29
lines changed

17 files changed

+29
-29
lines changed

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LD_FLAGS=" \
2929

3030
.EXPORT_ALL_VARIABLES:
3131

32-
all: vc-scheduler vc-controllers vc-admission vcctl
32+
all: vc-scheduler vc-controller-manager vc-webhook-manager vcctl
3333

3434
init:
3535
mkdir -p ${BIN_DIR}
@@ -38,11 +38,11 @@ init:
3838
vc-scheduler: init
3939
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-scheduler ./cmd/scheduler
4040

41-
vc-controllers: init
42-
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controllers ./cmd/controllers
41+
vc-controller-manager: init
42+
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controller-manager ./cmd/controller-manager
4343

44-
vc-admission: init
45-
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-admission ./cmd/admission
44+
vc-webhook-manager: init
45+
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-webhook-manager ./cmd/webhook-manager
4646

4747
vcctl: init
4848
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vcctl ./cmd/cli
@@ -55,7 +55,7 @@ image_bins: init
5555
done
5656

5757
images: image_bins
58-
for name in controllers scheduler admission; do\
58+
for name in controller-manager scheduler webhook-manager; do\
5959
cp ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./installer/dockerfile/$$name/; \
6060
docker build --no-cache -t $(IMAGE_PREFIX)-$$name:$(TAG) ./installer/dockerfile/$$name; \
6161
rm installer/dockerfile/$$name/vc-$$name; \

cmd/controllers/app/options/options.go renamed to cmd/controller-manager/app/options/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
6060
fs.StringVar(&s.Master, "master", s.Master, "The address of the Kubernetes API server (overrides any value in kubeconfig)")
6161
fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information.")
6262
fs.BoolVar(&s.EnableLeaderElection, "leader-elect", s.EnableLeaderElection, "Start a leader election client and gain leadership before "+
63-
"executing the main loop. Enable this when running replicated vc-controllers for high availability.")
63+
"executing the main loop. Enable this when running replicated vc-controller-manager for high availability.")
6464
fs.StringVar(&s.LockObjectNamespace, "lock-object-namespace", s.LockObjectNamespace, "Define the namespace of the lock object.")
6565
fs.Float32Var(&s.KubeAPIQPS, "kube-api-qps", defaultQPS, "QPS to use while talking with kubernetes apiserver")
6666
fs.IntVar(&s.KubeAPIBurst, "kube-api-burst", defaultBurst, "Burst to use while talking with kubernetes apiserver")

cmd/controllers/app/options/options_test.go renamed to cmd/controller-manager/app/options/options_test.go

File renamed without changes.

cmd/controllers/app/server.go renamed to cmd/controller-manager/app/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"k8s.io/client-go/tools/leaderelection/resourcelock"
4040
"k8s.io/client-go/tools/record"
4141

42-
"volcano.sh/volcano/cmd/controllers/app/options"
42+
"volcano.sh/volcano/cmd/controller-manager/app/options"
4343
"volcano.sh/volcano/pkg/apis/helpers"
4444
vcclientset "volcano.sh/volcano/pkg/client/clientset/versioned"
4545
"volcano.sh/volcano/pkg/controllers/garbagecollector"
@@ -100,7 +100,7 @@ func Run(opt *options.ServerOption) error {
100100
// Prepare event clients.
101101
broadcaster := record.NewBroadcaster()
102102
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: leaderElectionClient.CoreV1().Events(opt.LockObjectNamespace)})
103-
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controllers"})
103+
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controller-manager"})
104104

105105
hostname, err := os.Hostname()
106106
if err != nil {
@@ -111,7 +111,7 @@ func Run(opt *options.ServerOption) error {
111111

112112
rl, err := resourcelock.New(resourcelock.ConfigMapsResourceLock,
113113
opt.LockObjectNamespace,
114-
"vc-controllers",
114+
"vc-controller-manager",
115115
leaderElectionClient.CoreV1(),
116116
resourcelock.ResourceLockConfig{
117117
Identity: id,

cmd/controllers/main.go renamed to cmd/controller-manager/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"k8s.io/apiserver/pkg/util/flag"
2828
"k8s.io/klog"
2929

30-
"volcano.sh/volcano/cmd/controllers/app"
31-
"volcano.sh/volcano/cmd/controllers/app/options"
30+
"volcano.sh/volcano/cmd/controller-manager/app"
31+
"volcano.sh/volcano/cmd/controller-manager/app/options"
3232
"volcano.sh/volcano/pkg/version"
3333
)
3434

cmd/admission/app/options/options.go renamed to cmd/webhook-manager/app/options/options.go

File renamed without changes.

cmd/admission/app/server.go renamed to cmd/webhook-manager/app/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/client-go/tools/clientcmd"
2929
"k8s.io/klog"
3030

31-
"volcano.sh/volcano/cmd/admission/app/options"
31+
"volcano.sh/volcano/cmd/webhook-manager/app/options"
3232
"volcano.sh/volcano/pkg/admission/router"
3333
"volcano.sh/volcano/pkg/version"
3434
)

cmd/admission/app/util.go renamed to cmd/webhook-manager/app/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/client-go/rest"
2929
"k8s.io/klog"
3030

31-
"volcano.sh/volcano/cmd/admission/app/options"
31+
"volcano.sh/volcano/cmd/webhook-manager/app/options"
3232
"volcano.sh/volcano/pkg/admission/router"
3333
"volcano.sh/volcano/pkg/client/clientset/versioned"
3434
)

cmd/admission/main.go renamed to cmd/webhook-manager/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"k8s.io/apiserver/pkg/util/flag"
2828
"k8s.io/klog"
2929

30-
"volcano.sh/volcano/cmd/admission/app"
31-
"volcano.sh/volcano/cmd/admission/app/options"
30+
"volcano.sh/volcano/cmd/webhook-manager/app"
31+
"volcano.sh/volcano/cmd/webhook-manager/app/options"
3232

3333
_ "volcano.sh/volcano/pkg/admission/jobs/mutate"
3434
_ "volcano.sh/volcano/pkg/admission/jobs/validate"

‎docs/development/development.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ make images
5353

5454
## Building a specific docker image
5555

56-
If you want to make a local change and test some component, say `vc-controllers`, you
56+
If you want to make a local change and test some component, say `vc-controller-manager`, you
5757
could do:
5858

5959
Under volcano.sh/volcano repo
@@ -73,10 +73,10 @@ export HUB=docker.io/yourrepo
7373
export TAG=citadel
7474
```
7575

76-
Make some local change of the code, then build `vc-controllers`
76+
Make some local change of the code, then build `vc-controller-manager`
7777

7878
```bash
79-
make image.vc-controllers
79+
make image.vc-controller-manager
8080
```
8181

8282
## Building the Volcano manifests

0 commit comments

Comments
 (0)