From a613803de6912591d59878585a5b442ed6f0be6a Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Sat, 19 Jan 2019 17:46:37 +0100 Subject: [PATCH] renamed plugin from kubectl-os to kubectl-openstack --- .travis.yml | 8 ++++---- build.sh | 2 +- .../BUILD.bazel | 10 +++++----- .../kubectl-openstack.go} | 2 +- krew/install.sh | 4 ++-- krew/{os.yaml => openstack.yaml} | 18 +++++++++--------- pkg/cmd/config_import.go | 2 +- pkg/cmd/lb.go | 2 +- pkg/cmd/server.go | 2 +- pkg/cmd/volume-fix.go | 2 +- pkg/cmd/volume.go | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) rename cmd/{kubectl-os => kubectl-openstack}/BUILD.bazel (84%) rename cmd/{kubectl-os/kubectl-os.go => kubectl-openstack/kubectl-openstack.go} (84%) rename krew/{os.yaml => openstack.yaml} (76%) diff --git a/.travis.yml b/.travis.yml index 81eba07..9556098 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,15 +25,15 @@ after_success: - bash <(curl -s https://codecov.io/bash) before_deploy: -- cp bazel-bin/cmd/kubectl-os/linux_amd64_pure_stripped/kubectl-os /tmp/kubectl-os -- cp bazel-bin/cmd/kubectl-os/kubectl-os_tar.tar.gz /tmp/kubectl-os.tar.gz +- cp bazel-bin/cmd/kubectl-openstack/linux_amd64_pure_stripped/kubectl-openstack /tmp/kubectl-openstack +- cp bazel-bin/cmd/kubectl-openstack/kubectl-openstack_tar.tar.gz /tmp/kubectl-openstack.tar.gz deploy: - provider: releases api_key: $GITHUB_RELEASE_TOKEN file: - - /tmp/kubectl-os - - /tmp/kubectl-os.tar.gz + - /tmp/kubectl-openstack + - /tmp/kubectl-openstack.tar.gz overwrite: true skip_cleanup: true on: diff --git a/build.sh b/build.sh index 66509d2..cccd218 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker run -it -w /github/workspace -v $(pwd):/github/workspace -v /tmp:/tmp --entrypoint bazel sbueringer/bazel build //cmd/kubectl-os:kubectl-os //cmd/kubectl-os:kubectl-os_tar +docker run -it -w /github/workspace -v $(pwd):/github/workspace -v /tmp:/tmp --entrypoint bazel sbueringer/bazel build //cmd/kubectl-openstack:kubectl-openstack //cmd/kubectl-openstack:kubectl-openstack_tar diff --git a/cmd/kubectl-os/BUILD.bazel b/cmd/kubectl-openstack/BUILD.bazel similarity index 84% rename from cmd/kubectl-os/BUILD.bazel rename to cmd/kubectl-openstack/BUILD.bazel index 48d66e9..ad1b2f6 100644 --- a/cmd/kubectl-os/BUILD.bazel +++ b/cmd/kubectl-openstack/BUILD.bazel @@ -2,8 +2,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( name = "go_default_library", - srcs = ["kubectl-os.go"], - importpath = "github.com/sbueringer/kubectl-openstack-plugin/cmd/kubectl-os", + srcs = ["kubectl-openstack.go"], + importpath = "github.com/sbueringer/kubectl-openstack-plugin/cmd/kubectl-openstack", visibility = ["//visibility:private"], deps = [ "//pkg/cmd:go_default_library", @@ -13,7 +13,7 @@ go_library( ) go_binary( - name = "kubectl-os", + name = "kubectl-openstack", embed = [":go_default_library"], pure = "on", visibility = ["//visibility:public"], @@ -36,7 +36,7 @@ filegroup( load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") pkg_tar( - name = "kubectl-os_tar", - srcs = [":kubectl-os"], + name = "kubectl-openstack_tar", + srcs = [":kubectl-openstack"], extension = "tar.gz", ) diff --git a/cmd/kubectl-os/kubectl-os.go b/cmd/kubectl-openstack/kubectl-openstack.go similarity index 84% rename from cmd/kubectl-os/kubectl-os.go rename to cmd/kubectl-openstack/kubectl-openstack.go index b92604c..02119f7 100644 --- a/cmd/kubectl-os/kubectl-os.go +++ b/cmd/kubectl-openstack/kubectl-openstack.go @@ -9,7 +9,7 @@ import ( ) func main() { - flags := pflag.NewFlagSet("kubectl-os", pflag.ExitOnError) + flags := pflag.NewFlagSet("kubectl-openstack", pflag.ExitOnError) pflag.CommandLine = flags root := cmd.NewCmdOpenStack(genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}) diff --git a/krew/install.sh b/krew/install.sh index 811af71..97d61d3 100755 --- a/krew/install.sh +++ b/krew/install.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#kubectl krew install --manifest=./krew/os.yaml --archive=bazel-bin/cmd/kubectl-os/kubectl-os_tar.tar.gz -kubectl krew install --manifest=./krew/os.yaml \ No newline at end of file +kubectl krew install --manifest=./krew/openstack.yaml --archive=bazel-bin/cmd/kubectl-openstack/kubectl-openstack_tar.tar.gz +#kubectl krew install --manifest=./krew/openstack.yaml \ No newline at end of file diff --git a/krew/os.yaml b/krew/openstack.yaml similarity index 76% rename from krew/os.yaml rename to krew/openstack.yaml index 5d2ad05..cfcb229 100644 --- a/krew/os.yaml +++ b/krew/openstack.yaml @@ -1,19 +1,19 @@ apiVersion: krew.googlecontainertools.github.com/v1alpha2 kind: Plugin metadata: - name: os + name: openstack spec: - version: "v0.0.6" + version: v0.0.7 platforms: - selector: matchExpressions: - {key: os, operator: In, values: [linux]} - uri: https://github.com/sbueringer/kubectl-openstack-plugin/releases/download/v0.0.6/kubectl-os.tar.gz - sha256: 52b0e3aee5226fd6f0bc75fe5a8d778c9ce12bd82380cd85074aa92ebe8fa035 + uri: https://github.com/sbueringer/kubectl-openstack-plugin/releases/download/v0.0.7/kubectl-openstack.tar.gz + sha256: a6e5242b62fea42e10814ae43788afa1e71673d5eb698295dbffa88c39d49f4a files: - - from: "/kubectl-os" + - from: "/kubectl-openstack" to: "." - bin: "./kubectl-os" + bin: "./kubectl-openstack" shortDescription: Extends kubectl with some OpenStack commands caveats: | This plugin only works with Kubernetes clusters running on OpenStack. @@ -26,10 +26,10 @@ spec: credentials. Some of these commands are: # Shows PersistentVolumes joined with the corresponding OpenStack disks - kubectl os volumes + kubectl openstack volumes # Shows Services joined with the corresponding OpenStack LBaaS objects - kubectl os lb + kubectl openstack lb # Show Nodes joined with the corresponding OpenStack servers - kubectl os server + kubectl openstack server diff --git a/pkg/cmd/config_import.go b/pkg/cmd/config_import.go index 1a122aa..9f3693d 100644 --- a/pkg/cmd/config_import.go +++ b/pkg/cmd/config_import.go @@ -39,7 +39,7 @@ func NewCmdImportConfig(streams genericclioptions.IOStreams) *cobra.Command { Use: "import-config", Aliases: []string{"rc"}, Short: "Import config from OpenStack rc files.", - Example: fmt.Sprintf(importConfigExample, "kubectl os"), + Example: fmt.Sprintf(importConfigExample, "kubectl openstack"), SilenceUsage: true, RunE: func(c *cobra.Command, args []string) error { if err := o.Complete(c, args); err != nil { diff --git a/pkg/cmd/lb.go b/pkg/cmd/lb.go index 6bc322e..e5fa658 100644 --- a/pkg/cmd/lb.go +++ b/pkg/cmd/lb.go @@ -52,7 +52,7 @@ func NewCmdLB(streams genericclioptions.IOStreams) *cobra.Command { cmd := &cobra.Command{ Use: "lb", Short: "List all lb and corresponding services from Kubernetes and OpenStack", - Example: fmt.Sprintf(lbExample, "kubectl os"), + Example: fmt.Sprintf(lbExample, "kubectl openstack"), SilenceUsage: true, RunE: func(c *cobra.Command, args []string) error { if err := o.Complete(c, args); err != nil { diff --git a/pkg/cmd/server.go b/pkg/cmd/server.go index 11d5a1c..23e295b 100644 --- a/pkg/cmd/server.go +++ b/pkg/cmd/server.go @@ -58,7 +58,7 @@ func NewCmdServer(streams genericclioptions.IOStreams) *cobra.Command { Use: "server", Aliases: []string{"srv"}, Short: "List all server from Kubernetes and OpenStack", - Example: fmt.Sprintf(serverExample, "kubectl os"), + Example: fmt.Sprintf(serverExample, "kubectl openstack"), SilenceUsage: true, RunE: func(c *cobra.Command, args []string) error { if err := o.Complete(c, args); err != nil { diff --git a/pkg/cmd/volume-fix.go b/pkg/cmd/volume-fix.go index dcad93b..625a02d 100644 --- a/pkg/cmd/volume-fix.go +++ b/pkg/cmd/volume-fix.go @@ -43,7 +43,7 @@ func NewCmdVolumesFix(streams genericclioptions.IOStreams) *cobra.Command { Use: "volumes-fix", Aliases: []string{"vsf"}, Short: "Fix volumes from Kubernetes and OpenStack", - Example: fmt.Sprintf(volumesFixExample, "kubectl os"), + Example: fmt.Sprintf(volumesFixExample, "kubectl openstack"), SilenceUsage: true, RunE: func(c *cobra.Command, args []string) error { if err := o.Complete(c, args); err != nil { diff --git a/pkg/cmd/volume.go b/pkg/cmd/volume.go index 9de61b5..e2b1c1f 100644 --- a/pkg/cmd/volume.go +++ b/pkg/cmd/volume.go @@ -57,7 +57,7 @@ func NewCmdVolumes(streams genericclioptions.IOStreams) *cobra.Command { Use: "volumes", Aliases: []string{"vs"}, Short: "List all volumes from Kubernetes and OpenStack", - Example: fmt.Sprintf(volumesExample, "kubectl os"), + Example: fmt.Sprintf(volumesExample, "kubectl openstack"), SilenceUsage: true, RunE: func(c *cobra.Command, args []string) error { if err := o.Complete(c, args); err != nil {