Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change vkctl to vcctl #340

Merged
merged 1 commit into from
Jul 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/vkctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func main() {
defer glog.Flush()

rootCmd := cobra.Command{
Use: "vkctl",
Use: "vcctl",
}

rootCmd.AddCommand(buildJobCmd())
Expand All @@ -63,7 +63,7 @@ func checkError(cmd *cobra.Command, err error) {
}
}

var versionExample = `vkctl version`
var versionExample = `vcctl version`

func versionCommand() *cobra.Command {

Expand Down
6 changes: 3 additions & 3 deletions docs/design/queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/kubecon-2019-china/scripts/watch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ watch_cluster() {

echo "Volcano Jobs:"
echo "-------------------------------"
vkctl job list
vcctl job list
}

if [ $# == 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.")

})
})
8 changes: 4 additions & 4 deletions test/e2e/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
}
Expand All @@ -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())

Expand Down