Merge pull request #340 from thandayuthapani/vcctl

Change vkctl to vcctl
volcano-sh · Jul 15, 2019 · b3a74ee · b3a74ee
2 parents a0a4246 + 6cdd21d
commit b3a74ee
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,7 @@ jobs:
         - sudo curl -o /usr/local/bin/kind -L https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64
         - sudo chmod +x /usr/local/bin/kind
       script:
-        - make vkctl
+        - make vcctl
         - make images
         - make e2e-test-kind
       after_failure:

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ LD_FLAGS=" \
 
 .EXPORT_ALL_VARIABLES:
 
-all: vc-scheduler vc-controllers vc-admission vkctl
+all: vc-scheduler vc-controllers vc-admission vcctl
 
 init:
 	mkdir -p ${BIN_DIR}
@@ -27,12 +27,12 @@ vc-controllers: init
 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
+vcctl: init
+	go build -ldflags ${LD_FLAGS} -o=${BIN_DIR}/vcctl ./cmd/cli
 
 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
+	CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vcctl ./cmd/cli
 	for name in controllers scheduler admission; do\
 		CGO_ENABLED=0 gox -osarch=${REL_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${REL_OSARCH}/vc-$$name ./cmd/$$name; \
 	done

diff --git a/cmd/cli/job.go b/cmd/cli/job.go
@@ -9,7 +9,7 @@ import (
 func buildJobCmd() *cobra.Command {
 	jobCmd := &cobra.Command{
 		Use:   "job",
-		Short: "vkctl command line operation job",
+		Short: "vcctl command line operation job",
 	}
 
 	jobRunCmd := &cobra.Command{

diff --git a/cmd/cli/vkctl.go b/cmd/cli/vkctl.go
@@ -38,7 +38,7 @@ func main() {
 	defer glog.Flush()
 
 	rootCmd := cobra.Command{
-		Use: "vkctl",
+		Use: "vcctl",
 	}
 
 	rootCmd.AddCommand(buildJobCmd())
@@ -63,7 +63,7 @@ func checkError(cmd *cobra.Command, err error) {
 	}
 }
 
-var versionExample = `vkctl version`
+var versionExample = `vcctl version`
 
 func versionCommand() *cobra.Command {
 

diff --git a/docs/design/queue.md b/docs/design/queue.md
@@ -77,23 +77,23 @@ __create__:
 `create` command is used to create a queue with weight; for example, the following command will create a queue named `myqueue` with weight 10.
 
 ```shell
-$ vkctl queue create --name myqueue --weight 10
+$ vcctl queue create --name myqueue --weight 10
 ```
 
 __view__:
 
 `view` command is used to show the detail of a queue, e.g. creation time; the following command will show the detail of queue `myqueue`
 
 ```shell
-$ vkctl queue view myqueue
+$ vcctl queue view myqueue
 ```
 
 __list__:
 
 `list` command is used to show all available queues to current user
 
 ```shell
-$ vkctl queue list
+$ vcctl queue list
 Name      Weight  Total  Pending  Running ...
 myqueue   10      10     5        5
 ```

diff --git a/docs/samples/kubecon-2019-china/scripts/watch.sh b/docs/samples/kubecon-2019-china/scripts/watch.sh
@@ -16,7 +16,7 @@ watch_cluster() {
 
     echo "Volcano Jobs:"
     echo "-------------------------------"
-    vkctl job list
+    vcctl job list
 }
 
 if [ $# == 0 ]; then

diff --git a/test/e2e/command.go b/test/e2e/command.go
@@ -206,7 +206,7 @@ var _ = Describe("Job E2E Test: Test Job Command", func() {
 
 		_, err = context.vkclient.BatchV1alpha1().Jobs(namespace).Get(jobName, metav1.GetOptions{})
 		Expect(apierrors.IsNotFound(err)).To(BeTrue(),
-			"Job should be deleted on vkctl job delete.")
+			"Job should be deleted on vcctl job delete.")
 
 	})
 })
diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -95,7 +95,7 @@ func kubeconfigPath(home string) string {
 //VolcanoCliBinary function gets the volcano cli binary
 func VolcanoCliBinary() string {
 	if bin := os.Getenv("VK_BIN"); bin != "" {
-		return filepath.Join(bin, "vkctl")
+		return filepath.Join(bin, "vcctl")
 	}
 	return ""
 }
@@ -119,9 +119,9 @@ func initTestContext() *context {
 	Expect(home).NotTo(Equal(""))
 	configPath := kubeconfigPath(home)
 	Expect(configPath).NotTo(Equal(""))
-	vkctl := VolcanoCliBinary()
-	Expect(fileExist(vkctl)).To(BeTrue(), fmt.Sprintf(
-		"vkctl binary: %s is required for E2E tests, please update VK_BIN environment", vkctl))
+	vcctl := VolcanoCliBinary()
+	Expect(fileExist(vcctl)).To(BeTrue(), fmt.Sprintf(
+		"vcctl binary: %s is required for E2E tests, please update VK_BIN environment", vcctl))
 	config, err := clientcmd.BuildConfigFromFlags(masterURL(), configPath)
 	Expect(err).NotTo(HaveOccurred())