Compare commits

..

2 Commits

Author SHA1 Message Date
amery e97aaf9c8c Merge branch 'pr-amery-ceph' into next-amery 2024-03-02 19:18:37 +00:00
amery 5aab1a3303 ceph: prevent osd label update on startup
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 19:15:59 +00:00
3 changed files with 2 additions and 37 deletions
-1
View File
@@ -1,2 +1 @@
.tmp
.version
+2 -5
View File
@@ -2,8 +2,6 @@
package main
import (
_ "embed"
"github.com/spf13/cobra"
)
@@ -14,9 +12,8 @@ const (
var (
rootCmd = &cobra.Command{
Use: CmdName,
Short: "control tool for jpi.cloud",
Version: version,
Use: CmdName,
Short: "control tool for jpi.cloud",
}
)
-31
View File
@@ -1,31 +0,0 @@
package main
import (
_ "embed"
"fmt"
"os"
"github.com/spf13/cobra"
)
//go:generate sh -c "git describe | tr -d '\r\n' > .version"
//go:embed .version
var version string
var versionCmd = &cobra.Command{
Use: "version",
Short: "Returns jpictl's version",
Args: cobra.NoArgs,
Run: func(_ *cobra.Command, _ []string) {
_, _ = fmt.Fprintf(os.Stdout, "%s\n", version)
},
}
func init() {
if version == "" {
version = "undetermined"
}
rootCmd.AddCommand(versionCmd)
}