Skip to content

Commit 3c4c9d5

Browse files
Merge pull request #312 from asifdxtreme/master
Update vk- to vc-
2 parents 0625d1a + 6ca9905 commit 3c4c9d5

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ LD_FLAGS=" \
1313

1414
.EXPORT_ALL_VARIABLES:
1515

16-
all: kube-batch vk-controllers vk-admission vkctl
16+
all: kube-batch vc-controllers vc-admission vkctl
1717

1818
init:
1919
mkdir -p ${BIN_DIR}
2020

2121
kube-batch: init
22-
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-kube-batch ./cmd/kube-batch
22+
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-kube-batch ./cmd/kube-batch
2323

24-
vk-controllers: init
25-
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-controllers ./cmd/controllers
24+
vc-controllers: init
25+
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controllers ./cmd/controllers
2626

27-
vk-admission: init
28-
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-admission ./cmd/admission
27+
vc-admission: init
28+
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-admission ./cmd/admission
2929

3030
vkctl: init
3131
go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vkctl ./cmd/cli
@@ -34,14 +34,14 @@ image_bins:
3434
go get github.com/mitchellh/gox
3535
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vkctl ./cmd/cli
3636
for name in controllers kube-batch admission; do\
37-
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./cmd/$$name; \
37+
CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./cmd/$$name; \
3838
done
3939

4040
images: image_bins
4141
for name in controllers kube-batch admission; do\
42-
cp ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./installer/dockerfile/$$name/; \
42+
cp ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./installer/dockerfile/$$name/; \
4343
docker build --no-cache -t $(IMAGE_PREFIX)-$$name:$(TAG) ./installer/dockerfile/$$name; \
44-
rm installer/dockerfile/$$name/vk-$$name; \
44+
rm installer/dockerfile/$$name/vc-$$name; \
4545
done
4646

4747
admission-base-image:

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ make images
103103
## Verify your images
104104
# docker images
105105
REPOSITORY TAG IMAGE ID CREATED SIZE
106-
volcanosh/vk-admission latest a83338506638 8 seconds ago 41.4MB
107-
volcanosh/vk-kube-batch latest faa3c2a25ac3 9 seconds ago 49.6MB
108-
volcanosh/vk-controllers latest 7b11606ebfb8 10 seconds ago 44.2MB
106+
volcanosh/vc-admission latest a83338506638 8 seconds ago 41.4MB
107+
volcanosh/vc-kube-batch latest faa3c2a25ac3 9 seconds ago 49.6MB
108+
volcanosh/vc-controllers latest 7b11606ebfb8 10 seconds ago 44.2MB
109109
110110
```
111111

cmd/controllers/app/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func Run(opt *options.ServerOption) error {
109109
// Prepare event clients.
110110
broadcaster := record.NewBroadcaster()
111111
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: leaderElectionClient.CoreV1().Events(opt.LockObjectNamespace)})
112-
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vk-controllers"})
112+
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controllers"})
113113

114114
hostname, err := os.Hostname()
115115
if err != nil {
@@ -120,7 +120,7 @@ func Run(opt *options.ServerOption) error {
120120

121121
rl, err := resourcelock.New(resourcelock.ConfigMapsResourceLock,
122122
opt.LockObjectNamespace,
123-
"vk-controllers",
123+
"vc-controllers",
124124
leaderElectionClient.CoreV1(),
125125
resourcelock.ResourceLockConfig{
126126
Identity: id,

installer/dockerfile/admission/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
# since the required packages change very rarely.
1818
FROM volcanosh/vk-admission-base:latest
1919

20-
ADD vk-admission /vk-admission
20+
ADD vc-admission /vc-admission
2121
ADD gen-admission-secret.sh /gen-admission-secret.sh
22-
ENTRYPOINT ["/vk-admission"]
22+
ENTRYPOINT ["/vc-admission"]

installer/dockerfile/controllers/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
FROM alpine:latest
1717

18-
ADD vk-controllers /vk-controllers
19-
ENTRYPOINT ["/vk-controllers"]
18+
ADD vc-controllers /vc-controllers
19+
ENTRYPOINT ["/vc-controllers"]

installer/dockerfile/kube-batch/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
FROM alpine:latest
1717

18-
ADD vk-kube-batch /vk-kube-batch
19-
ENTRYPOINT ["/vk-kube-batch"]
18+
ADD vc-kube-batch /vc-kube-batch
19+
ENTRYPOINT ["/vc-kube-batch"]

pkg/controllers/job/job_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func NewJobController(
117117
eventBroadcaster := record.NewBroadcaster()
118118
eventBroadcaster.StartLogging(glog.Infof)
119119
eventBroadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
120-
recorder := eventBroadcaster.NewRecorder(vkscheme.Scheme, v1.EventSource{Component: "vk-controller"})
120+
recorder := eventBroadcaster.NewRecorder(vkscheme.Scheme, v1.EventSource{Component: "vc-controller"})
121121

122122
cc := &Controller{
123123
kubeClients: kubeClient,

0 commit comments

Comments
 (0)