Merge pull request #312 from asifdxtreme/master

Update vk- to vc-
volcano-sh · Jul 9, 2019 · 3c4c9d5 · 3c4c9d5
2 parents 0625d1a + 6ca9905
commit 3c4c9d5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -13,19 +13,19 @@ LD_FLAGS=" \
 
 .EXPORT_ALL_VARIABLES:
 
-all: kube-batch vk-controllers vk-admission vkctl
+all: kube-batch vc-controllers vc-admission vkctl
 
 init:
 	mkdir -p ${BIN_DIR}
 
 kube-batch: init
-	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-kube-batch ./cmd/kube-batch
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-kube-batch ./cmd/kube-batch
 
-vk-controllers: init
-	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-controllers ./cmd/controllers
+vc-controllers: init
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-controllers ./cmd/controllers
 
-vk-admission: init
-	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vk-admission ./cmd/admission
+vc-admission: init
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vc-admission ./cmd/admission
 
 vkctl: init
 	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vkctl ./cmd/cli
@@ -34,14 +34,14 @@ image_bins:
 	go get github.com/mitchellh/gox
 	CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vkctl ./cmd/cli
 	for name in controllers kube-batch admission; do\
-		CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./cmd/$$name; \
+		CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./cmd/$$name; \
 	done
 
 images: image_bins
 	for name in controllers kube-batch admission; do\
-		cp ${BIN_DIR}/${REL_OSARCH}/vk-$$name ./installer/dockerfile/$$name/; \
+		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/vk-$$name; \
+		rm installer/dockerfile/$$name/vc-$$name; \
 	done
 
 admission-base-image:

diff --git a/README.md b/README.md
@@ -103,9 +103,9 @@ make images
 ## Verify your images
 # docker images
 REPOSITORY                      TAG                 IMAGE ID            CREATED             SIZE
-volcanosh/vk-admission     latest              a83338506638        8 seconds ago       41.4MB
-volcanosh/vk-kube-batch    latest              faa3c2a25ac3        9 seconds ago       49.6MB
-volcanosh/vk-controllers   latest              7b11606ebfb8        10 seconds ago      44.2MB
+volcanosh/vc-admission     latest              a83338506638        8 seconds ago       41.4MB
+volcanosh/vc-kube-batch    latest              faa3c2a25ac3        9 seconds ago       49.6MB
+volcanosh/vc-controllers   latest              7b11606ebfb8        10 seconds ago      44.2MB
 
 ``` 
 

diff --git a/cmd/controllers/app/server.go b/cmd/controllers/app/server.go
@@ -109,7 +109,7 @@ func Run(opt *options.ServerOption) error {
 	// Prepare event clients.
 	broadcaster := record.NewBroadcaster()
 	broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: leaderElectionClient.CoreV1().Events(opt.LockObjectNamespace)})
-	eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vk-controllers"})
+	eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "vc-controllers"})
 
 	hostname, err := os.Hostname()
 	if err != nil {
@@ -120,7 +120,7 @@ func Run(opt *options.ServerOption) error {
 
 	rl, err := resourcelock.New(resourcelock.ConfigMapsResourceLock,
 		opt.LockObjectNamespace,
-		"vk-controllers",
+		"vc-controllers",
 		leaderElectionClient.CoreV1(),
 		resourcelock.ResourceLockConfig{
 			Identity:      id,

diff --git a/installer/dockerfile/admission/Dockerfile b/installer/dockerfile/admission/Dockerfile
@@ -17,6 +17,6 @@
 # since the required packages change very rarely.
 FROM volcanosh/vk-admission-base:latest
 
-ADD vk-admission /vk-admission
+ADD vc-admission /vc-admission
 ADD gen-admission-secret.sh /gen-admission-secret.sh
-ENTRYPOINT ["/vk-admission"]
+ENTRYPOINT ["/vc-admission"]
diff --git a/installer/dockerfile/controllers/Dockerfile b/installer/dockerfile/controllers/Dockerfile
@@ -15,5 +15,5 @@
 
 FROM alpine:latest
 
-ADD vk-controllers /vk-controllers
-ENTRYPOINT ["/vk-controllers"]
+ADD vc-controllers /vc-controllers
+ENTRYPOINT ["/vc-controllers"]
diff --git a/installer/dockerfile/kube-batch/Dockerfile b/installer/dockerfile/kube-batch/Dockerfile
@@ -15,5 +15,5 @@
 
 FROM alpine:latest
 
-ADD vk-kube-batch /vk-kube-batch
-ENTRYPOINT ["/vk-kube-batch"]
+ADD vc-kube-batch /vc-kube-batch
+ENTRYPOINT ["/vc-kube-batch"]
diff --git a/pkg/controllers/job/job_controller.go b/pkg/controllers/job/job_controller.go
@@ -117,7 +117,7 @@ func NewJobController(
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(glog.Infof)
 	eventBroadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
-	recorder := eventBroadcaster.NewRecorder(vkscheme.Scheme, v1.EventSource{Component: "vk-controller"})
+	recorder := eventBroadcaster.NewRecorder(vkscheme.Scheme, v1.EventSource{Component: "vc-controller"})
 
 	cc := &Controller{
 		kubeClients:     kubeClient,