forked from hswaw/hscloud
cluster/tools: integrate kartongips as main kubecfg tool
Change-Id: If6a6c8e9c9163f0fc25adcaa8680857fdca69cd3master
parent
be538db63b
commit
640336144d
|
@ -9,7 +9,7 @@ copy_go_binary(
|
||||||
|
|
||||||
copy_go_binary(
|
copy_go_binary(
|
||||||
name = "kubecfg",
|
name = "kubecfg",
|
||||||
src = "@com_github_bitnami_kubecfg//:kubecfg",
|
src = "//cluster/tools/kartongips",
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,9 @@ go_library(
|
||||||
srcs = ["main.go"],
|
srcs = ["main.go"],
|
||||||
importpath = "code.hackerspace.pl/hscloud/cluster/tools/kartongips",
|
importpath = "code.hackerspace.pl/hscloud/cluster/tools/kartongips",
|
||||||
visibility = ["//visibility:private"],
|
visibility = ["//visibility:private"],
|
||||||
|
x_defs = {
|
||||||
|
"code.hackerspace.pl/hscloud/cluster/tools/kartongips.Version": "{STABLE_GIT_VERSION}",
|
||||||
|
},
|
||||||
deps = [
|
deps = [
|
||||||
"//cluster/tools/kartongips/cmd:go_default_library",
|
"//cluster/tools/kartongips/cmd:go_default_library",
|
||||||
"//cluster/tools/kartongips/pkg/kubecfg:go_default_library",
|
"//cluster/tools/kartongips/pkg/kubecfg:go_default_library",
|
||||||
|
|
|
@ -20,7 +20,6 @@ import (
|
||||||
|
|
||||||
jsonnet "github.com/google/go-jsonnet"
|
jsonnet "github.com/google/go-jsonnet"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"k8s.io/client-go/pkg/version"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -28,7 +27,7 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Version is overridden by main
|
// Version is overridden by main
|
||||||
var Version = "(dev build)"
|
var Version = "unknown (external)"
|
||||||
|
|
||||||
var versionCmd = &cobra.Command{
|
var versionCmd = &cobra.Command{
|
||||||
Use: "version",
|
Use: "version",
|
||||||
|
@ -36,8 +35,8 @@ var versionCmd = &cobra.Command{
|
||||||
Args: cobra.NoArgs,
|
Args: cobra.NoArgs,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
out := cmd.OutOrStdout()
|
out := cmd.OutOrStdout()
|
||||||
fmt.Fprintln(out, "kubecfg version:", Version)
|
fmt.Fprintln(out, "kartongips, a fork of github.com/bitnami/kubecfg")
|
||||||
|
fmt.Fprintln(out, "hscloud version:", Version)
|
||||||
fmt.Fprintln(out, "jsonnet version:", jsonnet.Version())
|
fmt.Fprintln(out, "jsonnet version:", jsonnet.Version())
|
||||||
fmt.Fprintln(out, "client-go version:", version.Get())
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,11 +24,10 @@ import (
|
||||||
"code.hackerspace.pl/hscloud/cluster/tools/kartongips/pkg/kubecfg"
|
"code.hackerspace.pl/hscloud/cluster/tools/kartongips/pkg/kubecfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Version is overridden using `-X main.version` during release builds
|
var Version = "unknown"
|
||||||
var version = "(dev build)"
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
cmd.Version = version
|
cmd.Version = Version
|
||||||
|
|
||||||
if err := cmd.RootCmd.Execute(); err != nil {
|
if err := cmd.RootCmd.Execute(); err != nil {
|
||||||
// PersistentPreRunE may not have been run for early
|
// PersistentPreRunE may not have been run for early
|
||||||
|
|
Loading…
Reference in New Issue